From 7e8e07ed121d7bdae66fd8048bb7ad4271a3fa39 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Feb 2024 20:55:44 +0100 Subject: [PATCH 1/2] ldeep: 1.0.51 -> 1.0.52 Diff: https://github.com/franc-pentest/ldeep/compare/refs/tags/1.0.51...1.0.52 Changelog: https://github.com/franc-pentest/ldeep/releases/tag/1.0.52 --- 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 623acf50f3b8..4bacbba9aa5c 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.51"; + version = "1.0.52"; format = "setuptools"; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-UbZotbq97ehVj8dF0vXM2Z61IG1H+21xk14DXKmWirA="; + hash = "sha256-I51vz3zF1J3223hcO3cdfsNBfpq/UolDxUEXyqx3dLI="; }; nativeBuildInputs = with python3.pkgs; [ From 65ac553a62323237c709d7b10ed853b8885741d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Feb 2024 20:59:04 +0100 Subject: [PATCH 2/2] ldeep: refactor --- pkgs/tools/security/ldeep/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 4bacbba9aa5c..6e44829f7ee9 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; version = "1.0.52"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; @@ -15,15 +15,24 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-I51vz3zF1J3223hcO3cdfsNBfpq/UolDxUEXyqx3dLI="; }; + pythonRelaxDeps = [ + "cryptography" + ]; + nativeBuildInputs = with python3.pkgs; [ cython + pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = with python3.pkgs; [ commandparse cryptography dnspython + gssapi ldap3 + oscrypto + pycryptodome pycryptodomex six termcolor