guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 7dc70557b6f2cbc0937d1199a998243f61f9829a Author: Nicolas Graves <[email protected]> AuthorDate: Sun Feb 22 10:21:06 2026 +0100 gnu: %boot3-inputs: Drop input labels. * gnu/packages/commencement.scm (%boot3-inputs): Drop input labels. (%boot4-inputs): Inject former %boot3-inputs for incremental progress on input label removal. (bash-final): Adapt accordingly. Change-Id: I6a8db940ddf1686e1c457c12abef715658ce8637 Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/commencement.scm | 53 +++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1c04e086fda..869a4a3d756 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3435,35 +3435,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define (%boot3-inputs) ;; 4th stage inputs. - `(("gcc" ,gcc-final) - ("ld-wrapper" ,ld-wrapper-boot3) - ("libc" ,glibc-final) - ("libc:static" ,glibc-final "static") - ("ld-wrapper-cross" ,ld-wrapper-boot0) - ("binutils-cross" ,binutils-boot0) - ,@(match (%current-system) - ((or "i686-linux" "x86_64-linux") - `(("bzip2" ,bzip2-boot0) - ("coreutils" ,coreutils-boot0) - ("gawk" ,gawk-boot0) - ("patch" ,patch-boot0) - ("sed" ,sed-boot0) - ("tar" ,tar-boot0) - ("bash" ,bash-mesboot) - ("grep" ,grep-mesboot) - ("tar" ,tar-mesboot) - ("xz" ,xz-mesboot) - ("gcc-wrapper" ,gcc-mesboot-wrapper) - ("gzip" ,gzip-mesboot) - ("guile" ,%bootstrap-guile))) - (_ - `(("coreutils&co" ,%bootstrap-coreutils&co) - ;; In gnu-build-system.scm, we rely on the availability of Bash. - ("bash" ,%bootstrap-coreutils&co)))) - ("make" ,gnu-make-boot0) - ("diffutils" ,diffutils-boot0) - ("findutils" ,findutils-boot0) - ("file" ,file-boot0))) + (cons* gcc-final + ld-wrapper-boot3 + (delete gcc-boot0-wrapped (%boot2-inputs)))) (define bash-final ;; Link with `-static-libgcc' to make sure we don't retain a reference @@ -3483,7 +3457,26 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define (%boot4-inputs) ;; Now use the final Bash. `(("bash" ,bash-final) - ,@(alist-delete "bash" (%boot3-inputs)))) + ("gcc" ,gcc-final) + ("ld-wrapper" ,ld-wrapper-boot3) + ("libc" ,glibc-final) + ("libc:static" ,glibc-final "static") + ("ld-wrapper-cross" ,ld-wrapper-boot0) + ("binutils-cross" ,binutils-boot0) + ,@(match (%current-system) + ((or "i686-linux" "x86_64-linux") + `(("bzip2" ,bzip2-boot0) + ("coreutils" ,coreutils-boot0) + ("gawk" ,gawk-boot0) + ("patch" ,patch-boot0) + ("sed" ,sed-boot0) + ("tar" ,tar-boot0))) + (_ + `(("coreutils&co" ,%bootstrap-coreutils&co)))) + ("make" ,gnu-make-boot0) + ("diffutils" ,diffutils-boot0) + ("findutils" ,findutils-boot0) + ("file" ,file-boot0))) (define with-boot4 (package-with-explicit-inputs %boot4-inputs %bootstrap-guile))
