diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-18 14:30:19 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-18 14:30:19 -0400 |
| commit | 51a6b27cc7bd70819927337e0b5505b446ad19b3 (patch) | |
| tree | 143d830d83ba913a4f8523550d28fc537a92790d /pkgs/tools/compression/gzip | |
| parent | fcc18aad0a3f24c281a3b046e946378b303dd3fd (diff) | |
| download | nixpkgs-51a6b27cc7bd70819927337e0b5505b446ad19b3.tar nixpkgs-51a6b27cc7bd70819927337e0b5505b446ad19b3.tar.gz nixpkgs-51a6b27cc7bd70819927337e0b5505b446ad19b3.tar.bz2 nixpkgs-51a6b27cc7bd70819927337e0b5505b446ad19b3.tar.lz nixpkgs-51a6b27cc7bd70819927337e0b5505b446ad19b3.tar.xz nixpkgs-51a6b27cc7bd70819927337e0b5505b446ad19b3.tar.zst nixpkgs-51a6b27cc7bd70819927337e0b5505b446ad19b3.zip | |
gzip: Update to 1.5
This fixes the gets() problem in gzip. Also disabled "make check" because it depends on Perl and more/less, which is undesirable in the stdenv bootstrap.
Diffstat (limited to 'pkgs/tools/compression/gzip')
| -rw-r--r-- | pkgs/tools/compression/gzip/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/tools/compression/gzip/gets-undeclared.patch | 26 |
2 files changed, 5 insertions, 43 deletions
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index e1d6d75da51..d15b26f48b6 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,15 +1,13 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation (rec { - name = "gzip-1.4"; +stdenv.mkDerivation rec { + name = "gzip-1.5"; src = fetchurl { - url = "mirror://gnu/gzip/${name}.tar.gz"; - sha256 = "1vhiyzls60fws48scw48wvwn8mpv1f4yhcsnafys239qvb9wyrni"; + url = "mirror://gnu/gzip/${name}.tar.xz"; + sha256 = "0wx1nqk709kx75cwp2axachnbxryp4gyl06qxn5nl95184w0mhls"; }; - doCheck = true; - meta = { homepage = http://www.gnu.org/software/gzip/; description = "Gzip, the GNU zip compression program"; @@ -31,13 +29,3 @@ stdenv.mkDerivation (rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; } - -// - -{ - crossAttrs = - # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. - (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { - patches = [ ./gets-undeclared.patch ]; - }); -}) diff --git a/pkgs/tools/compression/gzip/gets-undeclared.patch b/pkgs/tools/compression/gzip/gets-undeclared.patch deleted file mode 100644 index a09f59b122a..00000000000 --- a/pkgs/tools/compression/gzip/gets-undeclared.patch +++ /dev/null @@ -1,26 +0,0 @@ -This patch is needed to allow builds with newer versions of -the GNU libc (2.16+). - -This is a backport of this patch: - -commit 66712c23388e93e5c518ebc8515140fa0c807348 -Author: Eric Blake <eblake@redhat.com> -Date: Thu Mar 29 13:30:41 2012 -0600 - - stdio: don't assume gets any more - ---- gzip/lib/stdio.in.h 2012-07-02 14:28:45.000000000 +0200 -+++ gzip/lib/stdio.in.h 2012-07-02 14:28:50.000000000 +0200 -@@ -160,12 +160,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not - "use gnulib module fflush for portable POSIX compliance"); - #endif - --/* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ --#undef gets --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -- - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) |