From 4b1ac5a531a55904cbe20d20f0f37473fb29df79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 21:21:15 +0200 Subject: [PATCH 01/11] python3Packages.pyroute2-core: init at 0.6.1 --- .../python-modules/pyroute2-core/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-core/default.nix diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix new file mode 100644 index 000000000000..4ee37e4bfed1 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-core"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.core"; + inherit version; + sha256 = "04v10rzz844w2wfpy4pkh8fxn6dminjmfm1q7ngg5wvpk5r691rj"; + }; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.common" + "pr2modules.config" + "pr2modules.proxy" + ]; + + meta = with lib; { + description = "Core module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f331e80124b1..f427cbeadea9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6162,6 +6162,8 @@ in { pyroute2 = callPackage ../development/python-modules/pyroute2 { }; + pyroute2-core = callPackage ../development/python-modules/pyroute2-core { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; From b91cfd8c3e3da88dfd49f7ee565aef52d88ba436 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 21:40:47 +0200 Subject: [PATCH 02/11] python3Packages.pyroute2-ethtool: init at 0.6.1 --- .../pyroute2-ethtool/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-ethtool/default.nix diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix new file mode 100644 index 000000000000..4e671b4e193f --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ethtool"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ethtool"; + inherit version; + sha256 = "1gd2vvdkjf6ppiql3znrlzc9xg8c4gsyg2jfm76c2xf329hi66n7"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.ethtool" + ]; + + meta = with lib; { + description = "Ethtool module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f427cbeadea9..17b9200e8a87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6164,6 +6164,8 @@ in { pyroute2-core = callPackage ../development/python-modules/pyroute2-core { }; + pyroute2-ethtool = callPackage ../development/python-modules/pyroute2-ethtool { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; From 2ef07d23b3c06852ae28eaeea22ac47e6b904f3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 21:47:48 +0200 Subject: [PATCH 03/11] python3Packages.pyroute2-ipdb: init at 0.6.1 --- .../python-modules/pyroute2-ipdb/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-ipdb/default.nix diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix new file mode 100644 index 000000000000..733988f20f50 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ipdb"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ipdb"; + inherit version; + sha256 = "0wnzvy72pjipsdcfnwxpqp0jimg2l3w6gwd3r4b3mhvhackgsvs6"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.ipdb" + ]; + + meta = with lib; { + description = "Ipdb module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17b9200e8a87..0362cd20db71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6166,6 +6166,8 @@ in { pyroute2-ethtool = callPackage ../development/python-modules/pyroute2-ethtool { }; + pyroute2-ipdb = callPackage ../development/python-modules/pyroute2-ipdb { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; From c64126b658a5243742c14761c443842358e6df09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 22:04:11 +0200 Subject: [PATCH 04/11] python3Packages.pyroute2-ipset: init at 0.6.1 --- .../python-modules/pyroute2-ipset/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-ipset/default.nix diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix new file mode 100644 index 000000000000..5ea6c7ce5d4d --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ipset"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ipset"; + inherit version; + sha256 = "1d5l9f028y7fjfbxpp5wls9ffdgrln24dlz8k4p11b5n445liakx"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.ipset" + ]; + + meta = with lib; { + description = "Ipset module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0362cd20db71..99557154c6b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6168,6 +6168,8 @@ in { pyroute2-ipdb = callPackage ../development/python-modules/pyroute2-ipdb { }; + pyroute2-ipset = callPackage ../development/python-modules/pyroute2-ipset { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; From c48ebb385f55ae2e18b48c1e7a342e562ca1316a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 22:09:20 +0200 Subject: [PATCH 05/11] python3Packages.pyroute2-protocols: init at 0.6.1 --- .../pyroute2-protocols/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-protocols/default.nix diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix new file mode 100644 index 000000000000..389ca2ab44d0 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-protocols"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.protocols"; + inherit version; + sha256 = "16c22ygyxdn1mhnd2f34q9b2mqa27klk6di91w27ycb3aczmadlm"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.protocols" + ]; + + meta = with lib; { + description = "Protocols module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99557154c6b2..b5a2257ae504 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6170,6 +6170,8 @@ in { pyroute2-ipset = callPackage ../development/python-modules/pyroute2-ipset { }; + pyroute2-protocols = callPackage ../development/python-modules/pyroute2-protocols { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; From 1587fc4b6274117a4935313e17ff57214bbaa34c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 22:17:14 +0200 Subject: [PATCH 06/11] python3Packages.pyroute2-nftables: init at 0.6.1 --- .../pyroute2-nftables/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-nftables/default.nix diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix new file mode 100644 index 000000000000..594d57cba1bb --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-nftables"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.nftables"; + inherit version; + sha256 = "0g93jsjf77sxjxmgmd8pzy8daxnqnzp2fk9gbh9kxk1n1958p100"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.nftables" + ]; + + meta = with lib; { + description = "Nftables module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5a2257ae504..01b036c34f80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6170,6 +6170,8 @@ in { pyroute2-ipset = callPackage ../development/python-modules/pyroute2-ipset { }; + pyroute2-nftables = callPackage ../development/python-modules/pyroute2-nftables { }; + pyroute2-protocols = callPackage ../development/python-modules/pyroute2-protocols { }; pyrr = callPackage ../development/python-modules/pyrr { }; From 3212db058d568ce295ed60d173a402688a315e50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 22:23:30 +0200 Subject: [PATCH 07/11] python3Packages.pyroute2-nslink: init at 0.6.1 --- .../pyroute2-nslink/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-nslink/default.nix diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix new file mode 100644 index 000000000000..e1076c1d0a05 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-nslink"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.nslink"; + inherit version; + sha256 = "0hjdi863imppirjrwr87xk2mfbw2djcsh7x94cq4xwps7bxmmkwk"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.nslink" + ]; + + meta = with lib; { + description = "Nslink module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01b036c34f80..c6c9c86eb676 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6172,6 +6172,8 @@ in { pyroute2-nftables = callPackage ../development/python-modules/pyroute2-nftables { }; + pyroute2-nslink = callPackage ../development/python-modules/pyroute2-nslink { }; + pyroute2-protocols = callPackage ../development/python-modules/pyroute2-protocols { }; pyrr = callPackage ../development/python-modules/pyrr { }; From db8f0958452fac36c9621ae8bdeecd9f9fb361d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 22:55:26 +0200 Subject: [PATCH 08/11] python3Packages.pyroute2-ndb: init at 0.6.1 --- .../python-modules/pyroute2-ndb/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-ndb/default.nix diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix new file mode 100644 index 000000000000..7b34b3d341a3 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ndb"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ndb"; + inherit version; + sha256 = "0lzvh0vva8i86h00add0b45s4f5dn6zbgysfvmzrxxasvda7fhlj"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ "pr2modules.ndb" ]; + + meta = with lib; { + description = "NDB module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6c9c86eb676..dd4c0f4eb2da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6170,6 +6170,8 @@ in { pyroute2-ipset = callPackage ../development/python-modules/pyroute2-ipset { }; + pyroute2-ndb = callPackage ../development/python-modules/pyroute2-ndb { }; + pyroute2-nftables = callPackage ../development/python-modules/pyroute2-nftables { }; pyroute2-nslink = callPackage ../development/python-modules/pyroute2-nslink { }; From b783a03b99def51169b896337c287f9a8213921e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 00:20:00 +0200 Subject: [PATCH 09/11] python3Packages.mitogen: init at 0.3.0rc1 --- .../python-modules/mitogen/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/mitogen/default.nix diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix new file mode 100644 index 000000000000..3268e8fae7ba --- /dev/null +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "mitogen"; + version = "0.3.0rc1"; + + src = fetchFromGitHub { + owner = "mitogen-hq"; + repo = pname; + rev = "v${version}"; + sha256 = "0hxb41sshybxjyvyarl2axs0v6w53vqxafgfjrmpp5k20z5kapz4"; + }; + + # Tests require network access and Docker support + doCheck = false; + + pythonImportsCheck = [ "mitogen" ]; + + meta = with lib; { + description = "Python Library for writing distributed self-replicating programs"; + homepage = "https://github.com/mitogen-hq/mitogen"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd4c0f4eb2da..518ee88286ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4262,6 +4262,8 @@ in { mitmproxy = callPackage ../development/python-modules/mitmproxy { }; + mitogen = callPackage ../development/python-modules/mitogen { }; + mixpanel = callPackage ../development/python-modules/mixpanel { }; mkl-service = callPackage ../development/python-modules/mkl-service { }; From 0e9f4948ef419c58bb717194ae440c08b5e5c59d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 00:22:44 +0200 Subject: [PATCH 10/11] python3Packages.pyroute2: 0.5.18 -> 0.6.1 --- .../python-modules/pyroute2/default.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 00ce008d6cc7..f18bc12caa6a 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,17 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, mitogen +, pyroute2-core +, pyroute2-ethtool +, pyroute2-ipdb +, pyroute2-ipset +, pyroute2-ndb +, pyroute2-nftables +, pyroute2-nslink }: buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.18"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CKxAytUsC7Lg8gCHUgWZqpH8zgsiHdJukEIzBCiBC8U="; + sha256 = "sha256-nvG1PcuyQoZPrfMS4atsXsvpInjYt1bUIeX6Ol5DsO8="; }; + propagatedBuildInputs = [ + mitogen + pyroute2-core + pyroute2-ethtool + pyroute2-ipdb + pyroute2-ipset + pyroute2-ndb + pyroute2-nftables + pyroute2-nslink + ]; + # Requires root privileges, https://github.com/svinota/pyroute2/issues/778 doCheck = false; From cce46ce00712fbd7ee4c9e4db29a5028da6d22f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 00:37:01 +0200 Subject: [PATCH 11/11] python39Packages.aiodiscover: allow later pyroute2 releases --- pkgs/development/python-modules/aiodiscover/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 942482ba5ebb..8471afaded86 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -28,7 +28,9 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py --replace '"pytest-runner>=5.2",' "" + substituteInPlace setup.py \ + --replace '"pytest-runner>=5.2",' "" \ + --replace "pyroute2>=0.5.18,!=0.6.1" "pyroute2" ''; checkInputs = [