From badcf1c68dbf9bdb796e7b79459343c22ae20965 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 13 Feb 2026 10:28:53 +0000 Subject: [PATCH 1/2] guix: fix typo in guix-codesign --- contrib/guix/guix-codesign | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/guix/guix-codesign b/contrib/guix/guix-codesign index ec8fbc0cf96..791b75c540b 100755 --- a/contrib/guix/guix-codesign +++ b/contrib/guix/guix-codesign @@ -289,7 +289,7 @@ INFO: Codesigning ${VERSION:?not set} for platform triple ${HOST:?not set}: EOF - # Run the build script 'contrib/guix/libexec/build.sh' in the build + # Run the build script 'contrib/guix/libexec/codesign.sh' in the build # container specified by 'contrib/guix/manifest.scm'. # # Explanation of `guix shell` flags: From 62e378584e77cb8382facc6a7c18133d1cf9ffb3 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 13 Feb 2026 10:30:58 +0000 Subject: [PATCH 2/2] guix: don't export TZ twice --- contrib/guix/libexec/build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 1eaa86aeb3e..789767119fd 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -4,6 +4,9 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. export LC_ALL=C set -e -o pipefail + +# Environment variables for determinism +export TAR_OPTIONS="--owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name" export TZ=UTC # Although Guix _does_ set umask when building its own packages (in our case, @@ -157,10 +160,6 @@ case "$HOST" in ;; esac -# Environment variables for determinism -export TAR_OPTIONS="--owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name" -export TZ="UTC" - #################### # Depends Building # ####################