zpaq: 7.11 -> 7.12

Faster extract. Removes -encrypt (combined with -repack).

Also, we now correctly follow upstream's versioning and no longer
multiply the version number by 100. You may need to update manually.

1 files changed, 9 insertions, 17 deletions

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