git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119294 from fabaff/bump-aiodiscover
commitf3ef3cb10759c7300fd69f9b613cefe5cf6b21cc authorMartin Weinelt <mweinelt@users.noreply.github.com> dateWed 14 Apr 2021, 01:53 (6 years ago) parentdd4b2d58f7356a
2 files changed+29−11
pkgs/development/python-modules/aiodiscover/default.nix+19−6 pkgs/development/python-modules/pyroute2/default.nix+10−5
pkgs/development/python-modules/aiodiscover/default.nix+19−6
@@ -2,22 +2,23 @@
22, async-dns
33, buildPythonPackage
44, fetchFromGitHub
5−, fetchpatch
65, ifaddr
76, pyroute2
7+, pytest-asyncio
8+, pytestCheckHook
89, pythonOlder
910}:
1011
1112buildPythonPackage rec {
1213 pname = "aiodiscover";
13− version = "1.3.3";
14+ version = "1.3.4";
1415 disabled = pythonOlder "3.7";
1516
1617 src = fetchFromGitHub {
1718 owner = "bdraco";
1819 repo = pname;
1920 rev = "v${version}";
20− sha256 = "186agrjx818vn00d3pqlka5ir48rgpbfyn1cifkn9ylsxg9cz3ph";
21+ sha256 = "sha256-TmWl5d5HwyqWPUjwtEvc5FzVfxV/K1pekljcMkGN0Ag=";
2122 };
2223
2324 propagatedBuildInputs = [
@@ -30,9 +31,21 @@ buildPythonPackage rec {
3031 substituteInPlace setup.py --replace '"pytest-runner>=5.2",' ""
3132 '';
3233
33− # Tests require access to /etc/resolv.conf
34− # pythonImportsCheck doesn't work as async-dns wants to create its CONFIG_DIR
35− doCheck = false;
34+ checkInputs = [
35+ pytest-asyncio
36+ pytestCheckHook
37+ ];
38+
39+ preBuild = ''
40+ export HOME=$TMPDIR
41+ '';
42+
43+ disabledTests = [
44+ # Tests require access to /etc/resolv.conf
45+ "test_async_discover_hosts"
46+ ];
47+
48+ pythonImportsCheck = ["aiodiscover"];
3649
3750 meta = with lib; {
3851 description = "Python module to discover hosts via ARP and PTR lookup";
pkgs/development/python-modules/pyroute2/default.nix+10−5
@@ -1,22 +1,27 @@
1−{lib, buildPythonPackage, fetchPypi}:
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+}:
25
36buildPythonPackage rec {
47 pname = "pyroute2";
5− version = "0.5.14";
8+ version = "0.5.18";
69
710 src = fetchPypi {
811 inherit pname version;
9− sha256 = "774c5ecf05fe40f0f601a7ab33c19ca0b24f00bf4a094e58deaa5333b7ca49b5";
12+ sha256 = "sha256-CKxAytUsC7Lg8gCHUgWZqpH8zgsiHdJukEIzBCiBC8U=";
1013 };
1114
12− # requires root priviledges
15+ # Requires root privileges, https://github.com/svinota/pyroute2/issues/778
1316 doCheck = false;
1417
18+ pythonImportsCheck = [ "pyroute2" ];
19+
1520 meta = with lib; {
1621 description = "Python Netlink library";
1722 homepage = "https://github.com/svinota/pyroute2";
1823 license = licenses.asl20;
19− maintainers = [maintainers.mic92];
24+ maintainers = with maintainers; [ mic92 ];
2025 platforms = platforms.unix;
2126 };
2227}