git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #117733 from fabaff/bump-zeroconf
commitb5e8919e566d18ec4d6c2a6a2d698cc8f012f009 authorMartin Weinelt <mweinelt@users.noreply.github.com> dateSat 3 Apr 2021, 19:42 (6 years ago) parentb5e3b37a04f64c
5 files changed+38−24
pkgs/development/python-modules/httpsig/default.nix+12−7 pkgs/development/python-modules/pynetdicom/default.nix+14−6 pkgs/development/python-modules/python-miio/default.nix+2−1 pkgs/development/python-modules/zeroconf/default.nix+8−8 pkgs/tools/security/expliot/default.nix+2−2
pkgs/development/python-modules/httpsig/default.nix+12−7
@@ -1,9 +1,10 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4−, setuptools_scm
4+, setuptools-scm
55, pycryptodome
66, requests
7+, six
78}:
89
910buildPythonPackage rec {
@@ -15,13 +16,17 @@ buildPythonPackage rec {
1516 sha256 = "1rkc3zwsq53rjsmc47335m4viljiwdbmw3y2zry4z70j8q1dbmki";
1617 };
1718
18− buildInputs = [ setuptools_scm ];
19− propagatedBuildInputs = [ pycryptodome requests ];
19+ buildInputs = [
20+ setuptools-scm
21+ ];
2022
21− # Jailbreak pycryptodome
22− preBuild = ''
23− substituteInPlace setup.py --replace "==3.4.7" ""
24− '';
23+ propagatedBuildInputs = [
24+ pycryptodome
25+ requests
26+ six
27+ ];
28+
29+ pythonImportsCheck = [ "httpsig" ];
2530
2631 meta = with lib; {
2732 description = "Sign HTTP requests with secure signatures";
pkgs/development/python-modules/pynetdicom/default.nix+14−6
@@ -10,13 +10,13 @@
1010
1111buildPythonPackage rec {
1212 pname = "pynetdicom";
13− version = "1.5.5";
13+ version = "1.5.6";
1414
1515 src = fetchFromGitHub {
1616 owner = "pydicom";
1717 repo = pname;
1818 rev = "v${version}";
19− sha256 = "0zjpscxdhlcv99py7jx5r6dw32nzbcr49isrzkdr6g3zwyxwzbfm";
19+ sha256 = "sha256-xYwnv30I0+CAx4QODSeMNhdlM2NuM8v4J3rx99NdYCc=";
2020 };
2121
2222 propagatedBuildInputs = [
@@ -32,14 +32,22 @@ buildPythonPackage rec {
3232 disabledTests = [
3333 # Some tests needs network capabilities
3434 "test_str_types_empty"
35+ "test_associate_reject"
3536 "TestEchoSCP"
3637 "TestEchoSCPCLI"
38+ "TestFindSCP"
39+ "TestFindSCPCLI"
40+ "TestGetSCP"
41+ "TestGetSCPCLI"
42+ "TestMoveSCP"
43+ "TestMoveSCPCLI"
44+ "TestQRGetServiceClass"
45+ "TestQRMoveServiceClass"
3746 "TestStoreSCP"
3847 "TestStoreSCPCLI"
3948 "TestStoreSCU"
4049 "TestStoreSCUCLI"
41− "TestQRGetServiceClass"
42− "TestQRMoveServiceClass"
50+ "TestState"
4351 ];
4452
4553 pythonImportsCheck = [ "pynetdicom" ];
@@ -49,7 +57,7 @@ buildPythonPackage rec {
4957 homepage = "https://github.com/pydicom/pynetdicom";
5058 license = with licenses; [ mit ];
5159 maintainers = with maintainers; [ fab ];
52− # Tests are not passing on Darwin, thus it's assumed that it doesn't work
53− broken = stdenv.isDarwin;
60+ # Tests are not passing on Darwin/Aarch64, thus it's assumed that it doesn't work
61+ broken = stdenv.isDarwin || stdenv.isAarch64;
5462 };
5563}
pkgs/development/python-modules/python-miio/default.nix+2−1
@@ -36,7 +36,8 @@ buildPythonPackage rec {
3636 postPatch = ''
3737 substituteInPlace pyproject.toml \
3838 --replace 'croniter = "^0"' 'croniter = "*"' \
39− --replace 'defusedxml = "^0.6"' 'defusedxml = "*"'
39+ --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' \
40+ --replace 'zeroconf = "^0.28"' 'zeroconf = "*"'
4041 '';
4142
4243 nativeBuildInputs = [
pkgs/development/python-modules/zeroconf/default.nix+8−8
@@ -3,27 +3,26 @@
33, buildPythonPackage
44, fetchPypi
55, ifaddr
6−, typing
7−, isPy27
86, pythonOlder
97, pytestCheckHook
108}:
119
1210buildPythonPackage rec {
1311 pname = "zeroconf";
14− version = "0.28.8";
15− disabled = isPy27;
12+ version = "0.29.0";
13+ disabled = pythonOlder "3.6";
1614
1715 src = fetchPypi {
1816 inherit pname version;
19− sha256 = "0narq8haa3b375vfblbyil77n8bw0wxqnanl91pl0wwwm884mqjb";
17+ sha256 = "sha256-eu+7ZYtFKx/X5REkNk+TjG9eQtbqiT+iVXvqjAbFQK8=";
2018 };
2119
22− propagatedBuildInputs = [ ifaddr ]
23− ++ lib.optionals (pythonOlder "3.5") [ typing ];
20+ propagatedBuildInputs = [ ifaddr ];
2421
2522 checkInputs = [ pytestCheckHook ];
23+
2624 pytestFlagsArray = [ "zeroconf/test.py" ];
25+
2726 disabledTests = [
2827 # disable tests that expect some sort of networking in the build container
2928 "test_launch_and_close"
@@ -33,6 +32,7 @@ buildPythonPackage rec {
3332 ] ++ lib.optionals stdenv.isDarwin [
3433 "test_lots_of_names"
3534 ];
35+
3636 __darwinAllowLocalNetworking = true;
3737
3838 pythonImportsCheck = [ "zeroconf" ];
@@ -40,7 +40,7 @@ buildPythonPackage rec {
4040 meta = with lib; {
4141 description = "Python implementation of multicast DNS service discovery";
4242 homepage = "https://github.com/jstasiak/python-zeroconf";
43− license = licenses.lgpl21;
43+ license = licenses.lgpl21Only;
4444 maintainers = with maintainers; [ abbradar ];
4545 };
4646}
pkgs/tools/security/expliot/default.nix+2−2
@@ -22,14 +22,14 @@
2222
2323buildPythonApplication rec {
2424 pname = "expliot";
25− version = "0.9.6";
25+ version = "0.9.7";
2626 disabled = pythonOlder "3.7";
2727
2828 src = fetchFromGitLab {
2929 owner = "expliot_framework";
3030 repo = pname;
3131 rev = version;
32− sha256 = "1wn8fyrvis0gw80zzmpivinw6mz5n33inhv39iallsl3is8xpgpa";
32+ sha256 = "sha256-k43PvH9BXcvxe7O5iCGzLuxv/WkB9YelH/d/1S7BpU0=";
3333 };
3434
3535 propagatedBuildInputs = [