JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #94153 from dtzWill/update/powertop-2.13

Browse Source 
powertop: 2.10 -> 2.13
This commit is contained in:
xeji 2020-07-30 22:35:31 +02:00 committed by GitHub
commit 1a0b9e61a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/powertop/default.nix
View File

@ -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"

13
pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch
View File

@ -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);