Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

tuna: 0.15 -> 0.19

+25 -20
+24 -19
pkgs/os-specific/linux/tuna/default.nix
··· 1 - { lib 2 - , buildPythonApplication 3 - , fetchzip 4 - , pygobject3 5 - , glib 6 - , gobject-introspection 7 - , gtk3 8 - , python-linux-procfs 9 - , ethtool 10 - , wrapGAppsHook3 11 }: 12 13 - buildPythonApplication rec { 14 pname = "tuna"; 15 - version = "0.15"; 16 17 - src = fetchzip { 18 url = "https://git.kernel.org/pub/scm/utils/tuna/tuna.git/snapshot/tuna-v${version}.tar.gz"; 19 - sha256 = "MwyLBwKz5ur1sBXHiCLq/Nq2u5aaiC+KzXqvGBmQii8="; 20 }; 21 22 postPatch = '' 23 mv tuna-cmd.py tuna/cmd.py 24 25 substituteInPlace setup.py \ 26 - --replace 'packages = ["tuna", "tuna/gui"],' \ 27 - 'packages = ["tuna", "tuna/gui"], entry_points={"console_scripts":["tuna=tuna.cmd:main"]},' 28 29 substituteInPlace tuna/tuna_gui.py \ 30 - --replace "self.binpath + 'pkexec'" "'/run/wrappers/bin/pkexec'" \ 31 - --replace 'tuna_glade_dirs = [".", "tuna", "/usr/share/tuna"]' "tuna_glade_dirs = [ \"$out/share/tuna\" ]" 32 ''; 33 34 nativeBuildInputs = [ 35 glib.dev ··· 38 wrapGAppsHook3 39 ]; 40 41 - propagatedBuildInputs = [ pygobject3 python-linux-procfs ethtool ]; 42 43 postInstall = '' 44 mkdir -p $out/share/tuna
··· 1 + { 2 + lib, 3 + python3, 4 + fetchurl, 5 + glib, 6 + gobject-introspection, 7 + gtk3, 8 + wrapGAppsHook3, 9 }: 10 11 + python3.pkgs.buildPythonApplication rec { 12 pname = "tuna"; 13 + version = "0.19"; 14 + pyproject = true; 15 16 + src = fetchurl { 17 url = "https://git.kernel.org/pub/scm/utils/tuna/tuna.git/snapshot/tuna-v${version}.tar.gz"; 18 + hash = "sha256-t10CxtwnTOg1uQgm6mTrNUIU8LkXJ3BkTycjWteQvuU="; 19 }; 20 21 postPatch = '' 22 mv tuna-cmd.py tuna/cmd.py 23 24 substituteInPlace setup.py \ 25 + --replace-fail 'packages = ["tuna", "tuna/gui"],' \ 26 + 'packages = ["tuna", "tuna/gui"], entry_points={"console_scripts":["tuna=tuna.cmd:main"]},' 27 28 substituteInPlace tuna/tuna_gui.py \ 29 + --replace-fail "self.binpath + 'pkexec'" "'/run/wrappers/bin/pkexec'" \ 30 + --replace-fail 'tuna_glade_dirs = [".", "tuna", "/usr/share/tuna"]' "tuna_glade_dirs = [ \"$out/share/tuna\" ]" 31 ''; 32 + 33 + build-system = with python3.pkgs; [ setuptools ]; 34 35 nativeBuildInputs = [ 36 glib.dev ··· 39 wrapGAppsHook3 40 ]; 41 42 + dependencies = with python3.pkgs; [ 43 + pygobject3 44 + python-linux-procfs 45 + ethtool 46 + ]; 47 48 postInstall = '' 49 mkdir -p $out/share/tuna
+1 -1
pkgs/top-level/all-packages.nix
··· 34471 34472 tudu = callPackage ../applications/office/tudu { }; 34473 34474 - tuna = python3Packages.callPackage ../os-specific/linux/tuna { }; 34475 34476 tunefish = callPackage ../applications/audio/tunefish { 34477 stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4
··· 34471 34472 tudu = callPackage ../applications/office/tudu { }; 34473 34474 + tuna = callPackage ../os-specific/linux/tuna { }; 34475 34476 tunefish = callPackage ../applications/audio/tunefish { 34477 stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4