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] 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 { };