diff options
| author | Will Dietz <w@wdtz.org> | 2020-07-29 01:16:58 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2020-07-29 01:16:58 -0500 |
| commit | 8565fc75a1c141dc55c17ef64eaa2910e72b2d04 (patch) | |
| tree | 884d5fa3aa614a484d126b4bc3183394facc5b33 /pkgs/os-specific/linux/powertop | |
| parent | 65eab104a34d7db8f847d21f9c783a5f192b0f18 (diff) | |
| download | nixpkgs-8565fc75a1c141dc55c17ef64eaa2910e72b2d04.tar nixpkgs-8565fc75a1c141dc55c17ef64eaa2910e72b2d04.tar.gz nixpkgs-8565fc75a1c141dc55c17ef64eaa2910e72b2d04.tar.bz2 nixpkgs-8565fc75a1c141dc55c17ef64eaa2910e72b2d04.tar.lz nixpkgs-8565fc75a1c141dc55c17ef64eaa2910e72b2d04.tar.xz nixpkgs-8565fc75a1c141dc55c17ef64eaa2910e72b2d04.tar.zst nixpkgs-8565fc75a1c141dc55c17ef64eaa2910e72b2d04.zip | |
powertop: 2.10 -> 2.13
https://01.org/powertop/downloads/powertop-v2.13 https://01.org/powertop/downloads/powertop-v2.12
Diffstat (limited to 'pkgs/os-specific/linux/powertop')
| -rw-r--r-- | pkgs/os-specific/linux/powertop/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch | 13 |
2 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index bcac7ab63c0..4bf318d743e 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "powertop"; - version = "2.10"; + version = "2.13"; src = fetchurl { - url = "https://01.org/sites/default/files/downloads/${pname}-v${version}.tar.gz"; - sha256 = "0xaazqccyd42v2q532dxx40nqhb9sfsa6cyx8641rl57mfg4bdyk"; + url = "https://01.org/sites/default/files/downloads/${pname}-${version}.tar.gz"; + sha256 = "0y1ixw8v17fdb1ima0zshrd0rh4zxdh10r93nrrvq6d4lhn9jpx6"; }; outputs = [ "out" "man" ]; @@ -20,10 +20,7 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; } - ) ++ [ - # Fix vertical scrolling, see: https://lists.01.org/pipermail/powertop/2019-March/002046.html - ./fix-vertical-scrolling.patch - ]; + ); postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" diff --git a/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch b/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch deleted file mode 100644 index b9b3fdbaf34..00000000000 --- a/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/display.cpp b/src/display.cpp -index 07227c5..7b3a7a2 100644 ---- a/src/display.cpp -+++ b/src/display.cpp -@@ -244,7 +244,7 @@ void cursor_down(void) - w = tab_windows[tab_names[current_tab]]; - if (w) { - if (w->ypad_pos < 1000) { -- if (tab_names[current_tab] == "Tunables" || "WakeUp") { -+ if (tab_names[current_tab] == "Tunables" || tab_names[current_tab] == "WakeUp") { - if ((w->cursor_pos + 7) >= LINES) { - prefresh(w->win, ++w->ypad_pos, w->xpad_pos, - 1, 0, LINES - 3, COLS - 1); |