From 0222121978a40ce4fee946402681e40b863919d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Mar 2021 21:39:55 +0100 Subject: [PATCH 1/6] python3Packages.zeroconf: 0.28.8 -> 0.29.0 --- .../python-modules/zeroconf/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index a3b00ec32324..5105cbfff021 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -3,27 +3,26 @@ , buildPythonPackage , fetchPypi , ifaddr -, typing -, isPy27 , pythonOlder , pytestCheckHook }: buildPythonPackage rec { pname = "zeroconf"; - version = "0.28.8"; - disabled = isPy27; + version = "0.29.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0narq8haa3b375vfblbyil77n8bw0wxqnanl91pl0wwwm884mqjb"; + sha256 = "sha256-eu+7ZYtFKx/X5REkNk+TjG9eQtbqiT+iVXvqjAbFQK8="; }; - propagatedBuildInputs = [ ifaddr ] - ++ lib.optionals (pythonOlder "3.5") [ typing ]; + propagatedBuildInputs = [ ifaddr ]; checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "zeroconf/test.py" ]; + disabledTests = [ # disable tests that expect some sort of networking in the build container "test_launch_and_close" @@ -33,6 +32,7 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ "test_lots_of_names" ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "zeroconf" ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of multicast DNS service discovery"; homepage = "https://github.com/jstasiak/python-zeroconf"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ abbradar ]; }; } From e29f991f1f37a3c7b4342e3b14cd1c89806be300 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Mar 2021 22:09:13 +0100 Subject: [PATCH 2/6] python3Packages.python-miio: allow later zeroconf releases --- pkgs/development/python-modules/python-miio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 07d7ba9b3c11..1d9025a035f2 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -36,7 +36,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'croniter = "^0"' 'croniter = "*"' \ - --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' + --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' \ + --replace 'zeroconf = "^0.28"' 'zeroconf = "*"' ''; nativeBuildInputs = [ From 876deb41036d1618fbcc005a537afc718a53c1a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Mar 2021 22:30:42 +0100 Subject: [PATCH 3/6] expliot: 0.9.6 -> 0.9.7 --- pkgs/tools/security/expliot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix index a13e1707236b..c46dcb018992 100644 --- a/pkgs/tools/security/expliot/default.nix +++ b/pkgs/tools/security/expliot/default.nix @@ -22,14 +22,14 @@ buildPythonApplication rec { pname = "expliot"; - version = "0.9.6"; + version = "0.9.7"; disabled = pythonOlder "3.7"; src = fetchFromGitLab { owner = "expliot_framework"; repo = pname; rev = version; - sha256 = "1wn8fyrvis0gw80zzmpivinw6mz5n33inhv39iallsl3is8xpgpa"; + sha256 = "sha256-k43PvH9BXcvxe7O5iCGzLuxv/WkB9YelH/d/1S7BpU0="; }; propagatedBuildInputs = [ From de5d734e0cdefc9241f9c687538e5bdeda0e52d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Mar 2021 15:35:15 +0100 Subject: [PATCH 4/6] python3Packages.pynetdicom: 1.5.5 -> 1.5.6 --- pkgs/development/python-modules/pynetdicom/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 77308a1966be..fe8c7d73bc9b 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynetdicom"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "pydicom"; repo = pname; rev = "v${version}"; - sha256 = "0zjpscxdhlcv99py7jx5r6dw32nzbcr49isrzkdr6g3zwyxwzbfm"; + sha256 = "sha256-xYwnv30I0+CAx4QODSeMNhdlM2NuM8v4J3rx99NdYCc="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { disabledTests = [ # Some tests needs network capabilities "test_str_types_empty" + "test_associate_reject" "TestEchoSCP" "TestEchoSCPCLI" "TestStoreSCP" @@ -49,7 +50,7 @@ buildPythonPackage rec { homepage = "https://github.com/pydicom/pynetdicom"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - # Tests are not passing on Darwin, thus it's assumed that it doesn't work - broken = stdenv.isDarwin; + # Tests are not passing on Darwin/Aarch64, thus it's assumed that it doesn't work + broken = stdenv.isDarwin || stdenv.isAarch64; }; } From 5a28fc174a00b8c21eb70700cd3561eb6cafb50d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Apr 2021 17:27:43 +0200 Subject: [PATCH 5/6] python3Packages.httpsig: fix build --- .../python-modules/httpsig/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/httpsig/default.nix b/pkgs/development/python-modules/httpsig/default.nix index 30c918d86feb..accc731eeadf 100644 --- a/pkgs/development/python-modules/httpsig/default.nix +++ b/pkgs/development/python-modules/httpsig/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pycryptodome , requests +, six }: buildPythonPackage rec { @@ -15,13 +16,17 @@ buildPythonPackage rec { sha256 = "1rkc3zwsq53rjsmc47335m4viljiwdbmw3y2zry4z70j8q1dbmki"; }; - buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pycryptodome requests ]; + buildInputs = [ + setuptools-scm + ]; - # Jailbreak pycryptodome - preBuild = '' - substituteInPlace setup.py --replace "==3.4.7" "" - ''; + propagatedBuildInputs = [ + pycryptodome + requests + six + ]; + + pythonImportsCheck = [ "httpsig" ]; meta = with lib; { description = "Sign HTTP requests with secure signatures"; From a04f64cd5ea5c02115fde330daca53bd76647fac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Apr 2021 17:28:09 +0200 Subject: [PATCH 6/6] python3Packages.pynetdicom: disable failing tests --- .../development/python-modules/pynetdicom/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index fe8c7d73bc9b..192827566df2 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -35,12 +35,19 @@ buildPythonPackage rec { "test_associate_reject" "TestEchoSCP" "TestEchoSCPCLI" + "TestFindSCP" + "TestFindSCPCLI" + "TestGetSCP" + "TestGetSCPCLI" + "TestMoveSCP" + "TestMoveSCPCLI" + "TestQRGetServiceClass" + "TestQRMoveServiceClass" "TestStoreSCP" "TestStoreSCPCLI" "TestStoreSCU" "TestStoreSCUCLI" - "TestQRGetServiceClass" - "TestQRMoveServiceClass" + "TestState" ]; pythonImportsCheck = [ "pynetdicom" ];