summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAlexander Kjeldaas <ak@formalprivacy.com>2014-04-09 01:15:38 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-09-13 15:04:43 +0200
commitbee22ab79e4853e65b819ec2f0f966b01c1359e1 (patch)
tree4d8216de8c372017de3699131b728d7e3f2f7017 /pkgs
parent3bf436238189e8acf6044dd16e1cf705cffe30ee (diff)
downloadnixpkgs-bee22ab79e4853e65b819ec2f0f966b01c1359e1.tar
nixpkgs-bee22ab79e4853e65b819ec2f0f966b01c1359e1.tar.gz
nixpkgs-bee22ab79e4853e65b819ec2f0f966b01c1359e1.tar.bz2
nixpkgs-bee22ab79e4853e65b819ec2f0f966b01c1359e1.tar.lz
nixpkgs-bee22ab79e4853e65b819ec2f0f966b01c1359e1.tar.xz
nixpkgs-bee22ab79e4853e65b819ec2f0f966b01c1359e1.tar.zst
nixpkgs-bee22ab79e4853e65b819ec2f0f966b01c1359e1.zip
libgcrypt, libgpg-error, busybox: improve determinism
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libgcrypt/default.nix2
-rw-r--r--pkgs/development/libraries/libgcrypt/no-build-timestamp.patch12
-rw-r--r--pkgs/development/libraries/libgpg-error/default.nix2
-rw-r--r--pkgs/development/libraries/libgpg-error/no-build-timestamp.patch11
-rw-r--r--pkgs/os-specific/linux/busybox/default.nix1
5 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index ed267e23c87..b47709940dd 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation (rec {
     make check
   '';
 
+  patches = [ ./no-build-timestamp.patch ];
+
   meta = {
     description = "General-pupose cryptographic library";
 
diff --git a/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch b/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch
new file mode 100644
index 00000000000..6ae708f059d
--- /dev/null
+++ b/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch
@@ -0,0 +1,12 @@
+diff -ur libgcrypt-1.5.3.orig/configure libgcrypt-1.5.3/configure
+--- libgcrypt-1.5.3.orig/configure	2013-07-25 11:22:47.000000000 +0200
++++ libgcrypt-1.5.3/configure	2014-04-09 00:17:58.659147199 +0200
+@@ -16520,6 +16520,7 @@
+ 
+ 
+ BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
++BUILD_TIMESTAMP=1970-01-01T00:00+0000
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+Only in libgcrypt-1.5.3: out
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 663bd944fb9..03662571ade 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation (rec {
 
   doCheck = true;
 
+  patches = [ ./no-build-timestamp.patch ];
+
   meta = {
     description = "Libgpg-error, a small library that defines common error values for all GnuPG components";
 
diff --git a/pkgs/development/libraries/libgpg-error/no-build-timestamp.patch b/pkgs/development/libraries/libgpg-error/no-build-timestamp.patch
new file mode 100644
index 00000000000..c8350a278ec
--- /dev/null
+++ b/pkgs/development/libraries/libgpg-error/no-build-timestamp.patch
@@ -0,0 +1,11 @@
+diff -ur libgpg-error-1.12.orig/configure libgpg-error-1.12/configure
+--- libgpg-error-1.12.orig/configure	2013-06-24 06:42:28.000000000 +0200
++++ libgpg-error-1.12/configure	2014-04-09 00:12:47.867856520 +0200
+@@ -14585,6 +14585,7 @@
+ 
+ 
+ BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
++BUILD_TIMESTAMP=1970-01-01T00:00+0000
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 98fedb2d3f4..34eb19380d4 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
   };
 
   configurePhase = ''
+    export KCONFIG_NOTIMESTAMP=1
     make defconfig
     ${configParser}
     cat << EOF | parseconfig