[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: Use "normalized codesets" everywhere.
|
From: |
Ludovic Courtès |
|
Subject: |
05/05: Use "normalized codesets" everywhere. |
|
Date: |
Sat, 03 Oct 2015 22:11:34 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit afd3d9316ce3c48cd7f7dbae64be0f8bcb756ba6
Author: Ludovic Courtès <address@hidden>
Date: Sat Oct 3 20:12:59 2015 +0200
Use "normalized codesets" everywhere.
In other words, change "xx_YY.UTF-8" to "xx_YY.utf8".
* guix/profiles.scm (ca-certificate-bundle): Use "en_US.utf8" instead of
"en_US.UTF-8".
* guix/packages.scm (patch-and-repack): Likewise.
* guix/build/gnu-build-system.scm (install-locale): Likewise.
* guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Likewise.
* gnu/packages/python.scm (python-ipython): Likewise.
* gnu/packages/gawk.scm (gawk): Likewise.
* build-aux/hydra/demo-os.scm: Likewise.
* gnu/packages/guile.scm (guile-ncurses)[arguments]: Remove
'change-locale' phase.
---
build-aux/hydra/demo-os.scm | 4 ++--
gnu/packages/gawk.scm | 2 +-
gnu/packages/guile.scm | 30 +++++++++++-------------------
gnu/packages/python.scm | 2 +-
guix/build-system/gnu.scm | 4 ++--
guix/build/gnu-build-system.scm | 2 +-
guix/packages.scm | 2 +-
guix/profiles.scm | 2 +-
8 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/build-aux/hydra/demo-os.scm b/build-aux/hydra/demo-os.scm
index 95950ca..ce46caa 100644
--- a/build-aux/hydra/demo-os.scm
+++ b/build-aux/hydra/demo-os.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -29,7 +29,7 @@
(operating-system
(host-name "gnu")
(timezone "Europe/Paris")
- (locale "en_US.UTF-8")
+ (locale "en_US.utf8")
(bootloader (grub-configuration
(device "/dev/sda")))
diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm
index fa07f5b..425974f 100644
--- a/gnu/packages/gawk.scm
+++ b/gnu/packages/gawk.scm
@@ -66,7 +66,7 @@
(setenv "GUIX_LOCPATH" (getcwd))
(zero? (system* "localedef" "--no-archive"
"--prefix" (getcwd) "-i" "en_US"
- "-f" "UTF-8" "./en_US.UTF-8")))
+ "-f" "UTF-8" "./en_US.utf8")))
%standard-phases))))
(inputs `(("libsigsegv" ,libsigsegv)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index d5a95a0..f77c9df 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -295,25 +295,17 @@ many readers as needed).")
(string-append "--with-guilesitedir="
(assoc-ref %outputs "out")
"/share/guile/site/2.0"))
- #:phases (alist-cons-before
- 'check 'change-locale
- (lambda _
- ;; Use the locale that's actually available in the build
- ;; environment.
- (substitute* "test/f009_form_wide.test"
- (("en_US\\.utf8")
- "en_US.UTF-8")))
- (alist-cons-after
- 'install 'post-install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (dir (string-append out "/share/guile/site/"))
- (files (find-files dir ".scm")))
- (substitute* files
- (("\"libguile-ncurses\"")
- (format #f "\"~a/lib/libguile-ncurses\""
- out)))))
- %standard-phases))))
+ #:phases (alist-cons-after
+ 'install 'post-install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (dir (string-append out "/share/guile/site/"))
+ (files (find-files dir ".scm")))
+ (substitute* files
+ (("\"libguile-ncurses\"")
+ (format #f "\"~a/lib/libguile-ncurses\""
+ out)))))
+ %standard-phases)))
(home-page "http://www.gnu.org/software/guile-ncurses/";)
(synopsis "Guile bindings to ncurses")
(description
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 708ba29..fd1a2d3 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3665,7 +3665,7 @@ cluster without needing to write any wrapper code
yourself.")
(man1 (string-append data "/man/man1"))
(info (string-append data "/info"))
(examples (string-append doc "/examples")))
- (setenv "LANG" "en_US.UTF-8")
+ (setenv "LANG" "en_US.utf8")
(with-directory-excursion "docs"
;; FIXME: html and pdf fail to build
;; (system* "make" "html")
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 1f30244..3be8346 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -287,7 +287,7 @@ standard packages used as implicit inputs of the GNU build
system."
"bin" "sbin"))
(validate-runpath? #t)
(phases '%standard-phases)
- (locale "en_US.UTF-8")
+ (locale "en_US.utf8")
(system (%current-system))
(build (nix-system->gnu-triplet system))
(imported-modules %gnu-build-system-modules)
@@ -422,7 +422,7 @@ is one of `host' or `target'."
"bin" "sbin"))
(validate-runpath? #t)
(phases '%standard-phases)
- (locale "en_US.UTF-8")
+ (locale "en_US.utf8")
(system (%current-system))
(build (nix-system->gnu-triplet system))
(imported-modules %gnu-build-system-modules)
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 75439c8..ff7646b 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -99,7 +99,7 @@
#t)
(define* (install-locale #:key
- (locale "en_US.UTF-8")
+ (locale "en_US.utf8")
(locale-category LC_ALL)
#:allow-other-keys)
"Try to install LOCALE; emit a warning if that fails. The main goal is to
diff --git a/guix/packages.scm b/guix/packages.scm
index 72822b8..622cb0a 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -478,7 +478,7 @@ IMPORTED-MODULES specify modules to use/import for use by
SNIPPET."
;; First of all, install a UTF-8 locale so that UTF-8 file names
;; are correctly interpreted. During bootstrap, LOCALES is #f.
(setenv "LOCPATH" (string-append #+locales "/lib/locale"))
- (setlocale LC_ALL "en_US.UTF-8"))
+ (setlocale LC_ALL "en_US.utf8"))
(setenv "PATH" (string-append #+xz "/bin" ":"
#+decomp "/bin"))
diff --git a/guix/profiles.scm b/guix/profiles.scm
index c56ebb1..fac322b 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -576,7 +576,7 @@ MANIFEST. Single-file bundles are required by programs
such as Git and Lynx."
(setenv "LOCPATH"
(string-append #+glibc-utf8-locales "/lib/locale/"
#+(package-version glibc-utf8-locales)))
- (setlocale LC_ALL "en_US.UTF-8")
+ (setlocale LC_ALL "en_US.utf8")
(match (append-map ca-files '#$(manifest-inputs manifest))
(()