Skip to content

Commit 3ee1521

Browse files
committed
Merge bitcoin/bitcoin#30730: guix: Bump time machine to 53396a22afc04536ddf75d8f82ad2eafa5082725
60d4398 guix: drop GCC 12.4.0 package (fanquake) 5ed1511 guix: bump time-machine to 53396a22afc04536ddf75d8f82ad2eafa5082725 (fanquake) Pull request description: Followup to #30511. https://git.savannah.gnu.org/cgit/guix.git/commit/?id=9aa38f98cbd41644abe2c43bb4f44f74df642df2 landed. Linux headers `6.1.102` -> `6.1.106` ACKs for top commit: hebasto: ACK 60d4398. TheCharlatan: ACK 60d4398 Tree-SHA512: 6ff4372897e5abb15c28d4607915f777585d54b7a35787ac46f7ddca0d695dc60a7da532d8beb37e2df1de12511220f0dc6428f68d6a4db628de816e2d339914
2 parents ffdc3d6 + 60d4398 commit 3ee1521

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

contrib/guix/libexec/prelude.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fi
5151
time-machine() {
5252
# shellcheck disable=SC2086
5353
guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
54-
--commit=7bf1d7aeaffba15c4f680f93ae88fbef25427252 \
54+
--commit=53396a22afc04536ddf75d8f82ad2eafa5082725 \
5555
--cores="$JOBS" \
5656
--keep-failed \
5757
--fallback \

contrib/guix/manifest.scm

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,7 @@ chain for " target " development."))
9191
(home-page (package-home-page xgcc))
9292
(license (package-license xgcc)))))
9393

94-
(define base-gcc
95-
(package
96-
(inherit gcc-12) ;; 12.3.0
97-
(version "12.4.0")
98-
(source (origin
99-
(method url-fetch)
100-
(uri (string-append "mirror://gnu/gcc/gcc-"
101-
version "/gcc-" version ".tar.xz"))
102-
(sha256
103-
(base32
104-
"0xcida8l2wykvvzvpcrcn649gj0ijn64gwxbplacpg6c0hk6akvh"))))))
94+
(define base-gcc gcc-12) ;; 12.4.0
10595

10696
(define base-linux-kernel-headers linux-libre-headers-6.1)
10797

0 commit comments

Comments
 (0)