Merge remote-tracking branch 'origin/master' into hardened-stdenv

15 files changed, 47 insertions, 43 deletions

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 5f42e39871a4..8676ce31c66f 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -31,12 +31,12 @@
 , yajl ? null
 }:
 stdenv.mkDerivation rec {
-  version = "5.5.0";
+  version = "5.5.1";
   name = "collectd-${version}";
 
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";
-    sha256 = "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88";
+    sha256 = "0gxwq3jl20wgvb7qawivshpkm4i3kvghpnfcn5yrlhphw4kdbigr";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix
index c013c97cdbbd..f6b9863d1bec 100644
--- a/pkgs/tools/system/daemonize/default.nix
+++ b/pkgs/tools/system/daemonize/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "daemonize-${version}";
-  version = "1.7.6";
+  version = "1.7.7";
 
   src = fetchurl {
     url    = "https://github.com/bmc/daemonize/archive/release-${version}.tar.gz";
-    sha256 = "07yv82mkhc57vnawwldqcy64c5yqyh817gksd3b4rgavbsp1fmwd";
+    sha256 = "01gabcc8m4jkymd31p6v5883ii3g7126cici6rd03maf4jizxjmk";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index a6bbb48ecb27..d98ceb84bc39 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       
   meta = with stdenv.lib; {
     description = "A tool to copy data from a damaged block device";
-    maintainers = with maintainers; [ raskin iElectric ];
+    maintainers = with maintainers; [ raskin domenkozar ];
     platforms = platforms.linux;
     downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/";
     inherit version;
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index c33359eee881..b436b6ecf96f 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lzip }:
 
 stdenv.mkDerivation rec {
-  name = "ddrescue-1.20";
+  name = "ddrescue-1.21";
 
   src = fetchurl {
     url = "mirror://gnu/ddrescue/${name}.tar.lz";
-    sha256 = "1gb0ak2c47nass7qdf9pnfrshcb38c318z1fx5v5v1k7l6qr7yc3";
+    sha256 = "1b71hb42lh33y9843nd1mxlwkk9qh9ajvnz6ivzd1jq9lav4x7ph";
   };
 
   buildInputs = [ lzip ];
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
 
     platforms = platforms.all;
-    maintainers = with maintainers; [ iElectric ];
+    maintainers = with maintainers; [ domenkozar fpletz ];
   };
 }
diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index 9dec905379be..9af1f8192c3c 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "di-4.36";
+  name = "di-4.37";
 
   src = fetchurl {
     url = "http://gentoo.com/di/${name}.tar.gz";
-    sha256 = "11kd9jawpkir6qwjciis9l5fdvgbp9yndcv4rg6k3x9x1and40zb";
+    sha256 = "1ljamhbpfps5b3n6gsk11znjv2f0cqfy7imda2qmzrlb8dipjs0h";
   };
 
   makeFlags = "INSTALL_DIR=$(out)";
diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index a9c3ebd02522..29ce0b1d8972 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -1,21 +1,29 @@
-{ stdenv, fetchFromGitHub, popt }:
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, popt }:
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
-  version = "0.21";
+  version = "0.23";
 
   src = fetchFromGitHub {
     owner = "rhinstaller";
     repo = "efivar";
     rev = version;
-    sha256 = "0iakv8prvl61mb2wnll02sxlg3kfzh3d4qb41d0bklmnljjkqr8p";
+    sha256 = "1fdqi053v335pjwj1i3yi9f1kasdzg3agfcp36bxsbhqjp4imlid";
   };
 
+  patches = [
+    # fix problem with linux 4.4 headers https://github.com/rhinstaller/efivar/issues/37
+    (fetchurl {
+      url = https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch;
+      sha256 = "1rjjpd4s1xdsnhq974j5wnwav8pfvd0jbvhk8a9wc2w029fvj7zp";
+    })
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ popt ];
 
-  # 0.21 Has build warnings so disable -Werror
   postPatch = ''
-    sed -i 's,-Werror,,g' Make.defaults
+     substituteInPlace src/Makefile --replace "-static" ""
   '';
 
   installFlags = [
@@ -26,7 +34,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/vathpela/efivar;
+    inherit (src.meta) homepage;
     description = "Tools and library to manipulate EFI variables";
     platforms = platforms.linux;
     license = licenses.lgpl21;
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index dccfbbcf747f..0ec141a7b356 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,6 +1,9 @@
 { stdenv, fetchFromGitHub, libaio, python, zlib }:
 
-let version = "2.2.11"; in
+let
+  version = "2.9";
+  sha256 = "10x5b1f1pdsh33kqzc8yf2v4mijlmkh72lmh9za6kz7hb3hp1nvi";
+in
 
 stdenv.mkDerivation rec {
   name = "fio-${version}";
@@ -9,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "axboe";
     repo = "fio";
     rev = "fio-${version}";
-    sha256 = "0g26xvbb60f96ks8q7jpap0xc2grb5j5w4m4glz910ndgf0s45wm";
+    inherit sha256;
   };
 
   buildInputs = [ libaio python zlib ];
@@ -24,6 +27,6 @@ stdenv.mkDerivation rec {
     homepage = "http://git.kernel.dk/?p=fio.git;a=summary";
     description = "Flexible IO Tester - an IO benchmark tool";
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix
index 6ae92b685cc9..c34d81f63536 100644
--- a/pkgs/tools/system/hardlink/default.nix
+++ b/pkgs/tools/system/hardlink/default.nix
@@ -24,8 +24,6 @@ stdenv.mkDerivation {
     homepage = "http://pkgs.fedoraproject.org/cgit/hardlink.git/";
     description = "Consolidate duplicate files via hardlinks";
     license = stdenv.lib.licenses.gpl2Plus;
-
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index 9301107d2db9..26ebf6f822fc 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = https://hisham.hm/htop/;
     license = licenses.gpl2Plus;
     platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin;
-    maintainers = with maintainers; [ rob simons relrod nckx ];
+    maintainers = with maintainers; [ rob relrod nckx ];
   };
 }
diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index 930778fe573f..16bb05898416 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -32,8 +32,6 @@ stdenv.mkDerivation {
     description = ''Command-line interface to IPMI-enabled devices'';
     license = stdenv.lib.licenses.bsd3;
     homepage = http://ipmitool.sourceforge.net;
-
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index e0f5a5e68a8e..41b51aa41775 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "2.9.8";
+  version = "2.9.9";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "066xfmzkrjbazddik2kx8k5adppkd3hm3pna6x8vri18sg7421w6";
+    sha256 = "1xi5d49zmcczya4iq662wkx39slrk3d4p2dzpfjcc0m0hs1y1b5y";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 157b980be8c6..8445767e7b78 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     homepage = http://smartmontools.sourceforge.net/;
     license = licenses.gpl2Plus;
     platforms = with platforms; linux ++ darwin;
-    maintainers = [ maintainers.simons ];
+    maintainers = [ maintainers.peti ];
   };
 }
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 17384da98819..0d55d1e7ca8a 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
-  version = "0.05.25";
+  version = "0.06.01";
 
   src = fetchurl {
-    sha256 = "13c94g06aswlhbv0cpsdrzym9jmbabkdm949j3h935gfdl1625v5";
+    sha256 = "1bk3sj6gyrgp5qfxiz6k7zml28m01iljgvxhp4yq391xzfyvrlg9";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index 3e97a4b64a31..11066dfd5939 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -2,31 +2,28 @@
 
 stdenv.mkDerivation rec {
   name = "thinkfan-${version}";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/thinkfan/thinkfan-${version}.tar.gz";
-    sha256 = "0ydgabk2758f6j64g1r9vdsd221nqsv5rwnphm81s7i2vgra1nlh";
+    sha256 = "0nz4c48f0i0dljpk5y33c188dnnwg8gz82s4grfl8l64jr4n675n";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  unpackPhase = ''
-    sourceRoot="$PWD/${name}";
-    mkdir $sourceRoot;
-    tar xzvf "$src" -C $sourceRoot;
-  '';
-
   installPhase = ''
-    mkdir -p $out/bin;
-    mv thinkfan $out/bin/;
+    install -Dm755 {.,$out/bin}/thinkfan
+
+    cd "$NIX_BUILD_TOP"; cd "$sourceRoot" # attempt to be a bit robust
+    install -Dm644 {.,$out/share/doc/thinkfan}/README
+    cp -R examples $out/share/doc/thinkfan
+    install -Dm644 {src,$out/share/man/man1}/thinkfan.1
   '';
 
   meta = {
-    description = "";
     license = stdenv.lib.licenses.gpl3;
-    homepage = "http://thinkfan.sourceforge.net/";
-    maintainers = with stdenv.lib.maintainers; [ iElectric ];
+    homepage = http://thinkfan.sourceforge.net/;
+    maintainers = with stdenv.lib.maintainers; [ domenkozar nckx ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index 02834b70d629..a5050047256b 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -53,6 +53,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [stdenv.lib.maintainers.simons];
+    maintainers = [stdenv.lib.maintainers.peti];
   };
 }