From 966f8ac265a3dd2764a67878d4ff6bd104e25d6c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 8 Sep 2023 16:49:25 +0200
Subject: [PATCH 1/2] ldeep: 1.0.11 -> 1.0.34

---
 pkgs/tools/security/ldeep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix
index 82d0456a05b7..80a2e07f44f0 100644
--- a/pkgs/tools/security/ldeep/default.nix
+++ b/pkgs/tools/security/ldeep/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonApplication rec {
   pname = "ldeep";
-  version = "1.0.11";
+  version = "1.0.34";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MYVC8fxLW85n8uZVMhb2Zml1lQ8vW9gw/eRLcmemQx4=";
+    sha256 = "sha256-0fLaef/3SJgoBlXS0/ocauE1gjlvSlIc25RcLKl3O5g=";
   };
 
   propagatedBuildInputs = [

From 512804bd67997a5acf9707ff4ed80cb064f87231 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 8 Sep 2023 17:26:40 +0200
Subject: [PATCH 2/2] ldeep: migrate to python3.pkgs.buildPythonApplication

---
 pkgs/tools/security/ldeep/default.nix | 31 ++++++++++++++++-----------
 pkgs/top-level/all-packages.nix       |  2 +-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix
index 80a2e07f44f0..008ff90ee60a 100644
--- a/pkgs/tools/security/ldeep/default.nix
+++ b/pkgs/tools/security/ldeep/default.nix
@@ -1,37 +1,42 @@
 { lib
-, buildPythonApplication
-, fetchPypi
-, commandparse
-, dnspython
-, ldap3
-, termcolor
-, tqdm
+, fetchFromGitHub
+, python3
 }:
 
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "ldeep";
   version = "1.0.34";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-0fLaef/3SJgoBlXS0/ocauE1gjlvSlIc25RcLKl3O5g=";
+  src = fetchFromGitHub {
+    owner = "franc-pentest";
+    repo = "ldeep";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Gskbxfqp2HqI6rCEiuT0lgHQtD0rZjtLgH3idEkfmjc=";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
     commandparse
+    cryptography
     dnspython
     ldap3
+    pycryptodomex
+    six
     termcolor
     tqdm
   ];
 
   # no tests are present
   doCheck = false;
-  pythonImportsCheck = [ "ldeep" ];
+
+  pythonImportsCheck = [
+    "ldeep"
+  ];
 
   meta = with lib; {
     description = "In-depth LDAP enumeration utility";
     homepage = "https://github.com/franc-pentest/ldeep";
+    changelog = "https://github.com/franc-pentest/ldeep/releases/tag/${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d5b3d42d636..1be9548d67a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10311,7 +10311,7 @@ with pkgs;
 
   ldapvi = callPackage ../tools/misc/ldapvi { };
 
-  ldeep = python3Packages.callPackage ../tools/security/ldeep { };
+  ldeep = callPackage ../tools/security/ldeep { };
 
   ldns = callPackage ../development/libraries/ldns { };