guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 8893ddb055a13e297d4608216f300aaada33d56d Author: Robin Templeton <[email protected]> AuthorDate: Thu Jan 29 14:29:28 2026 -0500 gnu: git-minimal: Source gettext.sh from gettext-minimal. * gnu/packages/version-control.scm (git-minimal): Patch git-sh-i18n.sh to source the gettext.sh script from gettext-minimal, rather than searching $PATH for it. Change-Id: Iadecb078a704c4b1ec59074e9ddcf620dc754b78 Signed-off-by: Ludovic Courtès <[email protected]> Merges: #6042 --- gnu/packages/version-control.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a680beca03d..a9522b13a79 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -70,6 +70,7 @@ ;;; Copyright © 2026 Ingar <[email protected]> ;;; Copyright © 2026 Nguyễn Gia Phong <[email protected]> ;;; Copyright © 2026 Luca Kredel <[email protected]> +;;; Copyright © 2026 Robin Templeton <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -508,6 +509,16 @@ optimized for version control systems.") "MINGW" "GNU"))) ;matched against '*' + ;; Patch git-sh-i18n.sh to source gettext.sh from + ;; gettext-minimal. By default, it uses gettext.sh from $PATH + ;; if available, and falls back to English if not. + (let ((gettext-sh (search-input-file inputs "bin/gettext.sh"))) + (substitute* "git-sh-i18n.sh" + (("type gettext.sh") + (format #f "type ~a" gettext-sh)) + (("\\. gettext.sh") + (format #f ". ~a" gettext-sh)))) + ;; git-submodule sources 'git-sh-setup.sh', but not before ;; invoking the basename and sed commands... patch them to their ;; absolute location. @@ -645,6 +656,7 @@ optimized for version control systems.") coreutils-minimal curl ;for HTTP(S) access expat ;for 'git push' over HTTP(S) + gettext-minimal ;for gettext.sh openssl perl sed
