8 files changed, 20 insertions(+), 28 deletions(-)

M build-aux/hydra/demo-os.scm
M gnu/packages/gawk.scm
M gnu/packages/guile.scm
M gnu/packages/python.scm
M guix/build-system/gnu.scm
M guix/build/gnu-build-system.scm
M guix/packages.scm
M guix/profiles.scm

@@ 1,5 1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; 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")))

@@ 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)
 

@@ 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

@@ 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")

@@ 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)

@@ 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

@@ 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"))

@@ 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))
           (()