Skip to content

Commit

Permalink
Merge bitcoin#30730: guix: Bump time machine to 53396a22afc04536ddf75…
Browse files Browse the repository at this point in the history
…d8f82ad2eafa5082725

60d4398 guix: drop GCC 12.4.0 package (fanquake)
5ed1511 guix: bump time-machine to 53396a22afc04536ddf75d8f82ad2eafa5082725 (fanquake)

Pull request description:

  Followup to bitcoin#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
  • Loading branch information
fanquake committed Aug 30, 2024
2 parents ffdc3d6 + 60d4398 commit 3ee1521
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
2 changes: 1 addition & 1 deletion contrib/guix/libexec/prelude.bash
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fi
time-machine() {
# shellcheck disable=SC2086
guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
--commit=7bf1d7aeaffba15c4f680f93ae88fbef25427252 \
--commit=53396a22afc04536ddf75d8f82ad2eafa5082725 \
--cores="$JOBS" \
--keep-failed \
--fallback \
Expand Down
12 changes: 1 addition & 11 deletions contrib/guix/manifest.scm
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,7 @@ chain for " target " development."))
(home-page (package-home-page xgcc))
(license (package-license xgcc)))))

(define base-gcc
(package
(inherit gcc-12) ;; 12.3.0
(version "12.4.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-"
version "/gcc-" version ".tar.xz"))
(sha256
(base32
"0xcida8l2wykvvzvpcrcn649gj0ijn64gwxbplacpg6c0hk6akvh"))))))
(define base-gcc gcc-12) ;; 12.4.0

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

Expand Down

0 comments on commit 3ee1521

Please sign in to comment.