diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-05-09 16:16:02 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2021-05-09 16:19:35 +0200 |
| commit | 5b29b74b71743fc97a9c8f79827e563b820278ec (patch) | |
| tree | a5ce3f3374167b32a49aa90bddf67824c9ae117b /pkgs/top-level | |
| parent | aff091d3dadf476837b6f7a843013d2f718b2806 (diff) | |
python3Packages.privacyidea: fix eval with python3
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] bf9b6b1ef3dffa6f08ed16003630e1ce94361c1e
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python2-packages.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1681942e41d63..99c3353fac1fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index e21f90342927a..c141562c12e92 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -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 { }; |