diff options
author | Ludovic Courtès <ludo@gnu.org> | 2024-01-25 22:26:16 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2024-01-25 22:26:16 +0100 |
commit | 21ebe7699adef96c5c4424a0a55fdea36e58e21e (patch) | |
tree | 6e64a940c84b596ee17e35d0452ba430b0aabf66 | |
parent | 820c508a6e149cac340525495802187f6a0c4f6c (diff) |
git-download: Use C.UTF-8 and remove dependency on ‘glibc-utf8-locales’.
This is a followup to 1cebc334a77030c0c94955981652f4df7608c9e3.
* guix/git-download.scm (git-fetch/in-band*)[glibc-locales]: Remove.
[build]: Leave ‘GUIX_LOCPATH’ unset. Use “C.UTF-8” instead of
“en_US.utf8”.
Change-Id: I268361c04dd2d6154d97836b1f41ff06ffd278eb
-rw-r--r-- | guix/git-download.scm | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/guix/git-download.scm b/guix/git-download.scm index 3de6ae970d..6ce6b29329 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2021, 2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2021, 2023-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> @@ -121,12 +121,6 @@ respective documentation." (define gnutls (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls)) - (define glibc-locales - ;; Note: pick the '-final' variant to avoid circular dependency on - ;; i586-gnu, where 'glibc-utf8-locales' indirectly depends on Git. - (module-ref (resolve-interface '(gnu packages commencement)) - 'glibc-utf8-locales-final)) - (define modules (delete '(guix config) (source-module-closure '((guix build git) @@ -151,9 +145,7 @@ respective documentation." ;; Let Guile interpret file names as UTF-8, otherwise ;; 'delete-file-recursively' might fail to delete all of ;; '.git'--see <https://issues.guix.gnu.org/54893>. - (setenv "GUIX_LOCPATH" - #+(file-append glibc-locales "/lib/locale")) - (setlocale LC_ALL "en_US.utf8") + (setlocale LC_ALL "C.UTF-8") ;; The 'git submodule' commands expects Coreutils, sed, grep, ;; etc. to be in $PATH. This also ensures that git extensions are |