Merge pull request #119294 from fabaff/bump-aiodiscover

Changed files
+29 -11
pkgs
development
python-modules
aiodiscover
pyroute2
+19 -6
pkgs/development/python-modules/aiodiscover/default.nix
···
, async-dns
, buildPythonPackage
, fetchFromGitHub
-
, fetchpatch
, ifaddr
, pyroute2
+
, pytest-asyncio
+
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "aiodiscover";
-
version = "1.3.3";
+
version = "1.3.4";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
-
sha256 = "186agrjx818vn00d3pqlka5ir48rgpbfyn1cifkn9ylsxg9cz3ph";
+
sha256 = "sha256-TmWl5d5HwyqWPUjwtEvc5FzVfxV/K1pekljcMkGN0Ag=";
};
propagatedBuildInputs = [
···
substituteInPlace setup.py --replace '"pytest-runner>=5.2",' ""
'';
-
# Tests require access to /etc/resolv.conf
-
# pythonImportsCheck doesn't work as async-dns wants to create its CONFIG_DIR
-
doCheck = false;
+
checkInputs = [
+
pytest-asyncio
+
pytestCheckHook
+
];
+
+
preBuild = ''
+
export HOME=$TMPDIR
+
'';
+
+
disabledTests = [
+
# Tests require access to /etc/resolv.conf
+
"test_async_discover_hosts"
+
];
+
+
pythonImportsCheck = ["aiodiscover"];
meta = with lib; {
description = "Python module to discover hosts via ARP and PTR lookup";
+10 -5
pkgs/development/python-modules/pyroute2/default.nix
···
-
{lib, buildPythonPackage, fetchPypi}:
+
{ lib
+
, buildPythonPackage
+
, fetchPypi
+
}:
buildPythonPackage rec {
pname = "pyroute2";
-
version = "0.5.14";
+
version = "0.5.18";
src = fetchPypi {
inherit pname version;
-
sha256 = "774c5ecf05fe40f0f601a7ab33c19ca0b24f00bf4a094e58deaa5333b7ca49b5";
+
sha256 = "sha256-CKxAytUsC7Lg8gCHUgWZqpH8zgsiHdJukEIzBCiBC8U=";
};
-
# requires root priviledges
+
# Requires root privileges, https://github.com/svinota/pyroute2/issues/778
doCheck = false;
+
pythonImportsCheck = [ "pyroute2" ];
+
meta = with lib; {
description = "Python Netlink library";
homepage = "https://github.com/svinota/pyroute2";
license = licenses.asl20;
-
maintainers = [maintainers.mic92];
+
maintainers = with maintainers; [ mic92 ];
platforms = platforms.unix;
};
}