From 4c413847d4c97f96c296e1e7ba789a261fa27bb5 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Mon, 21 Jun 2021 12:55:51 +0200 Subject: [PATCH 1/3] python3Packages.python-linux-procfs: init at 0.6.3 --- .../python-linux-procfs/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/python-linux-procfs/default.nix diff --git a/pkgs/development/python-modules/python-linux-procfs/default.nix b/pkgs/development/python-modules/python-linux-procfs/default.nix new file mode 100644 index 000000000000..702be64075ae --- /dev/null +++ b/pkgs/development/python-modules/python-linux-procfs/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchgit, six }: + +buildPythonPackage rec { + pname = "python-linux-procfs"; + version = "0.6.3"; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/libs/python/${pname}/${pname}.git"; + rev = "v${version}"; + sha256 = "sha256-PPgMlL9oj4HYUsr444ZrGo1LSZBl9hL5SE98IASUpbc="; + }; + + propagatedBuildInputs = [ six ]; + + # contains no tests + doCheck = false; + pythonImportsCheck = [ "procfs" ]; + + meta = with lib; { + description = "Python classes to extract information from the Linux kernel /proc files"; + homepage = "https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c192dd109791..8dd16275f2aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6929,6 +6929,8 @@ in { python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; + python-linux-procfs = callPackage ../development/python-modules/python-linux-procfs { }; + python-logstash = callPackage ../development/python-modules/python-logstash { }; python-ly = callPackage ../development/python-modules/python-ly { }; From 3d7629eba8ba6b9771d73913d66cfb18906d3b3c Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Mon, 21 Jun 2021 12:59:39 +0200 Subject: [PATCH 2/3] python3Packages.python-ethtool: init at 0.14 --- .../python-modules/python-ethtool/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/python-ethtool/default.nix diff --git a/pkgs/development/python-modules/python-ethtool/default.nix b/pkgs/development/python-modules/python-ethtool/default.nix new file mode 100644 index 000000000000..03c147397068 --- /dev/null +++ b/pkgs/development/python-modules/python-ethtool/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pkg-config +, libnl +, nettools +}: + +buildPythonPackage rec { + pname = "python-ethtool"; + version = "0.14"; + + src = fetchFromGitHub { + owner = "fedora-python"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Sp7ssfLZ/1FEKrvX257pKcaureZ5mdpJ7jCEh/ft1l0="; + }; + + postPatch = '' + substituteInPlace tests/parse_ifconfig.py --replace "Popen('ifconfig'," "Popen('${nettools}/bin/ifconfig'," + ''; + + buildInputs = [ libnl ]; + nativeBuildInputs = [ pkg-config ]; + pythonImportsCheck = [ "ethtool" ]; + + meta = with lib; { + description = "Python bindings for the ethtool kernel interface"; + homepage = "https://github.com/fedora-python/python-ethtool"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8dd16275f2aa..2a5462c835ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6885,6 +6885,8 @@ in { python-etcd = callPackage ../development/python-modules/python-etcd { }; + python-ethtool = callPackage ../development/python-modules/python-ethtool { }; + python_fedora = callPackage ../development/python-modules/python_fedora { }; python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; From b463abf3f8db62fc8b50b71a286a357574c08a31 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Mon, 21 Jun 2021 13:21:24 +0200 Subject: [PATCH 3/3] tuna: init at 0.15 --- pkgs/os-specific/linux/tuna/default.nix | 62 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/os-specific/linux/tuna/default.nix diff --git a/pkgs/os-specific/linux/tuna/default.nix b/pkgs/os-specific/linux/tuna/default.nix new file mode 100644 index 000000000000..0e621a24f081 --- /dev/null +++ b/pkgs/os-specific/linux/tuna/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonApplication +, fetchgit +, pygobject3 +, pytestCheckHook +, gdk-pixbuf +, glib +, gobject-introspection +, gtk3 +, python-linux-procfs +, python-ethtool +, wrapGAppsHook +}: + +buildPythonApplication rec { + pname = "tuna"; + version = "0.15"; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/utils/${pname}/${pname}.git"; + rev = "v${version}"; + sha256 = "sha256-lRHlbdCQ0NcjcWgLvCze67kN8NsK0f5RmKfPbkHhk78="; + }; + + patchPhase = '' + 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"]},' + + 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\" ]" + ''; + + nativeBuildInputs = [ + glib.dev + gobject-introspection + gtk3 + wrapGAppsHook + ]; + + propagatedBuildInputs = [ pygobject3 python-linux-procfs python-ethtool ]; + + postInstall = '' + mkdir -p $out/share/tuna + cp tuna/tuna_gui.glade $out/share/tuna/ + ''; + + # contains no tests + doCheck = false; + pythonImportsCheck = [ "tuna" ]; + + meta = with lib; { + description = "Thread and IRQ affinity setting GUI and cmd line tool"; + homepage = "https://git.kernel.org/pub/scm/utils/tuna/tuna.git"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4a0603faf10..b53b5535a77c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27177,6 +27177,8 @@ in tudu = callPackage ../applications/office/tudu { }; + tuna = python3Packages.callPackage ../os-specific/linux/tuna { }; + tunefish = callPackage ../applications/audio/tunefish { stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4 };