From 6758d157d23dfb548d43c896a6f9092039684517 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 19 Dec 2016 14:31:06 +0100 Subject: [PATCH 1/3] multipath-tools: ensure gzip does not capture timestamp gzip is originally called as 'gzip -9 -c' This is a port of https://github.com/NixOS/nixpkgs/pull/2281/commits/a8e7ddd1dfaae4b3ce97fdefe4614a3e31c04501 Note that it does not seem to make a difference to `nix-build --check`. --- pkgs/os-specific/linux/multipath-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index f60ece0fcec..0e0178e8845 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { ' libmultipath/defaults.h sed -i -e 's,\$(DESTDIR)/\(usr/\)\?,$(prefix)/,g' \ kpartx/Makefile libmpathpersist/Makefile + sed -i -e "s,GZIP = .*, GZIP = gzip -9n -c," \ + Makefile.inc ''; nativeBuildInputs = [ gzip ]; From 8246a845b43035b8715c7c2bf4a7341805eee00e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 19 Dec 2016 14:34:53 +0100 Subject: [PATCH 2/3] zerotierone: gzip -9 -> gzip -9n Note that it does not seem to make a difference to `nix-build --check`. --- pkgs/tools/networking/zerotierone/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index ba41fcdd687..d97a6049745 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mkdir -p $man/share/man/man8 for cmd in zerotier-one.8 zerotier-cli.1 zerotier-idtool.1; do - cat doc/$cmd | gzip -9 > $man/share/man/man8/$cmd.gz + cat doc/$cmd | gzip -9n > $man/share/man/man8/$cmd.gz done ''; From a34eae0ecb939f3ec8e04b5f98830a3deec06065 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 19 Dec 2016 14:35:01 +0100 Subject: [PATCH 3/3] stun: gzip -9 -> gzip -9n Note that it does not seem to make a difference to `nix-build --check`. --- pkgs/tools/networking/stun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 3eade48a614..8f9636041ff 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { preBuild = '' tar Jxvf ${srcManpages} debian/manpages - gzip -9 debian/manpages/stun.1 - gzip -9 debian/manpages/stund.8 + gzip -9n debian/manpages/stun.1 + gzip -9n debian/manpages/stund.8 ''; installPhase = ''