Merge branch 'staging'

Hydra is only half-finished, but we'd better get secure glibc fast.

pkgs/tools/system/efivar/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, popt }:
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, popt }:
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
     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 ];
 

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;
   };
 }