guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit f3fa438f53c8510499974de4259d1121aa097832 Author: Nicolas Graves <[email protected]> AuthorDate: Mon Feb 23 13:26:09 2026 +0100 gnu: %final-inputs: Partially drop input labels. * gnu/packages/commencement.scm (%final-inputs): Drop input labels. Change-Id: Ib91c1b907356335b36fef0b12d8ed3019c8b2c98 Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/commencement.scm | 72 +++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index de569cd7dab..5c63db3b369 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3606,50 +3606,50 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; used for origins that have patches, thereby avoiding circular ;; dependencies. (parameterize ((%current-system system)) - (let ((finalize (compose with-boot6 - package-with-bootstrap-guile))) - `(,@(map (match-lambda - ((name package) - (list name (finalize package)))) - `(("tar" ,tar) - ("gzip" ,gzip) - ("bzip2" ,bzip2) - ("file" ,file) - ("diffutils" ,diffutils) - ("patch" ,patch) - ("findutils" ,findutils) - ("gawk" ,(package/inherit gawk - (native-inputs - (list (if (target-hurd?) - glibc-utf8-locales-final/hurd - glibc-utf8-locales-final))))) - ("zstd" ,zstd))) - ("sed" ,sed-final) - ("grep" ,grep-final) - ("xz" ,xz-final) - ("coreutils" ,coreutils-final) - ("make" ,(make-gnu-make-final)) - ("bash" ,bash-final) - ("ld-wrapper" ,ld-wrapper) - ("binutils" ,binutils-final) - ("gcc" ,gcc-final) - ("libc" ,glibc-final) - ("libc:static" ,glibc-final "static")))))) + (append + (map packages->input-alist + (append + (map (compose with-boot6 package-with-bootstrap-guile) + (list tar + gzip + bzip2 + file + diffutils + patch + findutils + (package/inherit gawk + (native-inputs + (list (if (target-hurd?) + glibc-utf8-locales-final/hurd + glibc-utf8-locales-final)))) + zstd)) + (list sed-final + grep-final + xz-final + coreutils-final + (make-gnu-make-final) + bash-final + ld-wrapper + binutils-final))) + `(("gcc" ,gcc-final) + ("libc" ,glibc-final) + ("libc:static" ,glibc-final "static")))))) (define-public canonical-package (let ((name->package (mlambda (system) (fold (lambda (input result) (match input - ((_ package . outputs) + ((or ((? package? package) . _) + (? package? package) + (_ (? package? package) . _)) (vhash-cons (package-full-name package) package result)))) vlist-null - `(("guile" ,guile-final) - ("glibc-utf8-locales" - ,(if (target-hurd? system) - glibc-utf8-locales-final/hurd - glibc-utf8-locales-final)) - ,@(%final-inputs system)))))) + (cons* guile-final + (if (target-hurd? system) + glibc-utf8-locales-final/hurd + glibc-utf8-locales-final) + (%final-inputs system)))))) (lambda (package) "Return the 'canonical' variant of PACKAGE---i.e., if PACKAGE is one of the implicit inputs of 'gnu-build-system', return that one, otherwise return
