guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 3cef1f8f755c2ed91bea973cab248aba28e6e3ee Author: Nicolas Graves <[email protected]> AuthorDate: Wed Feb 18 10:11:56 2026 +0100 gnu: %boot-mesboot3-inputs: Drop input labels. * gnu/packages/commencement.scm (%boot-mesboot3-inputs): Drop input labels. (glibc-headers-mesboot, glibc-mesboot)[native-inputs]: Adapt accordingly. (%boot-mesboot4-inputs): Inject former %boot-mesboot3-inputs for incremental progress on input label removal. Change-Id: Iddaadea67e56aa373a64ba52b1812ec450e30415 Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/commencement.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 122db31d6e3..c56afcd88eb 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1563,18 +1563,9 @@ ac_cv_c_float_format='IEEE (little-endian)' (symlink "gawk" (string-append bin "/awk")))))))))) (define (%boot-mesboot3-inputs) - `(("binutils" ,binutils-mesboot) - ("gawk" ,gawk-mesboot) - ("gcc" ,gcc-mesboot1) - ("make" ,gnu-make-mesboot) - ("kernel-headers" ,%bootstrap-linux-libre-headers) - ("libc" ,glibc-mesboot0) - ("gzip" ,gzip-mesboot) - ("patch" ,patch-mesboot) - ("bash" , gash-boot) ;gnu-build-system used to expect "bash" - ("coreutils" , gash-utils-boot) - ("bootar" ,bootar) - ("guile" ,%bootstrap-guile))) + (cons* binutils-mesboot + gawk-mesboot + (delete binutils-mesboot1 (%boot-mesboot2-inputs)))) (define glibc-headers-mesboot (package @@ -1593,7 +1584,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (base32 "0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7"))))) (native-inputs (cons* mesboot-headers - (map cadr (%boot-mesboot3-inputs)))) + (%boot-mesboot3-inputs))) (arguments (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) @@ -1692,7 +1683,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (inherit glibc-headers-mesboot) (name "glibc-mesboot") (native-inputs (cons* glibc-headers-mesboot - (map cadr (%boot-mesboot3-inputs)))) + (%boot-mesboot3-inputs))) (arguments (cons* #:validate-runpath? #f ; fails when using --enable-shared @@ -1727,7 +1718,17 @@ ac_cv_c_float_format='IEEE (little-endian)' (define (%boot-mesboot4-inputs) `(("libc" ,glibc-mesboot) - ,@(alist-delete "libc" (%boot-mesboot3-inputs)))) + ("binutils" ,binutils-mesboot) + ("gawk" ,gawk-mesboot) + ("gcc" ,gcc-mesboot1) + ("make" ,gnu-make-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("gzip" ,gzip-mesboot) + ("patch" ,patch-mesboot) + ("bash" , gash-boot) ;gnu-build-system used to expect "bash" + ("coreutils" , gash-utils-boot) + ("bootar" ,bootar) + ("guile" ,%bootstrap-guile))) (define gcc-mesboot1-wrapper ;; We need this so gcc-mesboot1 can be used to create shared binaries that
