about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-12-31 13:49:39 +0100
committerVladimír Čunát <vcunat@gmail.com>2018-12-31 14:36:31 +0100
commit6af68f6055e7258000c3618a875ae87d6c7ccc9f (patch)
treef22f1223b7a1681679dd4f3f60607b0fb22138f0 /pkgs/tools
parent19905c4c9aa2d94b74458f9527acbe1d269afa99 (diff)
parent06dc418292f692c0ebbad390021a55a8bc86e506 (diff)
downloadnixlib-6af68f6055e7258000c3618a875ae87d6c7ccc9f.tar
nixlib-6af68f6055e7258000c3618a875ae87d6c7ccc9f.tar.gz
nixlib-6af68f6055e7258000c3618a875ae87d6c7ccc9f.tar.bz2
nixlib-6af68f6055e7258000c3618a875ae87d6c7ccc9f.tar.lz
nixlib-6af68f6055e7258000c3618a875ae87d6c7ccc9f.tar.xz
nixlib-6af68f6055e7258000c3618a875ae87d6c7ccc9f.tar.zst
nixlib-6af68f6055e7258000c3618a875ae87d6c7ccc9f.zip
Merge #53091: gzip: 1.9 -> 1.10 (into staging)
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/compression/gzip/default.nix9
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 09065ede6827..bd4d85e90e36 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gzip-${version}";
-  version = "1.9";
+  version = "1.10";
 
   src = fetchurl {
     url = "mirror://gnu/gzip/${name}.tar.xz";
-    sha256 = "16h8g4acy7fgfxcjacr3wijjsnixwsfd2jhz3zwdi2qrzi262l5f";
+    sha256 = "1h6p374d3j8d4cdfydzls021xa2yby8myc0h8d6m8bc7k6ncq9c4";
   };
 
   outputs = [ "out" "man" "info" ];
@@ -15,10 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ xz.bin ];
 
-  # In stdenv-linux, prevent a dependency on bootstrap-tools.
-  makeFlags = "SHELL=/bin/sh GREP=grep";
-
-  doCheck = false; # fails
+  makeFlags = [ "SHELL=/bin/sh" "GREP=grep" ];
 
   meta = {
     homepage = https://www.gnu.org/software/gzip/;