From f46e45c1036b27d22a26921d9ac158a26f6bce7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 23 Jul 2024 07:22:22 -0700 Subject: [PATCH 1/4] python312Packages.python-linux-procfs: 0.6.3 -> 0.7.3 --- .../python-linux-procfs/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-linux-procfs/default.nix b/pkgs/development/python-modules/python-linux-procfs/default.nix index f4306acedf71..3a0ed111cb5c 100644 --- a/pkgs/development/python-modules/python-linux-procfs/default.nix +++ b/pkgs/development/python-modules/python-linux-procfs/default.nix @@ -1,21 +1,24 @@ { lib, buildPythonPackage, - fetchzip, + fetchurl, + setuptools, six, }: buildPythonPackage rec { pname = "python-linux-procfs"; - version = "0.6.3"; - format = "setuptools"; + version = "0.7.3"; + pyproject = true; - src = fetchzip { + src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git/snapshot/python-linux-procfs-v${version}.tar.gz"; - hash = "sha256-iaKL7CWJbIvvcUCah7bKdwKZoZJehbQpZ7n0liO8N64="; + hash = "sha256-6js8+PBqMwNYSe74zqZP8CZ5nt1ByjCWnex+wBY/LZU="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; # contains no tests doCheck = false; From 78b9e2d78f03f20285dd247ee72d3508004ec1a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 23 Jul 2024 07:27:44 -0700 Subject: [PATCH 2/4] python312Packages.ethtool: rename from python-ethtool --- .../python-modules/{python-ethtool => ethtool}/default.nix | 4 ++-- pkgs/os-specific/linux/tuna/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{python-ethtool => ethtool}/default.nix (93%) diff --git a/pkgs/development/python-modules/python-ethtool/default.nix b/pkgs/development/python-modules/ethtool/default.nix similarity index 93% rename from pkgs/development/python-modules/python-ethtool/default.nix rename to pkgs/development/python-modules/ethtool/default.nix index b140db8c9f22..2b64672a264d 100644 --- a/pkgs/development/python-modules/python-ethtool/default.nix +++ b/pkgs/development/python-modules/ethtool/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - pname = "python-ethtool"; + pname = "ethtool"; version = "0.15"; format = "setuptools"; src = fetchFromGitHub { owner = "fedora-python"; - repo = pname; + repo = "python-ethtool"; rev = "v${version}"; sha256 = "0arkcfq64a4fl88vjjsx4gd3mhcpa7mpq6sblpkgs4k4m9mccz6i"; }; diff --git a/pkgs/os-specific/linux/tuna/default.nix b/pkgs/os-specific/linux/tuna/default.nix index a75e9ec4f6a1..3e326eed8489 100644 --- a/pkgs/os-specific/linux/tuna/default.nix +++ b/pkgs/os-specific/linux/tuna/default.nix @@ -6,7 +6,7 @@ , gobject-introspection , gtk3 , python-linux-procfs -, python-ethtool +, ethtool , wrapGAppsHook3 }: @@ -38,7 +38,7 @@ buildPythonApplication rec { wrapGAppsHook3 ]; - propagatedBuildInputs = [ pygobject3 python-linux-procfs python-ethtool ]; + propagatedBuildInputs = [ pygobject3 python-linux-procfs ethtool ]; postInstall = '' mkdir -p $out/share/tuna diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 8824c33ed1a4..1798f32356a7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -406,6 +406,7 @@ mapAliases ({ PyMVGLive = pymvglive; # added 2023-02-19 pymyq = python-myq; # added 2023-10-20 pynose = throw "pynose was removed, because it violates the license of nose, by redistributing modified LGPL code under MIT."; + python-ethtool = ethtool; # added 2024-07-23 python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07 pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 pyqt5_sip = pyqt5-sip; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d6400d36b332..8e02e17c4c90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4000,6 +4000,8 @@ self: super: with self; { eth-utils = callPackage ../development/python-modules/eth-utils { }; + ethtool = callPackage ../development/python-modules/ethtool { }; + etils = callPackage ../development/python-modules/etils { }; etuples = callPackage ../development/python-modules/etuples { }; @@ -12644,8 +12646,6 @@ self: super: with self; { python-etcd = callPackage ../development/python-modules/python-etcd { }; - python-ethtool = callPackage ../development/python-modules/python-ethtool { }; - python-ev3dev2 = callPackage ../development/python-modules/python-ev3dev2 { }; python-fedora = callPackage ../development/python-modules/python-fedora { }; From 026dd53d499fcfd078ef2255d9c7b615512bc4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 23 Jul 2024 07:41:41 -0700 Subject: [PATCH 3/4] python312Packages.ethtool: fix tests --- .../python-modules/ethtool/default.nix | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ethtool/default.nix b/pkgs/development/python-modules/ethtool/default.nix index 2b64672a264d..497e6cc88851 100644 --- a/pkgs/development/python-modules/ethtool/default.nix +++ b/pkgs/development/python-modules/ethtool/default.nix @@ -2,32 +2,54 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, + setuptools, pkg-config, libnl, nettools, + pytestCheckHook, }: buildPythonPackage rec { pname = "ethtool"; version = "0.15"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "fedora-python"; repo = "python-ethtool"; - rev = "v${version}"; - sha256 = "0arkcfq64a4fl88vjjsx4gd3mhcpa7mpq6sblpkgs4k4m9mccz6i"; + rev = "refs/tags/v${version}"; + hash = "sha256-0XzGaqpkEv3mpUsbfOtRl8E62iNdS7kRoo4oYrBjMys="; }; + patches = [ + # https://github.com/fedora-python/python-ethtool/pull/60 + (fetchpatch2 { + url = "https://github.com/fedora-python/python-ethtool/commit/f82dd763bd50affda993b9afe3b141069a1a7466.patch"; + hash = "sha256-mtI7XsoyM43s2DFQdsBNpB8jJff7ZyO2J6SHodBrdrI="; + }) + ]; + postPatch = '' - substituteInPlace tests/parse_ifconfig.py --replace "Popen('ifconfig'," "Popen('${nettools}/bin/ifconfig'," + substituteInPlace tests/parse_ifconfig.py \ + --replace-fail "Popen('ifconfig'," "Popen('${lib.getExe' nettools "ifconfig"}'," ''; - buildInputs = [ libnl ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libnl ]; + pythonImportsCheck = [ "ethtool" ]; + nativeCheckInputs = [ + nettools + pytestCheckHook + ]; + meta = with lib; { + changelog = "https://github.com/fedora-python/python-ethtool/blob/${src.rev}/CHANGES.rst"; description = "Python bindings for the ethtool kernel interface"; homepage = "https://github.com/fedora-python/python-ethtool"; license = licenses.gpl2Plus; From b60dd6b426b545b9b71bb4f3db5efeca9c60efd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 23 Jul 2024 08:02:43 -0700 Subject: [PATCH 4/4] tuna: 0.15 -> 0.19 --- pkgs/os-specific/linux/tuna/default.nix | 43 ++++++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/pkgs/os-specific/linux/tuna/default.nix b/pkgs/os-specific/linux/tuna/default.nix index 3e326eed8489..18b907aacb13 100644 --- a/pkgs/os-specific/linux/tuna/default.nix +++ b/pkgs/os-specific/linux/tuna/default.nix @@ -1,36 +1,37 @@ -{ lib -, buildPythonApplication -, fetchzip -, pygobject3 -, glib -, gobject-introspection -, gtk3 -, python-linux-procfs -, ethtool -, wrapGAppsHook3 +{ + lib, + python3, + fetchurl, + glib, + gobject-introspection, + gtk3, + wrapGAppsHook3, }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "tuna"; - version = "0.15"; + version = "0.19"; + pyproject = true; - src = fetchzip { + src = fetchurl { url = "https://git.kernel.org/pub/scm/utils/tuna/tuna.git/snapshot/tuna-v${version}.tar.gz"; - sha256 = "MwyLBwKz5ur1sBXHiCLq/Nq2u5aaiC+KzXqvGBmQii8="; + hash = "sha256-t10CxtwnTOg1uQgm6mTrNUIU8LkXJ3BkTycjWteQvuU="; }; postPatch = '' mv tuna-cmd.py tuna/cmd.py substituteInPlace setup.py \ - --replace 'packages = ["tuna", "tuna/gui"],' \ - 'packages = ["tuna", "tuna/gui"], entry_points={"console_scripts":["tuna=tuna.cmd:main"]},' + --replace-fail 'packages = ["tuna", "tuna/gui"],' \ + 'packages = ["tuna", "tuna/gui"], entry_points={"console_scripts":["tuna=tuna.cmd:main"]},' substituteInPlace tuna/tuna_gui.py \ - --replace "self.binpath + 'pkexec'" "'/run/wrappers/bin/pkexec'" \ - --replace 'tuna_glade_dirs = [".", "tuna", "/usr/share/tuna"]' "tuna_glade_dirs = [ \"$out/share/tuna\" ]" + --replace-fail "self.binpath + 'pkexec'" "'/run/wrappers/bin/pkexec'" \ + --replace-fail 'tuna_glade_dirs = [".", "tuna", "/usr/share/tuna"]' "tuna_glade_dirs = [ \"$out/share/tuna\" ]" ''; + build-system = with python3.pkgs; [ setuptools ]; + nativeBuildInputs = [ glib.dev gobject-introspection @@ -38,7 +39,11 @@ buildPythonApplication rec { wrapGAppsHook3 ]; - propagatedBuildInputs = [ pygobject3 python-linux-procfs ethtool ]; + dependencies = with python3.pkgs; [ + pygobject3 + python-linux-procfs + ethtool + ]; postInstall = '' mkdir -p $out/share/tuna diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24c05bba8f60..e7cc53465429 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34471,7 +34471,7 @@ with pkgs; tudu = callPackage ../applications/office/tudu { }; - tuna = python3Packages.callPackage ../os-specific/linux/tuna { }; + tuna = callPackage ../os-specific/linux/tuna { }; tunefish = callPackage ../applications/audio/tunefish { stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4