Merge pull request #231903 from SuperSandro2000/certipy

certipy: fix build with pyasn1 0.5.0

pkgs/development/python-modules/ldap3/default.nix

@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, pyasn1 }:
+{ lib, fetchPypi, fetchpatch, buildPythonPackage, dos2unix, pyasn1 }:
 
 buildPythonPackage rec {
   pname = "ldap3";
@@ -9,6 +9,22 @@ buildPythonPackage rec {
     sha256 = "f3e7fc4718e3f09dda568b57100095e0ce58633bcabbed8667ce3f8fbaa4229f";
   };
 
+  prePatch = ''
+    # patch fails to apply because of line endings
+    dos2unix ldap3/utils/asn1.py
+  '';
+
+  patches = [
+    # fix pyasn1 0.5.0 compability
+    # https://github.com/cannatag/ldap3/pull/983
+    (fetchpatch {
+      url = "https://github.com/cannatag/ldap3/commit/ca689f4893b944806f90e9d3be2a746ee3c502e4.patch";
+      hash = "sha256-A8qI0t1OV3bkKaSdhVWHFBC9MoSkWynqxpgznV+5gh8=";
+    })
+  ];
+
+  nativeBuildInputs = [ dos2unix ];
+
   propagatedBuildInputs = [ pyasn1 ];
 
   doCheck = false; # requires network
@@ -17,5 +33,6 @@ buildPythonPackage rec {
     homepage = "https://pypi.python.org/pypi/ldap3";
     description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library";
     license = licenses.lgpl3;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/tools/security/certipy/default.nix

@@ -15,6 +15,12 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-llLGr9IpuXQYIN2WaOkvfE2dAZb3PMVlNmketUpuyDI=";
   };
 
+  postPatch = ''
+    # pin does not apply because our ldap3 contains a patch to fix pyasn1 compability
+    substituteInPlace setup.py \
+      --replace "pyasn1==0.4.8" "pyasn1"
+  '';
+
   propagatedBuildInputs = with python3.pkgs; [
     asn1crypto
     dnspython