Porting changes from stdenv-updates into this branch.

This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272

1 files changed, 27 insertions, 9 deletions

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 0a2afd05372..7a25b69c013 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,17 +1,35 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "gzip-1.3.12";
-  
+stdenv.mkDerivation rec {
+  name = "gzip-1.3.13";
+
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/gzip/gzip-1.3.12.tar.gz;
-    sha256 = "1bw7sm68xjlnlzgcx66hnw80ac1qqyvhw0vw27zilgbzbzh5nmiz";
+    url = "mirror://gnu/gzip/${name}.tar.gz";
+    sha256 = "18vwa7x0b1sql9bs2d15n94fx3him1m6xpnwsfz52djjbjgzy1hx";
   };
 
+  patches = [ ./getopt.patch ];
+
+  doCheck = true;
+
   meta = {
-    homepage = http://www.gzip.org/;
-    description = "The gzip compression program";
+    homepage = http://www.gnu.org/software/gzip/;
+    description = "Gzip, the GNU zip compression program";
+
+    longDescription =
+      ''gzip (GNU zip) is a popular data compression program written by
+        Jean-loup Gailly for the GNU project.  Mark Adler wrote the
+        decompression part.
+
+        We developed this program as a replacement for compress because of
+        the Unisys and IBM patents covering the LZW algorithm used by
+        compress.  These patents made it impossible for us to use compress,
+        and we needed a replacement.  The superior compression ratio of gzip
+        is just a bonus.
+      '';
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
-  
-  patches = [./gnulib-futimens.patch];
 }