From 67e772c763a5b4def7f31d667da2526e70c7c1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 25 Apr 2025 21:47:45 +0200 Subject: [PATCH 1/2] python3Packages.python-ldap: enable darwin tests (cherry picked from commit 9f4f753fec3ac31cc019f67a234f349a47b6db85) --- pkgs/development/python-modules/python-ldap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index 0178f620c1d3..3ef438678abb 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { "test_tls_ext_noca" ]; - doCheck = !stdenv.hostPlatform.isDarwin; + __darwinAllowLocalNetworking = true; meta = with lib; { description = "Python modules for implementing LDAP clients"; From a753a94bd714125583bb7da397f66a9d79419957 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 10 Oct 2025 22:08:43 +0200 Subject: [PATCH 2/2] python3Packages.python-ldap: 3.4.4 -> 3.4.5 https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-3.4.5 Fixes: CVE-2025-61911, CVE-2025-61912 (cherry picked from commit 8619190cc709019cfcd9d56e341d626e17768bbe) --- .../python-modules/python-ldap/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index 3ef438678abb..4ac1ade56c3e 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system distutils, @@ -23,18 +21,21 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "3.4.4"; + version = "3.4.5"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "python-ldap"; repo = "python-ldap"; tag = "python-ldap-${version}"; - hash = "sha256-v1cWoRGxbvvFnHqnwoIfmiQQcxfaA8Bf3+M5bE5PtuU="; + hash = "sha256-olRu5HacRKaAcNbQczA+UCbDxhySUOO7qH0KdWlSbT0="; }; + postPatch = '' + # unused in 3.4.5; https://github.com/python-ldap/python-ldap/pull/597 + sed -i "/setuptools-scm/d" pyproject.toml + ''; + build-system = [ distutils setuptools