git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119294 from fabaff/bump-aiodiscover
f3ef3cbMartin Weinelt
pkgs/development/python-modules/aiodiscover/default.nix+19−6
@@ -2,22 +2,23 @@
2, async-dns
2, async-dns
3, buildPythonPackage
3, buildPythonPackage
4, fetchFromGitHub
4, fetchFromGitHub
5−, fetchpatch
6, ifaddr
5, ifaddr
7, pyroute2
6, pyroute2
7+, pytest-asyncio
8+, pytestCheckHook
8, pythonOlder
9, pythonOlder
9}:
10}:
10
11
11buildPythonPackage rec {
12buildPythonPackage rec {
12 pname = "aiodiscover";
13 pname = "aiodiscover";
13− version = "1.3.3";
14+ version = "1.3.4";
14 disabled = pythonOlder "3.7";
15 disabled = pythonOlder "3.7";
15
16
16 src = fetchFromGitHub {
17 src = fetchFromGitHub {
17 owner = "bdraco";
18 owner = "bdraco";
18 repo = pname;
19 repo = pname;
19 rev = "v${version}";
20 rev = "v${version}";
20− sha256 = "186agrjx818vn00d3pqlka5ir48rgpbfyn1cifkn9ylsxg9cz3ph";
21+ sha256 = "sha256-TmWl5d5HwyqWPUjwtEvc5FzVfxV/K1pekljcMkGN0Ag=";
21 };
22 };
22
23
23 propagatedBuildInputs = [
24 propagatedBuildInputs = [
@@ -30,9 +31,21 @@ buildPythonPackage rec {
30 substituteInPlace setup.py --replace '"pytest-runner>=5.2",' ""
31 substituteInPlace setup.py --replace '"pytest-runner>=5.2",' ""
31 '';
32 '';
32
33
34+ checkInputs = [
35+ pytest-asyncio
36+ pytestCheckHook
37+ ];
38+
39+ preBuild = ''
40+ export HOME=$TMPDIR
41+ '';
42+
43+ disabledTests = [
33− # Tests require access to /etc/resolv.conf
44+ # Tests require access to /etc/resolv.conf
34− # pythonImportsCheck doesn't work as async-dns wants to create its CONFIG_DIR
45+ "test_async_discover_hosts"
35− doCheck = false;
46+ ];
47+
48+ pythonImportsCheck = ["aiodiscover"];
36
49
37 meta = with lib; {
50 meta = with lib; {
38 description = "Python module to discover hosts via ARP and PTR lookup";
51 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
1−{lib, buildPythonPackage, fetchPypi}:
2+, buildPythonPackage
3+, fetchPypi
4+}:
2
5
3buildPythonPackage rec {
6buildPythonPackage rec {
4 pname = "pyroute2";
7 pname = "pyroute2";
5− version = "0.5.14";
8+ version = "0.5.18";
6
9
7 src = fetchPypi {
10 src = fetchPypi {
8 inherit pname version;
11 inherit pname version;
9− sha256 = "774c5ecf05fe40f0f601a7ab33c19ca0b24f00bf4a094e58deaa5333b7ca49b5";
12+ sha256 = "sha256-CKxAytUsC7Lg8gCHUgWZqpH8zgsiHdJukEIzBCiBC8U=";
10 };
13 };
11
14
12− # requires root priviledges
15+ # Requires root privileges, https://github.com/svinota/pyroute2/issues/778
13 doCheck = false;
16 doCheck = false;
14
17
18+ pythonImportsCheck = [ "pyroute2" ];
19+
15 meta = with lib; {
20 meta = with lib; {
16 description = "Python Netlink library";
21 description = "Python Netlink library";
17 homepage = "https://github.com/svinota/pyroute2";
22 homepage = "https://github.com/svinota/pyroute2";
18 license = licenses.asl20;
23 license = licenses.asl20;
19− maintainers = [maintainers.mic92];
24+ maintainers = with maintainers; [ mic92 ];
20 platforms = platforms.unix;
25 platforms = platforms.unix;
21 };
26 };
22}
27}