public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python3Packages.privacyidea: fix eval with python3

Browse Source 
While `privacyidea-ldap-proxy` only works on `python2`[1], `privacyidea`
itself works fine with `python3`, however it needs version one of
`pyjwt`[2], so I had to add `pyjwt1` which was already packaged for
`python2`[3] to the `python3` package-set. I think that's fine though
since `python2` should be only used when actually needed which isn't the
case here.

Closes #122250

[1] https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50
[2] https://github.com/privacyidea/privacyidea/issues/2629
[3] bf9b6b1ef3
This commit is contained in:
Maximilian Bosch 2021-05-09 16:16:02 +02:00
parent aff091d3da
commit 5b29b74b71
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/python-modules/privacyidea/default.nix
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; };

4
pkgs/top-level/python-packages.nix
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 { };

2
pkgs/top-level/python2-packages.nix
View File

@ -383,7 +383,7 @@ 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 { };
progressbar231 = callPackage ../development/python-modules/progressbar231 { }; progressbar231 = callPackage ../development/python-modules/progressbar231 { };