public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gzip: update 1.5 -> 1.6, use less in tests now

Browse Source
This commit is contained in:
Vladimír Čunát 2013-06-29 16:15:43 +02:00
parent 8902e01cea
commit 4a7696589d
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/compression/gzip/default.nix
View File

@ -1,17 +1,19 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, less }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gzip-1.5"; name = "gzip-1.6";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gzip/${name}.tar.xz"; url = "mirror://gnu/gzip/${name}.tar.xz";
sha256 = "0wx1nqk709kx75cwp2axachnbxryp4gyl06qxn5nl95184w0mhls"; sha256 = "0ivqnbhiwd12q8hp3qw6rpsrpw2jg5y2mymk8cn22lsx90dfvprp";
}; };
doCheck = true;
patches = [ ./skip-some-tests.patch ]; patches = [ ./skip-some-tests.patch ];
buildInputs = [ less ]; # just for tests
doCheck = true;
meta = { meta = {
homepage = http://www.gnu.org/software/gzip/; homepage = http://www.gnu.org/software/gzip/;
description = "Gzip, the GNU zip compression program"; description = "Gzip, the GNU zip compression program";

15
pkgs/tools/compression/gzip/skip-some-tests.patch
View File

@ -1,20 +1,11 @@
Skip tests requiring Perl and less (more). Skip test requiring more (not found in nixpkgs).
Also zgrep-signal skipping fails with weird Bad file number error on illumos.
--- gzip-1.5/tests/Makefile.in.orig 2013-02-23 15:15:08.017048868 +0000 --- 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 +++ gzip-1.5/tests/Makefile.in 2013-02-23 15:15:32.756197039 +0000
@@ -1421,7 +1421,6 @@ @@ -1441,8 +1440,7 @@
trailing-nul \
zdiff \
zgrep-f \
- zgrep-signal \
znew-k
EXTRA_DIST = \
@@ -1441,8 +1440,6 @@
zfgrep \ zfgrep \
zforce \ zforce \
zgrep \ zgrep \
- zless \ zless \
- zmore \ - zmore \
znew znew