guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 064fcfa728834fcd727f4587b1c3310bb28cc101 Author: Nicolas Graves <[email protected]> AuthorDate: Fri Feb 20 08:05:40 2026 +0100 gnu: glibc: Replace static-bash label by bash-static. This will make the migration to drop labels easier, as the package-name of static-bash is bash-static and not static-bash. * gnu/packages/base.scm (glibc) * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash) (glibc-final, gcc-final): Replace "static-bash" label by "bash-static". Change-Id: I27d19ef5af706d4c1a342d1f876900cdc1b81d35 Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/base.scm | 6 +++--- gnu/packages/commencement.scm | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e87c3ffa945..7eb451831cc 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1015,8 +1015,8 @@ the store.") (bin (string-append out "/bin")) ;; FIXME: Normally we would look it up only in INPUTS ;; but cross-base uses it as a native input. - (bash (or (assoc-ref inputs "static-bash") - (assoc-ref native-inputs "static-bash")))) + (bash (or (assoc-ref inputs "bash-static") + (assoc-ref native-inputs "bash-static")))) ;; Install the rpc data base file under `$out/etc/rpc'. (substitute* "inet/Makefile" (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix) @@ -1169,7 +1169,7 @@ the store.") (symlink cpu machine)))))) '())))) - (inputs `(("static-bash" ,static-bash))) + (inputs (list static-bash)) ;; To build the manual, we need Texinfo and Perl. Gettext is needed to ;; install the message catalogs, with 'msgfmt'. diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 05201b97610..3bce2ae3a37 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3082,7 +3082,7 @@ memoized as a function of '%current-system'." ;; Here, we use the bootstrap Bash, which is not satisfactory ;; because we don't want to depend on bootstrap tools. - ("static-bash" ,(%boot0-bash))))))) + ("bash-static" ,(%boot0-bash))))))) (define (cross-gcc-wrapper gcc binutils glibc bash) "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC @@ -3207,9 +3207,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (package/inherit libc (name "glibc") (source (bootstrap-origin (package-source libc))) - (inputs `(("static-bash" ,static-bash-for-glibc) + (inputs `(("bash-static" ,static-bash-for-glibc) ,@(alist-delete - "static-bash" + "bash-static" (package-inputs glibc-final-with-bootstrap-bash)))) ;; This time we need 'msgfmt' to install all the libc.mo files. @@ -3430,7 +3430,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; scripts?). (native-inputs `(("texinfo" ,texinfo-boot0) ("perl" ,perl-boot0) ;for manpages - ("static-bash" ,static-bash-for-glibc) + ("bash-static" ,static-bash-for-glibc) ,@(package-native-inputs gcc-boot0))) (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0)))
