From afd3d9316ce3c48cd7f7dbae64be0f8bcb756ba6 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 3 Oct 2015 20:12:59 +0200
Subject: 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.
---
 guix/build-system/gnu.scm       | 4 ++--
 guix/build/gnu-build-system.scm | 2 +-
 guix/packages.scm               | 2 +-
 guix/profiles.scm               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'guix')

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 1f302447c2..3be83468eb 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 75439c8330..ff7646b22c 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 72822b8c97..622cb0ac0c 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 c56ebb145b..fac322bbab 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))
           (()
-- 
cgit v1.2.3