3 files changed, 23 insertions, 5 deletions
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 0e6742253441..3a134fea9dee 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,13 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, less }:
 
 stdenv.mkDerivation rec {
-  name = "gzip-1.5";
+  name = "gzip-1.6";
 
   src = fetchurl {
     url = "mirror://gnu/gzip/${name}.tar.xz";
-    sha256 = "0wx1nqk709kx75cwp2axachnbxryp4gyl06qxn5nl95184w0mhls";
+    sha256 = "0ivqnbhiwd12q8hp3qw6rpsrpw2jg5y2mymk8cn22lsx90dfvprp";
   };
 
+  patches = [ ./skip-some-tests.patch ];
+
+  buildInputs = [ less ]; # just for tests
+
+  doCheck = true;
+
   meta = {
     homepage = http://www.gnu.org/software/gzip/;
     description = "Gzip, the GNU zip compression program";
diff --git a/pkgs/tools/compression/gzip/skip-some-tests.patch b/pkgs/tools/compression/gzip/skip-some-tests.patch
new file mode 100644
index 000000000000..74043a3ab56d
--- /dev/null
+++ b/pkgs/tools/compression/gzip/skip-some-tests.patch
@@ -0,0 +1,12 @@
+Skip test requiring more (not found in nixpkgs).
+--- gzip-1.5/tests/Makefile.in.orig	2013-02-23 15:15:08.017048868 +0000
++++ gzip-1.5/tests/Makefile.in	2013-02-23 15:15:32.756197039 +0000
+@@ -1441,8 +1440,7 @@
+   zfgrep	\
+   zforce	\
+   zgrep		\
+   zless		\
+-  zmore		\
+   znew
+ 
+ TESTS_ENVIRONMENT = \
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 26c1597f2aa8..6d59bd927cff 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "xz-5.0.4";
+  name = "xz-5.0.5";
 
   src = fetchurl {
     url = "http://tukaani.org/xz/${name}.tar.bz2";
-    sha256 = "14nf55b47335aakswqk0kqv1qsh4269rnb757dmkkbd1sdhb1naw";
+    sha256 = "1404i59bp6rzxya0br1q9njdv32z4sggyfrkjr7vq695hk94hv0n";
   };
 
   doCheck = true;