From feb68f31e12b85dbf55bb4df3e60adba6b86475b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Mar 2022 09:05:08 +0000 Subject: [PATCH 1/2] python310Packages.msldap: 0.3.30 -> 0.3.38 --- pkgs/development/python-modules/msldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index f0e6e5abaa99..d70d5e128f88 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.3.30"; + version = "0.3.38"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fX+W1Bq4F0/6DyxWeA6zvoswFQCdDpSk29g7nq1cYYE="; + sha256 = "sha256-zJEp8/jPTAb3RpzyXySdtVl2uSLpSirGkJh7GB/3Qwc="; }; propagatedBuildInputs = [ From 8cc2efce4a5c01d5efaf86767ee6a33a985cf5ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Mar 2022 11:41:48 +0200 Subject: [PATCH 2/2] python3Packages.msldap: disable on older Python releases --- pkgs/development/python-modules/msldap/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index d70d5e128f88..7a2a2611d3cd 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -8,15 +8,19 @@ , tqdm , winacl , winsspi +, pythonOlder }: buildPythonPackage rec { pname = "msldap"; version = "0.3.38"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zJEp8/jPTAb3RpzyXySdtVl2uSLpSirGkJh7GB/3Qwc="; + hash = "sha256-zJEp8/jPTAb3RpzyXySdtVl2uSLpSirGkJh7GB/3Qwc="; }; propagatedBuildInputs = [ @@ -31,7 +35,10 @@ buildPythonPackage rec { # Project doesn't have tests doCheck = false; - pythonImportsCheck = [ "msldap" ]; + + pythonImportsCheck = [ + "msldap" + ]; meta = with lib; { description = "Python LDAP library for auditing MS AD";