From 47fc40d5ab19124339fe4ab2681be477621f1f4f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 18 Oct 2021 19:00:17 +0200
Subject: pythonPackages.privacyidea-ldap-proxy: 0.6.1 -> 0.6.2, switch to
 python3

---
 nixos/modules/services/security/privacyidea.nix    |  2 +-
 .../privacyidea-ldap-proxy/default.nix             | 24 +++++++++++++++++
 .../python-modules/privacyidea/ldap-proxy.nix      | 30 ----------------------
 pkgs/top-level/python-packages.nix                 |  2 ++
 pkgs/top-level/python2-packages.nix                |  2 --
 5 files changed, 27 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix
 delete mode 100644 pkgs/development/python-modules/privacyidea/ldap-proxy.nix

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/default.nix b/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix
new file mode 100644
index 00000000000..aa44e1396a0
--- /dev/null
+++ b/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }:
+
+buildPythonPackage rec {
+  pname = "privacyidea-ldap-proxy";
+  version = "0.6.2";
+
+  src = fetchFromGitHub {
+    owner = "privacyidea";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-U2lg4zDQKn9FQ7O0zSLaijIkXKVjg8wi2ItueF4ACDU=";
+  };
+
+  propagatedBuildInputs = [ twisted ldaptor configobj ];
+
+  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.agpl3Only;
+    maintainers = [ maintainers.globin ];
+  };
+}
diff --git a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix
deleted file mode 100644
index 25a81510c7d..00000000000
--- a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, buildPythonPackage, isPy3k, 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;
-
-  src = fetchFromGitHub {
-    owner = "privacyidea";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1kc1n9wr1a66xd5zvl6dq78xnkqkn5574jpzashc99pvm62dr24j";
-  };
-
-  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;
-    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 { };
-- 
cgit 1.4.1