Merge branch 'master' into closure-size

pkgs/tools/system/foremost/default.nix

@@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
     url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz";
   };
 
+  patches = [ ./makefile.patch ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    mkdir -p $out/{bin,share/man/man8}
+  '';
+
   meta = with stdenv.lib; {
     inherit version;
     description = "Recover files based on their contents";
@@ -26,14 +36,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
-
-  patches = [ ./makefile.patch ];
-
-  makeFlags = "PREFIX=$(out)";
-
-  enableParallelBuilding = true;
-
-  preInstall = ''
-    mkdir -p $out/{bin,share/man/man8}
-  '';
 }

pkgs/tools/system/smartmontools/default.nix

@@ -1,23 +1,25 @@
 { stdenv, fetchurl }:
 
 let
-  dbrev = "3849";
+  version = "6.4";
+  drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB";
+  dbrev = "4167";
   driverdb = fetchurl {
-    url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/trunk/smartmontools/drivedb.h?format=raw";
-    sha256 = "06c1cl0x4sq64l3rmd5rk8wsbggjixphpgj0kf4awqhjgsi102xz";
+    url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
+    sha256 = "14rv1cxbpmnq12hjwr3icjiahx5i0ak7j69310c09rah0241l5j1";
     name = "smartmontools-drivedb.h";
   };
 in
 stdenv.mkDerivation rec {
-  name = "smartmontools-6.3";
+  name = "smartmontools-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
-    sha256 = "06gy71jh2d3gcfmlbbrsqw7215knkfq59q3j6qdxfrar39fhcxx7";
+    sha256 = "11bsxcghh7adzdklcslamlynydxb708vfz892d5w7agdq405ddza";
   };
 
   patchPhase = ''
-    : cp ${driverdb} drivedb.h
+    cp ${driverdb} drivedb.h
     sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in
   '';
 

pkgs/tools/system/stress-ng/default.nix

@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  installFlags = "DESTDIR=$(out)";
+  installFlags = [ "DESTDIR=$(out)" ];
 
   meta = with stdenv.lib; {
     inherit version;