diff options
| author | Louis Taylor <louis@kragniz.eu> | 2016-01-13 12:06:29 +0000 |
|---|---|---|
| committer | Louis Taylor <louis@kragniz.eu> | 2016-01-13 12:06:33 +0000 |
| commit | 6ac550a3e9607fd4f7ab7bd808f0faa4a2af22ec (patch) | |
| tree | 3d0de2cfb42f2e5af6d91cae0d245369e54b9525 /pkgs/os-specific/linux/powertop | |
| parent | cea8ee50c7de8106d74ed66a9b54db56e3ab491e (diff) | |
| download | nixpkgs-6ac550a3e9607fd4f7ab7bd808f0faa4a2af22ec.tar nixpkgs-6ac550a3e9607fd4f7ab7bd808f0faa4a2af22ec.tar.gz nixpkgs-6ac550a3e9607fd4f7ab7bd808f0faa4a2af22ec.tar.bz2 nixpkgs-6ac550a3e9607fd4f7ab7bd808f0faa4a2af22ec.tar.lz nixpkgs-6ac550a3e9607fd4f7ab7bd808f0faa4a2af22ec.tar.xz nixpkgs-6ac550a3e9607fd4f7ab7bd808f0faa4a2af22ec.tar.zst nixpkgs-6ac550a3e9607fd4f7ab7bd808f0faa4a2af22ec.zip | |
powertop: 2.7 -> 2.8
Removed patch, since an equivalent fix was made upstream and included in the 2.8 release.
Diffstat (limited to 'pkgs/os-specific/linux/powertop')
| -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 c9095336e8d..00000000000 --- 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 82ca746d6a4..ef1dbf00b52 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" ''; |