mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: Use ‘libc-utf8-locales-for-target’.
* guix/packages.scm (%standard-patch-inputs): Use ‘libc-utf8-locales-for-target’ instead of ‘glibc-utf8-locales’. * guix/self.scm (%packages): Likewise. * gnu/home/services/ssh.scm (file-join): Likewise * gnu/installer.scm (build-compiled-file): Likewise. * gnu/packages/chromium.scm (ungoogled-chromium/wayland): Likewise. * gnu/packages/gnome.scm (libgweather4, tracker): Likewise. * gnu/packages/javascript.scm (js-mathjax): Likewise. * gnu/packages/package-management.scm (guix, flatpak): Likewise. * gnu/packages/raspberry-pi.scm (raspi-arm64-chainloader): Likewise. * gnu/packages/suckless.scm (svkbd): Likewise. * gnu/services.scm (cleanup-gexp): Likewise. * gnu/services/base.scm (guix-publish-shepherd-service): Likewise. * gnu/services/guix.scm (guix-build-coordinator-shepherd-services) (guix-build-coordinator-agent-shepherd-services): Likewise. * gnu/services/guix.scm (guix-build-coordinator-queue-builds-shepherd-services): (guix-data-service-shepherd-services) (nar-herder-shepherd-services) (bffe-shepherd-services): Likewise. * gnu/services/web.scm (anonip-shepherd-service) (mumi-shepherd-services): Likewise. * gnu/system/image.scm (system-disk-image, system-iso9660-image) (system-docker-image, system-tarball-image): Likewise. * gnu/system/install.scm (%installation-services): Likewise. * guix/profiles.scm (info-dir-file): Likewise. (ca-certificate-bundle, profile-derivation): Likewise. * guix/scripts/pack.scm (store-database, set-utf8-locale): Likewise. * tests/pack.scm: Likewise. * tests/profiles.scm ("profile-derivation, cross-compilation"): Likewise. Co-authored-by: Ludovic Courtès <ludo@gnu.org> Co-authored-by: Christopher Baines <mail@cbaines.net> Change-Id: I24239f427bcc930c29d2ba5d00dc615960a6c374
This commit is contained in:
parent
9442b53c6b
commit
b0715d7cd2
20 changed files with 97 additions and 56 deletions
|
@ -63,7 +63,9 @@
|
|||
#:use-module (gnu packages bash)
|
||||
#:use-module ((gnu packages base)
|
||||
#:select (coreutils glibc glibc/hurd
|
||||
glibc-utf8-locales make-glibc-utf8-locales
|
||||
glibc-utf8-locales
|
||||
libc-utf8-locales-for-target
|
||||
make-glibc-utf8-locales
|
||||
tar canonical-package))
|
||||
#:use-module ((gnu packages compression) #:select (gzip))
|
||||
#:use-module (gnu packages fonts)
|
||||
|
@ -2147,7 +2149,8 @@ raise a deprecation warning if the 'compression-level' field was used."
|
|||
;; nars for packages that contain UTF-8 file names such
|
||||
;; as 'nss-certs'. See <https://bugs.gnu.org/26948>.
|
||||
(list (string-append "GUIX_LOCPATH="
|
||||
#$glibc-utf8-locales "/lib/locale")
|
||||
#$(libc-utf8-locales-for-target)
|
||||
"/lib/locale")
|
||||
"LC_ALL=en_US.utf8")
|
||||
#:log-file "/var/log/guix-publish.log"))
|
||||
(endpoints #~(let ((ai (false-if-exception
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#:use-module (guix records)
|
||||
#:use-module (guix packages)
|
||||
#:use-module ((gnu packages base)
|
||||
#:select (glibc-utf8-locales))
|
||||
#:select (libc-utf8-locales-for-target))
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages web)
|
||||
|
@ -381,7 +381,8 @@
|
|||
#:pid-file-timeout 60
|
||||
#:environment-variables
|
||||
`(,(string-append
|
||||
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
||||
"GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target) "/lib/locale")
|
||||
"LC_ALL=en_US.utf8"
|
||||
"PATH=/run/current-system/profile/bin" ; for hooks
|
||||
#$@extra-environment-variables)
|
||||
|
@ -508,7 +509,8 @@
|
|||
#:user #$user
|
||||
#:environment-variables
|
||||
`(,(string-append
|
||||
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
||||
"GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target) "/lib/locale")
|
||||
;; XDG_CACHE_HOME is used by Guix when caching narinfo files
|
||||
"XDG_CACHE_HOME=/var/cache/guix-build-coordinator-agent"
|
||||
"LC_ALL=en_US.utf8")
|
||||
|
@ -600,7 +602,8 @@
|
|||
#:user #$user
|
||||
#:environment-variables
|
||||
`(,(string-append
|
||||
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
||||
"GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target) "/lib/locale")
|
||||
"LC_ALL=en_US.utf8")
|
||||
#:log-file "/var/log/guix-build-coordinator/queue-builds.log"))))
|
||||
(stop #~(make-kill-destructor))
|
||||
|
@ -712,7 +715,8 @@ ca-certificates.crt file in the system profile."
|
|||
#:pid-file "/var/run/guix-data-service/pid"
|
||||
#:environment-variables
|
||||
`(,(string-append
|
||||
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
||||
"GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target) "/lib/locale")
|
||||
"LC_ALL=en_US.UTF-8")
|
||||
#:log-file "/var/log/guix-data-service/web.log"))
|
||||
(stop #~(make-kill-destructor)))
|
||||
|
@ -733,7 +737,8 @@ ca-certificates.crt file in the system profile."
|
|||
`("HOME=/var/lib/guix-data-service"
|
||||
"GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
|
||||
,(string-append
|
||||
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
||||
"GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target) "/lib/locale")
|
||||
"LC_ALL=en_US.UTF-8")
|
||||
#:log-file "/var/log/guix-data-service/process-jobs.log"))
|
||||
(stop #~(make-kill-destructor))))))
|
||||
|
@ -989,7 +994,8 @@ ca-certificates.crt file in the system profile."
|
|||
#:pid-file "/var/run/nar-herder/pid"
|
||||
#:environment-variables
|
||||
`(,(string-append
|
||||
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
||||
"GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target) "/lib/locale")
|
||||
"LC_ALL=en_US.utf8"
|
||||
#$@extra-environment-variables)
|
||||
#:log-file "/var/log/nar-herder/server.log"))
|
||||
|
@ -1108,7 +1114,8 @@ ca-certificates.crt file in the system profile."
|
|||
#:directory "/var/lib/bffe"
|
||||
#:environment-variables
|
||||
`(,(string-append
|
||||
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
|
||||
"GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target) "/lib/locale")
|
||||
"LC_ALL=en_US.utf8"
|
||||
#$@extra-environment-variables)
|
||||
#:log-file "/var/log/bffe/server.log"))
|
||||
|
|
|
@ -1498,7 +1498,8 @@ files.")
|
|||
'#$(optional anonip-configuration-regex "--regex"))
|
||||
;; Run in a UTF-8 locale
|
||||
#:environment-variables
|
||||
(list (string-append "GUIX_LOCPATH=" #$glibc-utf8-locales
|
||||
(list (string-append "GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target)
|
||||
"/lib/locale")
|
||||
"LC_ALL=en_US.utf8")))
|
||||
|
||||
|
@ -1976,7 +1977,8 @@ WSGIPassAuthorization On
|
|||
(define (mumi-shepherd-services config)
|
||||
(define environment
|
||||
#~(list "LC_ALL=en_US.utf8"
|
||||
(string-append "GUIX_LOCPATH=" #$glibc-utf8-locales
|
||||
(string-append "GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target)
|
||||
"/lib/locale")))
|
||||
|
||||
(match config
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue