From 5b29b74b71743fc97a9c8f79827e563b820278ec Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 9 May 2021 16:16:02 +0200 Subject: [PATCH] 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 --- pkgs/development/python-modules/privacyidea/default.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 4 +++- pkgs/top-level/python2-packages.nix | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/privacyidea/default.nix b/pkgs/development/python-modules/privacyidea/default.nix index c28a0090168..11ff6f71af6 100644 --- a/pkgs/development/python-modules/privacyidea/default.nix +++ b/pkgs/development/python-modules/privacyidea/default.nix @@ -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 }: @@ -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; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1681942e41d..99c3353fac1 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 e21f9034292..c141562c12e 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 { };