Merge pull request #117733 from fabaff/bump-zeroconf

This commit is contained in:
Martin Weinelt 2021-04-03 19:42:19 +02:00 committed by GitHub
commit b5e8919e56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 24 deletions

View file

@ -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";

View file

@ -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,14 +32,22 @@ buildPythonPackage rec {
disabledTests = [
# Some tests needs network capabilities
"test_str_types_empty"
"test_associate_reject"
"TestEchoSCP"
"TestEchoSCPCLI"
"TestFindSCP"
"TestFindSCPCLI"
"TestGetSCP"
"TestGetSCPCLI"
"TestMoveSCP"
"TestMoveSCPCLI"
"TestQRGetServiceClass"
"TestQRMoveServiceClass"
"TestStoreSCP"
"TestStoreSCPCLI"
"TestStoreSCU"
"TestStoreSCUCLI"
"TestQRGetServiceClass"
"TestQRMoveServiceClass"
"TestState"
];
pythonImportsCheck = [ "pynetdicom" ];
@ -49,7 +57,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;
};
}

View file

@ -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 = [

View file

@ -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 ];
};
}

View file

@ -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 = [