[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#67824] [PATCH core-updates v2 2/9] build-system/gnu: Change default
From: |
Ludovic Courtès |
Subject: |
[bug#67824] [PATCH core-updates v2 2/9] build-system/gnu: Change default locale to C.UTF-8. |
Date: |
Mon, 18 Dec 2023 17:30:13 +0100 |
This is a followup to 1cebc334a77030c0c94955981652f4df7608c9e3.
* guix/build-system/gnu.scm (gnu-build, gnu-cross-build): #:locale now
defaults to "C.UTF-8".
* guix/build/gnu-build-system.scm (install-locale): Likewise.
* gnu/packages/linux.scm (util-linux)[arguments]: In ‘pre-check’ phase,
remove ‘invalid-multibyte’ modification so the test runs under C.UTF-8.
Change-Id: I9a4bfe564bcd8bbd0d57ba04568eb6b8020bd051
---
gnu/packages/linux.scm | 6 +-----
guix/build-system/gnu.scm | 4 ++--
guix/build/gnu-build-system.scm | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 430645e4ad..0572ad3a73 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2257,11 +2257,7 @@ (define-public util-linux
;; Change the test to refer to the right file.
(substitute* "tests/ts/misc/mcookie"
(("/etc/services")
- services))
-
- ;; The C.UTF-8 locale does not exist in our libc.
- (substitute* "tests/ts/column/invalid-multibyte"
- (("C\\.UTF-8") "en_US.utf8")))))
+ services)))))
(add-before 'check 'disable-setarch-test
(lambda _
;; The setarch tests are unreliable in QEMU's user-mode
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index ed1dc33c76..0f886fe21d 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -361,7 +361,7 @@ (define* (gnu-build name inputs
(make-dynamic-linker-cache? #t)
(license-file-regexp %license-file-regexp)
(phases '%standard-phases)
- (locale "en_US.utf8")
+ (locale "C.UTF-8")
(system (%current-system))
(build (nix-system->gnu-triplet system))
(imported-modules %default-gnu-imported-modules)
@@ -501,7 +501,7 @@ (define* (gnu-cross-build name
(license-file-regexp %license-file-regexp)
(phases '%standard-phases)
- (locale "en_US.utf8")
+ (locale "C.UTF-8")
(system (%current-system))
(build (nix-system->gnu-triplet system))
(imported-modules %default-gnu-imported-modules)
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index ef5873d793..39707e7ace 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -123,7 +123,7 @@ (define* (set-paths #:key target inputs native-inputs
native-search-paths)))
(define* (install-locale #:key
- (locale "en_US.utf8")
+ (locale "C.UTF-8")
(locale-category LC_ALL)
#:allow-other-keys)
"Try to install LOCALE; emit a warning if that fails. The main goal is to
--
2.41.0
- [bug#67824] [PATCH core-updates 6/6] gnu: glibc-utf8-locales: Add the C.UTF-8 locale., (continued)
- [bug#67824] [PATCH core-updates 6/6] gnu: glibc-utf8-locales: Add the C.UTF-8 locale., Ludovic Courtès, 2023/12/14
- [bug#67824] [PATCH core-updates 2/6] build-system/gnu: Change default locale to C.UTF-8., Ludovic Courtès, 2023/12/14
- [bug#67824] [PATCH core-updates 3/6] gnu: commencement: Remove ‘glibc-utf8-locales’ from ‘%final-inputs’., Ludovic Courtès, 2023/12/14
- [bug#67824] [PATCH core-updates 5/6] packages: Output and error ports are line-buffered in ‘patch-and-repack’., Ludovic Courtès, 2023/12/14
- [bug#67824] [PATCH core-updates 4/6] profiles: Use C.UTF-8 instead of ‘glibc-utf8-locales’ where possible., Ludovic Courtès, 2023/12/14
- [bug#67824] [PATCH core-updates 1/6] packages: Remove reference to ‘glibc-utf8-locales’ in ‘patch-and-repack’., Ludovic Courtès, 2023/12/14
- [bug#67824] [PATCH core-updates 0/6] Run builds in C.UTF-8 locale, Janneke Nieuwenhuizen, 2023/12/16
- [bug#67824] [PATCH core-updates v2 0/9] Run builds in C.UTF-8 locale, Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 2/9] build-system/gnu: Change default locale to C.UTF-8.,
Ludovic Courtès <=
- [bug#67824] [PATCH core-updates v2 1/9] packages: Remove reference to ‘glibc-utf8-locales’ in ‘patch-and-repack’., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 3/9] gnu: commencement: Remove ‘glibc-utf8-locales’ from ‘%final-inputs’., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 5/9] packages: Output and error ports are line-buffered in ‘patch-and-repack’., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 4/9] profiles: Use C.UTF-8 instead of ‘glibc-utf8-locales’ where possible., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 6/9] gnu: glibc-utf8-locales: Add the C.UTF-8 locale., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 9/9] gnu: glib: Skip test that fails with glibc 2.38., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 8/9] build-system/gnu: Turn PID 1 into an “init”-style process by default., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 7/9] gnu: glibc: Add patch for ‘ucontext’ on x86_64-gnu (GNU/Hurd)., Ludovic Courtès, 2023/12/18
- bug#67824: [PATCH core-updates v2 0/9] Run builds in C.UTF-8 locale, Ludovic Courtès, 2023/12/19