From 0f0faddb8dcaa561877f8350ab9c3483365ff75b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 6 Nov 2021 18:59:58 +0000 Subject: [PATCH] hdf5: fix non-determinism by removing timestamps from .data $ diffoscope '...-hdf5-1.12.1' '...-hdf5-1.12.1.check' --- ...-hdf5-1.12.1/lib/libhdf5.settings +++ ...-hdf5-1.12.1.check/lib/libhdf5.settings -1,17 +1,17 @@ HDF5 Version: 1.12.1 - Configured on: Thu Oct 28 17:42:30 UTC 2021 + Configured on: Sat Nov 6 19:02:02 UTC 2021 Configured by: nixbld@ Host system: x86_64-unknown-linux-gnu - Uname information: Linux localhost 5.10.76 #1-NixOS SMP Wed Oct 27 07:56:57 UTC 2021 x86_64 GNU/Linux + Uname information: Linux localhost 5.14.15 #1-NixOS SMP Wed Oct 27 07:59:56 UTC 2021 x86_64 GNU/Linux The patch removes `Configured on`, `Configured by` and `Uname information` fields. --- pkgs/tools/misc/hdf5/default.nix | 7 +++++++ pkgs/tools/misc/hdf5/hdf5-more-determinism.patch | 15 +++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/misc/hdf5/hdf5-more-determinism.patch diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 43c156de419..5671e73c85f 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -67,6 +67,13 @@ stdenv.mkDerivation rec { patches = [ ./bin-mv.patch + + # Avoid non-determinism in autoconf build system: + # - build time + # - build user + # - uname -a (kernel version) + # Can be dropped once/if we switch to cmake. + ./hdf5-more-determinism.patch ]; postInstall = '' diff --git a/pkgs/tools/misc/hdf5/hdf5-more-determinism.patch b/pkgs/tools/misc/hdf5/hdf5-more-determinism.patch new file mode 100644 index 00000000000..9a9bfe24af7 --- /dev/null +++ b/pkgs/tools/misc/hdf5/hdf5-more-determinism.patch @@ -0,0 +1,15 @@ +diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in +index a4d4af6..70f1909 100644 +--- a/src/libhdf5.settings.in ++++ b/src/libhdf5.settings.in +@@ -4,10 +4,7 @@ + General Information: + ------------------- + HDF5 Version: @H5_VERSION@ +- Configured on: @CONFIG_DATE@ +- Configured by: @CONFIG_USER@ + Host system: @host_cpu@-@host_vendor@-@host_os@ +- Uname information: @UNAME_INFO@ + Byte sex: @BYTESEX@ + Installation point: @prefix@ +