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

3 files changed, 17 insertions, 26 deletions

diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index 7f9425ce6038..92a81f9e5d67 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme }:
+{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }:
 
 stdenv.mkDerivation rec {
-  name = "dar-2.5.2";
-  
+  name = "dar-2.5.3";
+
   src = fetchurl {
     url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "09p07wil0y4g6yzb9jk1ppr6pidl5fldaqnfp0ngd5n2iz3w89js";
+    sha256 = "0myakyfgv2mhazwvbbwwncn9j7c9b4g3szs0aqlclmp01naaqmj5";
   };
 
-  buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme ]
+  buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
     ++ stdenv.lib.optional stdenv.isLinux [ attr e2fsprogs ];
 
-  configureFlags = "--disable-dar-static";
+  configureFlags = [ "--disable-dar-static" ];
+
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://dar.linux.free.fr/;
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index ba0a174ed0a8..3b647dc52836 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -1,20 +1,13 @@
 { stdenv, fetchurl, perl, unzip }:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="zpaq";
-    version="711";
-    name="${baseName}-${version}";
-    hash="0kva9xn3rhm2xpbbq3yrx3c9y150fw434ayd82fzhr24nsjjaxsf";
-    url="http://mattmahoney.net/dc/zpaq711.zip";
-    sha256="0kva9xn3rhm2xpbbq3yrx3c9y150fw434ayd82fzhr24nsjjaxsf";
-  };
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
+stdenv.mkDerivation rec {
+  name = "zpaq-${version}";
+  version = "7.12";
 
-  src = fetchurl {
-    inherit (s) url sha256;
+  src = let
+    mungedVersion = with stdenv.lib; concatStrings (splitString "." version);
+  in fetchurl {
+    sha256 = "1lgkxiinam80pqqyvs3x845k6kf0wgw121vz0gr8za4blb756n30";
+    url = "http://mattmahoney.net/dc/zpaq${mungedVersion}.zip";
   };
 
   sourceRoot = ".";
@@ -39,11 +32,10 @@ stdenv.mkDerivation {
   installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    inherit (s) version;
     description = "Incremental journaling backup utility and archiver";
+    homepage = http://mattmahoney.net/dc/zpaq.html;
     license = licenses.gpl3Plus ;
     maintainers = with maintainers; [ raskin nckx ];
     platforms = platforms.linux;
-    homepage = "http://mattmahoney.net/dc/zpaq.html";
   };
 }
diff --git a/pkgs/tools/archivers/zpaq/default.upstream b/pkgs/tools/archivers/zpaq/default.upstream
deleted file mode 100644
index 2d62f834647d..000000000000
--- a/pkgs/tools/archivers/zpaq/default.upstream
+++ /dev/null
@@ -1,3 +0,0 @@
-url http://mattmahoney.net/dc/zpaq.html
-version_link "/zpaq[0-9]+[.]zip"
-version "[^0-9]*([0-9]+)[^0-9]*" '\1'