Skip to content

Commit

Permalink
python3Packages.privacyidea: fix eval with python3
Browse files Browse the repository at this point in the history
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 NixOS#122250

[1] privacyidea/privacyidea-ldap-proxy#50
[2] privacyidea/privacyidea#2629
[3] bf9b6b1
  • Loading branch information
Ma27 committed May 9, 2021
1 parent aff091d commit 5b29b74
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/privacyidea/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python, nixosTests

, 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
, ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2
, pydash
, pydash, ecdsa

, mock, pytestCheckHook, responses, testfixtures
}:
Expand All @@ -29,10 +29,10 @@ buildPythonPackage rec {

propagatedBuildInputs = [
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
ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2
pydash
pydash ecdsa
];

passthru.tests = { inherit (nixosTests) privacyidea; };
Expand Down
4 changes: 3 additions & 1 deletion pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5177,7 +5177,9 @@ in {

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 { };

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/python2-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ with self; with super; {

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 { };

Expand Down

0 comments on commit 5b29b74

Please sign in to comment.