Merge bitcoin/bitcoin#36233: guix: Update time-machine to `60f6956aeffa7f30285745bd0ea615e9acfc74f8`
What changed, and why it matters
This is a build-system maintenance update for Bitcoin Core's reproducible build environment (Guix). It updates the Guix time-machine commit and several dependency versions, and temporarily disables some test suites that fail when building on the RISC-V processor architecture. The change is not a security fix for Bitcoin's consensus or networking code; it is a portability fix so that builds work on RISC-V machines.
Treat as a normal build-system/portability merge. No immediate security response is required. Reviewers may want to confirm that disabling the listed Python package tests does not hide a regression in the release binaries, and that the updated Guix commit is the expected upstream revision.
Security signals we found
No direct security-relevant code change in Bitcoin Core consensus, wallet, or P2P layers.
Dependency version bumps (git-minimal, linux-headers, python-lief, python-minimal) are routine build-environment updates.
Disabling third-party package test suites reduces build-time test coverage but does not alter Bitcoin Core's own test or release binaries.
No mention of CVEs, vulnerabilities, or security advisories in commit message or diff.
Evidence from the diff
The commit bumps the Guix time-machine pin from c5eee3336cc1d10a3cc1c97fde2809c3451624d3 to 60f6956aeffa7f30285745bd0ea615e9acfc74f8, updates lief to 0.17.6 in ci/lint/requirements.txt, and adds package-input rewriting in contrib/guix/manifest_gui.scm to disable tests for python-psutil, python-pytest-xprocess, and python-sh when building python-lief, and python-psutil when building nsis-x86_64, because those tests fail on riscv64-linux. The change addresses GitHub issue #36232 (build failure on RISC-V).
Changed components
Bitcoin Core Guix reproducible build environmentcontrib/guix/manifest_gui.scmcontrib/guix/libexec/prelude.bashci/lint/requirements.txtpython-lief dependency (0.17.5 -> 0.17.6)nsis-x86_64 packaging dependencyInspect captured patch +32 / −7
### ci/lint/requirements.txt
@@ -1,4 +1,4 @@
# lief version should match the version used in Guix
-lief==0.17.5
+lief==0.17.6
mypy==2.3.1
pyzmq==27.2.0
### 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=c5eee3336cc1d10a3cc1c97fde2809c3451624d3 \
+ --commit=60f6956aeffa7f30285745bd0ea615e9acfc74f8 \
--cores="$JOBS" \
--keep-failed \
--fallback \
### contrib/guix/manifest_gui.scm
@@ -5,7 +5,32 @@
(gnu packages ninja)
(gnu packages pkg-config)
((gnu packages python) #:select (python-minimal))
- ((gnu packages python-xyz) #:select (python-lief)))
+ ((gnu packages python-xyz) #:select (python-lief))
+ ((guix utils) #:select (substitute-keyword-arguments))
+ ((guix packages) #:select (package package-arguments package-input-rewriting/spec)))
+
+;; python-lief and nsis-x86_64 transitively pull in packages whose
+;; tests fail when building natively on riscv64:
+;; - python-lief: python-psutil, python-pytest-xprocess, python-sh
+;; - nsis-x86_64: python-psutil
+(define (package-without-tests p)
+ (package
+ (inherit p)
+ (arguments
+ (substitute-keyword-arguments (package-arguments p)
+ ((#:tests? _ #t) #f)))))
+
+(define python-lief-no-riscv64-failing-tests
+ ((package-input-rewriting/spec
+ `(("python-psutil" . ,package-without-tests)
+ ("python-pytest-xprocess" . ,package-without-tests)
+ ("python-sh" . ,package-without-tests)))
+ python-lief))
+
+(define nsis-x86_64-no-riscv64-failing-tests
+ ((package-input-rewriting/spec
+ `(("python-psutil" . ,package-without-tests)))
+ nsis-x86_64))
(packages->manifest
(append
@@ -14,13 +39,13 @@
;; Build tools
ninja
;; Packaging scripts
- python-minimal ;; (3.11)
+ python-minimal ;; 3.12
;; Tests
- python-lief)
+ python-lief-no-riscv64-failing-tests) ;; 0.17.6
(let ((target (getenv "HOST")))
(cond ((string-suffix? "-mingw32" target)
- (list zip
- nsis-x86_64))
+ (list nsis-x86_64-no-riscv64-failing-tests
+ zip))
((string-contains target "-linux-")
(list bison
gawkWhy this scored 20/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.