summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2016-01-07 14:36:51 -0500
committerShea Levy <shea@shealevy.com>2016-01-07 14:36:51 -0500
commit025770fdd9d65e30fd0f2839d8e1e0da188073b5 (patch)
treea26ca49b9cffb405bbb070507945d61c4b689707 /pkgs/os-specific/linux
parent4a511911bbb04d15d704dfe8c3811c40c8421289 (diff)
parentbcd31489a1a9cb56faaee133b0273f110244070d (diff)
downloadnixlib-025770fdd9d65e30fd0f2839d8e1e0da188073b5.tar
nixlib-025770fdd9d65e30fd0f2839d8e1e0da188073b5.tar.gz
nixlib-025770fdd9d65e30fd0f2839d8e1e0da188073b5.tar.bz2
nixlib-025770fdd9d65e30fd0f2839d8e1e0da188073b5.tar.lz
nixlib-025770fdd9d65e30fd0f2839d8e1e0da188073b5.tar.xz
nixlib-025770fdd9d65e30fd0f2839d8e1e0da188073b5.tar.zst
nixlib-025770fdd9d65e30fd0f2839d8e1e0da188073b5.zip
Merge branch 'pkg/netatop-0.7' of git://github.com/mayflower/nixpkgs
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/netatop/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix
index 3d6b6faccca1..1e74cd94c55b 100644
--- a/pkgs/os-specific/linux/netatop/default.nix
+++ b/pkgs/os-specific/linux/netatop/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, kernel, zlib }:
 
-assert stdenv.lib.versionOlder kernel.version "3.17";
+let
+  version = "0.7";
+in
 
 stdenv.mkDerivation {
-  name = "netatop-${kernel.version}-0.3";
+  name = "netatop-${kernel.version}-${version}";
 
   src = fetchurl {
-    url = http://www.atoptool.nl/download/netatop-0.3.tar.gz;
-    sha256 = "0rk873nb1hgfnz040plmv6rm9mcm813n0clfjs53fsqbn8y1lhvv";
+    url = "http://www.atoptool.nl/download/netatop-${version}.tar.gz";
+    sha256 = "11v9lvlshn7mwsbr69xrm7gfhxbgdczcf3cf9fssbd9qgv9abifl";
   };
 
   buildInputs = [ zlib ];
@@ -27,7 +29,7 @@ stdenv.mkDerivation {
     mkdir -p $out/bin $out/sbin $out/share/man/man{4,8}
     mkdir -p $out/lib/modules/${kernel.modDirVersion}/extra
   '';
-      
+
   meta = {
     description = "Network monitoring module for atop";
     homepage = http://www.atoptool.nl/downloadnetatop.php;