Merge pull request #12360 from kragniz/powertop-v2.8

powertop: 2.7 -> 2.8
This commit is contained in:
lethalman 2016-01-13 14:18:52 +01:00
commit e1eea5ad7f
2 changed files with 2 additions and 17 deletions

View File

@ -1,11 +0,0 @@
diff --git a/src/devices/devfreq.cpp b/src/devices/devfreq.cpp
index d2e56e3..4de5c9b 100644
--- a/src/devices/devfreq.cpp
+++ b/src/devices/devfreq.cpp
@@ -247,6 +247,7 @@ void create_all_devfreq_devices(void)
fprintf(stderr, "Devfreq not enabled\n");
is_enabled = false;
closedir(dir);
+ dir = NULL;
return;
}

View File

@ -1,19 +1,15 @@
{ stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
stdenv.mkDerivation rec {
name = "powertop-2.7";
name = "powertop-2.8";
src = fetchurl {
url = "https://01.org/sites/default/files/downloads/powertop/${name}.tar.gz";
sha256 = "1jkqqr3l1x98m7rgin1dgfzxqwj4vciw9lyyq1kl9bdswa818jwd";
sha256 = "0nlwazxbnn0k6q5f5b09wdhw0f194lpzkp3l7vxansqhfczmcyx8";
};
buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ];
# Fix --auto-tune bug:
# https://lists.01.org/pipermail/powertop/2014-December/001727.html
patches = [ ./auto-tune.patch ];
postPatch = ''
substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
'';