diff options
| author | lethalman <lucabru@src.gnome.org> | 2016-01-13 14:18:52 +0100 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2016-01-13 14:18:52 +0100 |
| commit | e1eea5ad7f41379768715428afc26864a7f72283 (patch) | |
| tree | 7221c80c9273523bfc0a9131f56ffb1e47ac8ef9 /pkgs/os-specific/linux | |
| parent | 8a983439198473bd5bfa9c69424b6f68a8a9c0ef (diff) | |
| parent | 6ac550a3e9607fd4f7ab7bd808f0faa4a2af22ec (diff) | |
| download | nixlib-e1eea5ad7f41379768715428afc26864a7f72283.tar nixlib-e1eea5ad7f41379768715428afc26864a7f72283.tar.gz nixlib-e1eea5ad7f41379768715428afc26864a7f72283.tar.bz2 nixlib-e1eea5ad7f41379768715428afc26864a7f72283.tar.lz nixlib-e1eea5ad7f41379768715428afc26864a7f72283.tar.xz nixlib-e1eea5ad7f41379768715428afc26864a7f72283.tar.zst nixlib-e1eea5ad7f41379768715428afc26864a7f72283.zip | |
Merge pull request #12360 from kragniz/powertop-v2.8
powertop: 2.7 -> 2.8
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/powertop/auto-tune.patch | 11 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/powertop/default.nix | 8 |
2 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/powertop/auto-tune.patch b/pkgs/os-specific/linux/powertop/auto-tune.patch deleted file mode 100644 index c9095336e8dc..000000000000 --- a/pkgs/os-specific/linux/powertop/auto-tune.patch +++ /dev/null @@ -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; - } diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 82ca746d6a47..ef1dbf00b52c 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -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" ''; |