ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 06:36:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

git-download: Set locale to deal with Unicode in git metadata.

Browse source 
Without this the git-fetch GEXP is run in an environment that uses ASCII
character encoding when strings are crossing the Guile - C boundary.  It means
that e.g. tag names that have Unicode chars in them will cause problems,
e.g. when walking and deleting the .git directory.

An example in the wild: https://github.com/klauspost/pgzip/tags

Fixes <https://issues.guix.gnu.org/54893>.

* guix/git-download.scm (git-fetch): Call 'setenv' and 'setlocale' to
set it to en_US.utf8.
* gnu/packages/commencement.scm (glibc-utf8-locales-final): Make public.
Add 'properties' field.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Attila Lendvai 2022-04-19 20:09:55 +02:00 committed by Ludovic Courtès
parent 8540c2d86c
commit 8852f911ff
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/commencement.scm
View file

@ -3613,7 +3613,7 @@ (define-public guile-final
(with-boot4 (hidden-package (with-boot4 (hidden-package
(package-with-bootstrap-guile guile-3.0/fixed)))) (package-with-bootstrap-guile guile-3.0/fixed))))
(define glibc-utf8-locales-final (define-public glibc-utf8-locales-final
;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed ;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed
;; by the build processes afterwards so their 'scm_to_locale_string' works ;; by the build processes afterwards so their 'scm_to_locale_string' works
;; with the full range of Unicode codepoints (remember ;; with the full range of Unicode codepoints (remember
@ -3621,6 +3621,8 @@ (define glibc-utf8-locales-final
;; function.) ;; function.)
(package (package
(inherit glibc-utf8-locales) (inherit glibc-utf8-locales)
(properties `((hidden? . #t)
,@(package-properties glibc-utf8-locales)))
(native-inputs (native-inputs
`(("glibc" ,glibc-final) `(("glibc" ,glibc-final)
("gzip" ,(with-boot4 gzip)))))) ("gzip" ,(with-boot4 gzip))))))

13
guix/git-download.scm
View file

@ -104,6 +104,12 @@ (define guile-zlib
(define gnutls (define gnutls
(module-ref (resolve-interface '(gnu packages tls)) 'gnutls)) (module-ref (resolve-interface '(gnu packages tls)) '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 (define modules
(delete '(guix config) (delete '(guix config)
(source-module-closure '((guix build git) (source-module-closure '((guix build git)
@ -125,6 +131,13 @@ (define build
(define recursive? (define recursive?
(call-with-input-string (getenv "git recursive?") read)) (call-with-input-string (getenv "git recursive?") read))
;; 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")
;; The 'git submodule' commands expects Coreutils, sed, ;; The 'git submodule' commands expects Coreutils, sed,
;; grep, etc. to be in $PATH. ;; grep, etc. to be in $PATH.
(set-path-environment-variable "PATH" '("bin") (set-path-environment-variable "PATH" '("bin")