Skip to content

Commit ea4387e

Browse files
committed
guix: update time-machine to 160f78a4d92205df986ed9efcce7d3aac188cb24
In our time-machine environment this changes the following: GCC 10.3.0 -> 10.4.0 Binutils 2.37 -> 2.38 Linux Libre Headers 5.15.37 -> 5.15.127 git 2.36.0 -> 2.41.0 mingw-w64 8.0.0 -> 11.0.1 NSIS 3.05 -> 3.09 xorriso 1.5.2 -> 1.5.6.pl02 Python 3.9 -> 3.10.7 Python-asn1crypto 1.4.0 -> 1.5.1 GCC 12.3.0 becomes available. LLVM 15.0.7 becomes available.
1 parent f1a4afb commit ea4387e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

contrib/guix/libexec/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ BASEPREFIX="${PWD}/depends"
5252
store_path() {
5353
grep --extended-regexp "/[^-]{32}-${1}-[^-]+${2:+-${2}}" "${GUIX_ENVIRONMENT}/manifest" \
5454
| head --lines=1 \
55-
| sed --expression='s|^[[:space:]]*"||' \
55+
| sed --expression='s|\x29*$||' \
56+
--expression='s|^[[:space:]]*"||' \
5657
--expression='s|"[[:space:]]*$||'
5758
}
5859

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=998eda3067c7d21e0d9bb3310d2f5a14b8f1c681 \
54+
--commit=160f78a4d92205df986ed9efcce7d3aac188cb24 \
5555
--cores="$JOBS" \
5656
--keep-failed \
5757
--fallback \

contrib/guix/manifest.scm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ inspecting signatures in Mach-O binaries.")
587587
xz
588588
;; Build tools
589589
gnu-make
590-
libtool-2.4.7
590+
libtool
591591
autoconf-2.71
592592
automake
593593
pkg-config
@@ -596,7 +596,7 @@ inspecting signatures in Mach-O binaries.")
596596
gcc-toolchain-10
597597
(list gcc-toolchain-10 "static")
598598
;; Scripting
599-
python-minimal ;; (3.9)
599+
python-minimal ;; (3.10)
600600
;; Git
601601
git-minimal
602602
;; Tests

0 commit comments

Comments
 (0)