From 31eb46f054f8cbd62b3ac44fd98a61f6dda34879 Mon Sep 17 00:00:00 2001 From: fanquake Date: Sun, 1 Sep 2024 09:26:33 +0100 Subject: [PATCH] guix: update to c5eee3336cc1d10a3cc1c97fde2809c3451624d3 Package updates: binutils 2.41 -> 2.44 diffutils 3.10 -> 3.12 file 5.45 -> 5.46 git-minimal 2.46.0 -> 2.52.0 (base) glibc 2.39 -> 2.41 gzip 1.13 -> 1.14 linux-headers 6.1.119 -> 6.1.166 LLVM/Clang 19.1.4 -> 19.1.7 mingw-w64 12.0.0 -> 13.0.0 nsis 3.10 -> 3.11 python-minimal 3.10 -> 3.11 CMake 4.x becomes available. Clang/LLVM 20 & 21 become available. --- contrib/guix/guix-build | 3 +++ contrib/guix/guix-codesign | 3 +++ contrib/guix/libexec/prelude.bash | 2 +- contrib/guix/manifest.scm | 20 ++++--------------- .../winpthreads-remap-guix-store.patch | 8 ++++---- contrib/guix/symbol-check.py | 2 +- 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index ee285bf322c..bef1c8412a7 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -383,6 +383,8 @@ EOF # Running in an isolated container minimizes build-time differences # between machines and improves reproducibility # + # --writable-root make the root filesystem writable + # # --pure unset existing environment variables # # Same rationale as --container @@ -441,6 +443,7 @@ EOF # shellcheck disable=SC2086,SC2031 time-machine shell --manifest="${PWD}/contrib/guix/manifest.scm" \ --container \ + --writable-root \ --pure \ --no-cwd \ --share="$PWD"=/bitcoin \ diff --git a/contrib/guix/guix-codesign b/contrib/guix/guix-codesign index 791b75c540b..39291dfe9ce 100755 --- a/contrib/guix/guix-codesign +++ b/contrib/guix/guix-codesign @@ -299,6 +299,8 @@ EOF # Running in an isolated container minimizes build-time differences # between machines and improves reproducibility # + # --writable-root make the root filesystem writable + # # --pure unset existing environment variables # # Same rationale as --container @@ -341,6 +343,7 @@ EOF # shellcheck disable=SC2086,SC2031 time-machine shell --manifest="${PWD}/contrib/guix/manifest.scm" \ --container \ + --writable-root \ --pure \ --no-cwd \ --share="$PWD"=/bitcoin \ diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash index b7c13cc91d8..166675e8bf0 100644 --- a/contrib/guix/libexec/prelude.bash +++ b/contrib/guix/libexec/prelude.bash @@ -71,7 +71,7 @@ fi time-machine() { # shellcheck disable=SC2086 guix time-machine --url=https://codeberg.org/guix/guix.git \ - --commit=5cb84f2013c5b1e48a7d0e617032266f1e6059e2 \ + --commit=c5eee3336cc1d10a3cc1c97fde2809c3451624d3 \ --cores="$JOBS" \ --keep-failed \ --fallback \ diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 9cadd410537..dedfb118d62 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -1,7 +1,6 @@ (use-modules (gnu packages) ((gnu packages bash) #:select (bash-minimal)) (gnu packages bison) - ((gnu packages certs) #:select (nss-certs)) ((gnu packages check) #:select (libfaketime)) ((gnu packages cmake) #:select (cmake-minimal)) (gnu packages commencement) @@ -19,7 +18,7 @@ ((gnu packages python-build) #:select (python-poetry-core)) ((gnu packages python-crypto) #:select (python-asn1crypto)) ((gnu packages python-science) #:select (python-scikit-build-core)) - ((gnu packages python-xyz) #:select (python-pydantic-2)) + ((gnu packages python-xyz) #:select (python-pydantic)) ((gnu packages tls) #:select (openssl)) ((gnu packages version-control) #:select (git-minimal)) (guix build-system cmake) @@ -94,17 +93,7 @@ chain for " target " development.")) (home-page (package-home-page xgcc)) (license (package-license xgcc))))) -(define base-gcc - (package - (inherit gcc-14) ;; 14.2.0 - (version "14.3.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gcc/gcc-" - version "/gcc-" version ".tar.xz")) - (sha256 - (base32 - "0fna78ly417g69fdm4i5f3ms96g8xzzjza8gwp41lqr5fqlpgp70")))))) +(define base-gcc gcc-14) (define base-linux-kernel-headers linux-libre-headers-6.1) @@ -186,7 +175,7 @@ chain for " target " development.")) (native-inputs (list cmake-minimal ninja python-scikit-build-core - python-pydantic-2)) + python-pydantic)) (arguments (list #:tests? #f ;needs network @@ -545,7 +534,7 @@ inspecting signatures in Mach-O binaries.") gnu-make ninja ;; Scripting - python-minimal ;; (3.10) + python-minimal ;; (3.11) ;; Git git-minimal ;; Tests @@ -555,7 +544,6 @@ inspecting signatures in Mach-O binaries.") (list zip (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") nsis-x86_64 - nss-certs osslsigncode)) ((string-contains target "-linux-") (list bison diff --git a/contrib/guix/patches/winpthreads-remap-guix-store.patch b/contrib/guix/patches/winpthreads-remap-guix-store.patch index e1f1a6eba53..4530e5f3eea 100644 --- a/contrib/guix/patches/winpthreads-remap-guix-store.patch +++ b/contrib/guix/patches/winpthreads-remap-guix-store.patch @@ -6,12 +6,12 @@ the package, map all guix store prefixes to something fixed, e.g. /usr. --- a/mingw-w64-libraries/winpthreads/Makefile.in +++ b/mingw-w64-libraries/winpthreads/Makefile.in -@@ -478,7 +478,7 @@ top_build_prefix = @top_build_prefix@ +@@ -465,7 +465,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . tests --AM_CFLAGS = -Wall -DWIN32_LEAN_AND_MEAN $(am__append_1) -+AM_CFLAGS = -Wall -DWIN32_LEAN_AND_MEAN $(am__append_1) $(shell find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;) +-AM_CFLAGS = $(am__append_1) $(am__append_3) ++AM_CFLAGS = $(am__append_1) $(am__append_3) $(shell find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;) ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libwinpthread.la - include_HEADERS = include/pthread.h include/sched.h include/semaphore.h include/pthread_unistd.h include/pthread_time.h include/pthread_compat.h include/pthread_signal.h + include_HEADERS = \ diff --git a/contrib/guix/symbol-check.py b/contrib/guix/symbol-check.py index 93002ddce79..d31d5aa83bc 100755 --- a/contrib/guix/symbol-check.py +++ b/contrib/guix/symbol-check.py @@ -241,7 +241,7 @@ def check_MACHO_sdk(binary) -> bool: return False def check_MACHO_lld(binary) -> bool: - if binary.build_version.tools[0].version == [19, 1, 4]: + if binary.build_version.tools[0].version == [19, 1, 7]: return True return False