From 620471678e65a5cf87f3ce7e9e506f28547bbdb1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:53:05 +0100 Subject: [PATCH 1/9] python3Packages.pyroute2-core: 0.6.5 -> 0.6.7 --- pkgs/development/python-modules/pyroute2-core/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index fe92d88beaec..d8820e6d9d0f 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.core"; inherit version; - sha256 = "sha256-Jm10Dq5A+mTdBFQfAH0022ls7PMVTLpb4w+nWmfUOFI="; + hash = "sha256-N74cQcWx57lYIPiQTL+/Ec5Kf1rgdMrRkkYIdyaLjN4="; }; # pyroute2 sub-modules have no tests From fb8072c40cf14b0165ad4ec8af3fc4d1c2c87b7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:53:39 +0100 Subject: [PATCH 2/9] python3Packages.pyroute2-ethtool: 0.6.5 -> 0.6.7 --- .../python-modules/pyroute2-ethtool/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index 6f2695507863..fe4eac248700 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - sha256 = "sha256-yvgBS2dlIRNcR2DXLPWu72q7x/onUhD36VMzBzzHcVo="; + hash = "sha256-jwPg7xcmQU3F4cVrs2GVUxBXV6waMkrnmyZkHo2kLR0="; }; propagatedBuildInputs = [ From 69cb5edaf77d73b2e685fddbff9797fdd06af9db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:54:04 +0100 Subject: [PATCH 3/9] python3Packages.pyroute2-ipdb: 0.6.5 -> 0.6.7 --- pkgs/development/python-modules/pyroute2-ipdb/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 7411f49cb52a..cb40f0b4eff1 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - sha256 = "sha256-8gKP0QE9iviIFQ0DPuz3U3ZXpL434MzOqYAICZYetXc="; + hash = "sha256-uMEPUleEBIaIV4bCejTmeHYhKeaN9SNcUMzBAODNBEU="; }; propagatedBuildInputs = [ From 95ffac758cfce9dae18c998c8b27e58ad85da9b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:54:19 +0100 Subject: [PATCH 4/9] python3Packages.pyroute2-ndb: 0.6.5 -> 0.6.7 --- .../python-modules/pyroute2-ndb/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 7caa902dfa7d..2564e4601199 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - sha256 = "sha256-pNMJWE6e9seEKvT4MrSPxTRKsiXnDjhLrtG3/iuU2fg="; + hash = "sha256-o/rmbOwfRUPw/g1Cc/5otqKvGe3Br3y4iSXad/PfTPw="; }; propagatedBuildInputs = [ @@ -21,7 +25,9 @@ buildPythonPackage rec { # pyroute2 sub-modules have no tests doCheck = false; - pythonImportsCheck = [ "pr2modules.ndb" ]; + pythonImportsCheck = [ + "pr2modules.ndb" + ]; meta = with lib; { description = "NDB module for pyroute2"; From b9650e22d9f87acf1a1075171d7994934e4d778b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:54:36 +0100 Subject: [PATCH 5/9] python3Packages.pyroute2-nftables: 0.6.5 -> 0.6.7 --- pkgs/development/python-modules/pyroute2-nftables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index ec5ada77dd2e..6b0b4bc35c92 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.5"; + version = "0.6.7"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-sUVaY6PvwFDRCNVQ0cr9AR7d7W6JTZnnvfoC1ZK/bxY="; + sha256 = "sha256-d9LdXxBQGa40MmGuK2cFOOEI7X4Y1pPv0ObW9n7ZUjo="; }; propagatedBuildInputs = [ From b5c8b9791fea6e8148d9e052a62b36aceae49043 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:54:56 +0100 Subject: [PATCH 6/9] python3Packages.pyroute2-nslink: 0.6.5 -> 0.6.7 --- .../python-modules/pyroute2-nslink/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 722ea0a12f9c..0050c4aa795e 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - sha256 = "sha256-KS5sKDKnNUTBxtW6cn9xF6qEflX4jXjpS31GB7KZmZ4="; + hash = "sha256-p+U3Y5vKCxuvMl/yNKlay57tlU4GKttCJrAwctKa5TY="; }; propagatedBuildInputs = [ From 5b42c045a80f3d5694b327ea0b53cb46581df3c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:55:11 +0100 Subject: [PATCH 7/9] python3Packages.pyroute2-protocols: 0.6.5 -> 0.6.7 --- .../python-modules/pyroute2-protocols/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index ec3226f0cd98..39308e162e2d 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - sha256 = "sha256-lj9Q8ew+44m+Y72miQyuZhzjHmdLqYB+c2FK+ph1d84="; + hash = "sha256-GdququbQcU+exzxifb8UGamkSUMhR94j+auF8I6e7/Q="; }; propagatedBuildInputs = [ From 8ec171dc8f46a29dab5418414628deef8a9a6194 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:55:26 +0100 Subject: [PATCH 8/9] python3Packages.pyroute2: 0.6.5 -> 0.6.7 --- .../python-modules/pyroute2/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 9afea342e6d7..1fda8265428a 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, importlib-metadata , mitogen , pyroute2-core , pyroute2-ethtool @@ -9,15 +10,19 @@ , pyroute2-ndb , pyroute2-nftables , pyroute2-nslink +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0JlciuuWwOTu1NYul8nXlQAKGjO3R9bcVDJmZYV88Rw="; + hash = "sha256-qBv9jshyg0S9IThdrXHTFcb2neQPDmURmtSbqYCKlWo="; }; propagatedBuildInputs = [ @@ -29,18 +34,22 @@ buildPythonPackage rec { pyroute2-ndb pyroute2-nftables pyroute2-nslink + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; # Requires root privileges, https://github.com/svinota/pyroute2/issues/778 doCheck = false; - pythonImportsCheck = [ "pyroute2" ]; + pythonImportsCheck = [ + "pyroute2" + ]; meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; license = licenses.asl20; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ fab mic92 ]; platforms = platforms.unix; }; } From fcea2d9652f7835017e0da3dc77030fa0757deb5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 10:55:43 +0100 Subject: [PATCH 9/9] python3Packages.pyroute2-ipset: 0.6.5 -> 0.6.7 --- .../development/python-modules/pyroute2-ipset/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 5ab21f8f22c7..300b1d21fa1d 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.5"; + version = "0.6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - sha256 = "sha256-rlJ8D5mXSCMKH2iNmit8JXst9tdDafROylMNAHeTt50="; + hash = "sha256-roNLNXmnW27a+TgxtMi8HO5hF4agxdjQ0DMsYW6O44c="; }; propagatedBuildInputs = [