diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2021-10-18 19:00:17 +0200 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2021-10-18 21:14:35 +0200 |
commit | 47fc40d5ab19124339fe4ab2681be477621f1f4f (patch) | |
tree | 6ef001b058655acac024eedb3d75868f0115e903 | |
parent | e02259066fdecc557ff535ebb643dd771652ef7a (diff) | |
download | nixpkgs-47fc40d5ab19124339fe4ab2681be477621f1f4f.tar nixpkgs-47fc40d5ab19124339fe4ab2681be477621f1f4f.tar.gz nixpkgs-47fc40d5ab19124339fe4ab2681be477621f1f4f.tar.bz2 nixpkgs-47fc40d5ab19124339fe4ab2681be477621f1f4f.tar.lz nixpkgs-47fc40d5ab19124339fe4ab2681be477621f1f4f.tar.xz nixpkgs-47fc40d5ab19124339fe4ab2681be477621f1f4f.tar.zst nixpkgs-47fc40d5ab19124339fe4ab2681be477621f1f4f.zip |
pythonPackages.privacyidea-ldap-proxy: 0.6.1 -> 0.6.2, switch to python3
-rw-r--r-- | nixos/modules/services/security/privacyidea.nix | 2 | ||||
-rw-r--r-- | pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix (renamed from pkgs/development/python-modules/privacyidea/ldap-proxy.nix) | 14 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python2-packages.nix | 2 |
4 files changed, 7 insertions, 13 deletions
diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index e78c4383e4b..05f4995cc41 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/nixos/modules/services/security/privacyidea.nix @@ -272,7 +272,7 @@ in (mkIf cfg.ldap-proxy.enable { systemd.services.privacyidea-ldap-proxy = let - ldap-proxy-env = pkgs.python2.withPackages (ps: [ ps.privacyidea-ldap-proxy ]); + ldap-proxy-env = pkgs.python3.withPackages (ps: [ ps.privacyidea-ldap-proxy ]); in { description = "privacyIDEA LDAP proxy"; wantedBy = [ "multi-user.target" ]; diff --git a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix b/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix index 25a81510c7d..aa44e1396a0 100644 --- a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix +++ b/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix @@ -1,30 +1,24 @@ -{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, twisted, ldaptor, configobj }: +{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }: buildPythonPackage rec { pname = "privacyidea-ldap-proxy"; - version = "0.6.1"; - - # https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50 - disabled = isPy3k; + version = "0.6.2"; src = fetchFromGitHub { owner = "privacyidea"; repo = pname; rev = "v${version}"; - sha256 = "1kc1n9wr1a66xd5zvl6dq78xnkqkn5574jpzashc99pvm62dr24j"; + sha256 = "sha256-U2lg4zDQKn9FQ7O0zSLaijIkXKVjg8wi2ItueF4ACDU="; }; propagatedBuildInputs = [ twisted ldaptor configobj ]; - # python 2 zope.interface test import path issues - doCheck = false; - pythonImportsCheck = [ "pi_ldapproxy" ]; meta = with lib; { description = "LDAP Proxy to intercept LDAP binds and authenticate against privacyIDEA"; homepage = "https://github.com/privacyidea/privacyidea-ldap-proxy"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = [ maintainers.globin ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87950c21688..49e36d14f25 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5866,6 +5866,8 @@ in { prison = callPackage ../development/python-modules/prison { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea-ldap-proxy { }; + 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 99189a534df..033bc4dc7c0 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -407,8 +407,6 @@ with self; with super; { prettytable = callPackage ../development/python-modules/prettytable/1.nix { }; - 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 { }; |