diff --git a/steps-guix/guix-1.5.0/patches/bootstrap-local-seeds.patch.in b/steps-guix/guix-1.5.0/patches/bootstrap-local-seeds.patch.in index 44e37ed0..ca5d51cf 100644 --- a/steps-guix/guix-1.5.0/patches/bootstrap-local-seeds.patch.in +++ b/steps-guix/guix-1.5.0/patches/bootstrap-local-seeds.patch.in @@ -36,18 +36,7 @@ ("powerpc64le-linux" (string-append system "/20210106/" program)) ("i586-gnu" (string-append system "/20200326/" program)) ("x86_64-gnu" (string-append system "/20241122/" program)) -@@ -387,6 +387,10 @@ - ("powerpc64le-linux" - "/20210106/guile-static-stripped-2.0.14-powerpc64le-linux-gnu.tar.xz") - ("riscv64-linux" - "/20210725/guile-3.0.2.tar.xz") -+ ("x86_64-linux" -+ "/guile-static-stripped-2.0.9-x86_64-linux.tar.xz") -+ ("i686-linux" -+ "/guile-static-stripped-2.0.9-i686-linux.tar.xz") - (_ - "/20131110/guile-2.0.9.tar.xz")))) -@@ -394,9 +398,9 @@ +@@ -403,9 +400,9 @@ "Return the SHA256 hash of the Guile bootstrap tarball for SYSTEM." (match system ("x86_64-linux" @@ -59,9 +48,9 @@ ("mips64el-linux" (base32 "0fzp93lvi0hn54acc0fpvhc7bvl0yc853k62l958cihk03q80ilr")) ("armhf-linux" -@@ -625,16 +626,16 @@ - ("riscv64-linux" - "/20210725/static-binaries.tar.xz") +@@ -634,16 +631,16 @@ + ("riscv64-linux" + "/20210725/static-binaries.tar.xz") (_ - "/20131110/static-binaries.tar.xz"))) + "/static-binaries-0-i686-linux.tar.xz"))) @@ -79,7 +68,7 @@ ("armhf-linux" (base32 "0gf0fn2kbpxkjixkmx5f4z6hv6qpmgixl69zgg74dbsfdfj8jdv5")) -@@ -989,11 +1026,15 @@ +@@ -998,12 +995,16 @@ ;; own packages. (match (%current-system) ((or "i686-linux" "x86_64-linux") @@ -96,6 +85,7 @@ + ("mescc-tools" ,%bootstrap-mescc-tools) ;; In gnu-build-system.scm, we rely on the availability of Bash. ("bash" ,%bootstrap-coreutils&co))))) + --- a/guix/channels.scm +++ b/guix/channels.scm @@ -194,8 +194,8 @@ diff --git a/steps-guix/guix-1.5.0/patches/enforce-local-bootstrap-binaries-except-linux-headers.patch b/steps-guix/guix-1.5.0/patches/enforce-local-bootstrap-binaries-except-linux-headers.patch index 792a4d97..18f33b60 100644 --- a/steps-guix/guix-1.5.0/patches/enforce-local-bootstrap-binaries-except-linux-headers.patch +++ b/steps-guix/guix-1.5.0/patches/enforce-local-bootstrap-binaries-except-linux-headers.patch @@ -23,7 +23,18 @@ (define (bootstrap-guile-url-path system) "Return the URI for FILE." (string-append "/" system -@@ -684,7 +689,7 @@ +@@ -387,6 +392,10 @@ + "/20210106/guile-static-stripped-2.0.14-powerpc64le-linux-gnu.tar.xz") + ("riscv64-linux" + "/20210725/guile-3.0.2.tar.xz") ++ ("x86_64-linux" ++ "/guile-static-stripped-2.0.9-x86_64-linux.tar.xz") ++ ("i686-linux" ++ "/guile-static-stripped-2.0.9-i686-linux.tar.xz") + (_ + "/20131110/guile-2.0.9.tar.xz")))) + +@@ -684,7 +693,7 @@ (uri (map (cute string-append <> "/i686-linux/20190815/" "linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz")