Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-05-02 22:58:02 +00:00
867 changed files with 75282 additions and 27025 deletions
+4 -3
View File
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, xz }:
stdenv.mkDerivation rec {
name = "gzip-1.6";
name = "gzip-${version}";
version = "1.7";
src = fetchurl {
url = "mirror://gnu/gzip/${name}.tar.xz";
sha256 = "0ivqnbhiwd12q8hp3qw6rpsrpw2jg5y2mymk8cn22lsx90dfvprp";
sha256 = "1as1ddq58spflzz5kxm0ni0xfpswrkkrncjpxyb3aw77gizcacgv";
};
outputs = [ "out" "man" "info" ];
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
makeFlags = "SHELL=/bin/sh GREP=grep";
meta = {
homepage = http://www.gnu.org/software/gzip/;
homepage = https://www.gnu.org/software/gzip/;
description = "GNU zip compression program";
longDescription =