diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-21 08:59:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-12-30 17:03:39 +0100 |
| commit | d8c5d95330d9806b3ee30569de76660f3931d5ee (patch) | |
| tree | 43865eae535a6a7624c6e752731240696103893f /pkgs | |
| parent | e53471eb54aa4de31a85fe072abb9c5e0f552ffc (diff) | |
| download | nixpkgs-d8c5d95330d9806b3ee30569de76660f3931d5ee.tar nixpkgs-d8c5d95330d9806b3ee30569de76660f3931d5ee.tar.gz nixpkgs-d8c5d95330d9806b3ee30569de76660f3931d5ee.tar.bz2 nixpkgs-d8c5d95330d9806b3ee30569de76660f3931d5ee.tar.lz nixpkgs-d8c5d95330d9806b3ee30569de76660f3931d5ee.tar.xz nixpkgs-d8c5d95330d9806b3ee30569de76660f3931d5ee.tar.zst nixpkgs-d8c5d95330d9806b3ee30569de76660f3931d5ee.zip | |
determinism: change some fixed timestamp to != (time_t)0
vcunat removed the unrelated glib change. Conflicts: pkgs/development/libraries/glib/default.nix pkgs/os-specific/linux/kernel/generic.nix pkgs/os-specific/linux/kernel/manual-config.nix
Diffstat (limited to 'pkgs')
5 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch b/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch index 2bf1841e9dd..1382de70625 100644 --- a/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch +++ b/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch @@ -4,7 +4,7 @@ : who configured the system cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` -+cf_time='Thu Jan 1 00:00:00 UTC 1970' ++cf_time='Thu Jan 1 00:00:01 UTC 1970' + case "$cf_by" in "") diff --git a/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch b/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch index 6ae708f059d..89777338723 100644 --- a/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch +++ b/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch @@ -5,7 +5,7 @@ diff -ur libgcrypt-1.5.3.orig/configure libgcrypt-1.5.3/configure BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date` -+BUILD_TIMESTAMP=1970-01-01T00:00+0000 ++BUILD_TIMESTAMP=1970-01-01T00:01+0000 cat >>confdefs.h <<_ACEOF diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index ecea33275fe..8f41f24cae4 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1dapxzxl1naghf342fwfc2w2f2c5hb9gr1a1s4n8dsqn26kybx1z"; }; - postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:00+0000/' -i ./configure"; + postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; # If architecture-dependent MO files aren't available, they're generated # during build, so we need gettext for cross-builds. diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 13250e45494..af2ae3b54db 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -57,6 +57,7 @@ let autoModules = stdenv.platform.kernelAutoModules; arch = stdenv.platform.kernelArch; + KBUILD_BUILD_TIMESTAMP = 1; # (time_t)1 crossAttrs = let cp = stdenv.cross.platform; in { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 6d9baed7f2d..b840e252cdf 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -104,7 +104,7 @@ let buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=Thu Jan 1 00:00:01 UTC 1970") ''; - buildFlags = [ + KBUILD_BUILD_TIMESTAMP=1; # (time_t)1 "KBUILD_BUILD_VERSION=1-NixOS" platform.kernelTarget ] ++ optional isModular "modules"; |