Merge pull request #122357 from Ma27/fix-privacyidea

privacyidea: fix eval & build
This commit is contained in:
Robin Gloster 2021-05-09 11:16:51 -05:00 committed by GitHub
commit 357e6b3560
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 6 deletions

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, twisted
, passlib
, pyopenssl
, pyparsing
, service-identity
, zope_interface
, isPy3k
, python
}:
buildPythonPackage rec {
pname = "ldaptor";
version = "19.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "64c7b870c77e34e4f5f9cfdf330b9702e89b4dd0f64275704f86c1468312c755";
};
propagatedBuildInputs = [
twisted passlib pyopenssl pyparsing service-identity zope_interface
];
disabled = isPy3k;
doCheck = false;
meta = {
description = "A Pure-Python Twisted library for LDAP";
homepage = "https://github.com/twisted/ldaptor";
license = lib.licenses.mit;
};
}

View file

@ -1,10 +1,10 @@
{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python, nixosTests { lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python, nixosTests
, cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script , cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script
, defusedxml, croniter, flask_migrate, pyjwt, configobj, sqlsoup, pillow , defusedxml, croniter, flask_migrate, pyjwt1, configobj, sqlsoup, pillow
, python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel , python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel
, ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2 , ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2
, pydash , pydash, ecdsa
, mock, pytestCheckHook, responses, testfixtures , mock, pytestCheckHook, responses, testfixtures
}: }:
@ -29,10 +29,10 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
cryptography pyrad pymysql python-dateutil flask-versioned flask_script cryptography pyrad pymysql python-dateutil flask-versioned flask_script
defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow defusedxml croniter flask_migrate pyjwt1 configobj sqlsoup pillow
python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel
ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2
pydash pydash ecdsa
]; ];
passthru.tests = { inherit (nixosTests) privacyidea; }; passthru.tests = { inherit (nixosTests) privacyidea; };

View file

@ -5177,7 +5177,9 @@ in {
prison = callPackage ../development/python-modules/prison { }; prison = callPackage ../development/python-modules/prison { };
privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; privacyidea = callPackage ../development/python-modules/privacyidea { };
pyjwt1 = callPackage ../development/python-modules/pyjwt/1.nix { };
proboscis = callPackage ../development/python-modules/proboscis { }; proboscis = callPackage ../development/python-modules/proboscis { };

View file

@ -383,7 +383,9 @@ with self; with super; {
prettytable = callPackage ../development/python-modules/prettytable/1.nix { }; prettytable = callPackage ../development/python-modules/prettytable/1.nix { };
privacyidea = callPackage ../development/python-modules/privacyidea { }; privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { };
ldaptor = callPackage ../development/python-modules/ldaptor/19.nix { };
progressbar231 = callPackage ../development/python-modules/progressbar231 { }; progressbar231 = callPackage ../development/python-modules/progressbar231 { };