nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2015-10-03 20:12:59 +02:00
parent 8a55e217ad
commit afd3d9316c
8 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-aux/hydra/demo-os.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -29,7 +29,7 @@
(operating-system (operating-system
(host-name "gnu") (host-name "gnu")
(timezone "Europe/Paris") (timezone "Europe/Paris")
(locale "en_US.UTF-8") (locale "en_US.utf8")
(bootloader (grub-configuration (bootloader (grub-configuration
(device "/dev/sda"))) (device "/dev/sda")))

2
gnu/packages/gawk.scm
View File

@ -66,7 +66,7 @@
(setenv "GUIX_LOCPATH" (getcwd)) (setenv "GUIX_LOCPATH" (getcwd))
(zero? (system* "localedef" "--no-archive" (zero? (system* "localedef" "--no-archive"
"--prefix" (getcwd) "-i" "en_US" "--prefix" (getcwd) "-i" "en_US"
"-f" "UTF-8" "./en_US.UTF-8"))) "-f" "UTF-8" "./en_US.utf8")))
%standard-phases)))) %standard-phases))))
(inputs `(("libsigsegv" ,libsigsegv) (inputs `(("libsigsegv" ,libsigsegv)

30
gnu/packages/guile.scm
View File

@ -295,25 +295,17 @@ many readers as needed).")
(string-append "--with-guilesitedir=" (string-append "--with-guilesitedir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/guile/site/2.0")) "/share/guile/site/2.0"))
#:phases (alist-cons-before #:phases (alist-cons-after
'check 'change-locale 'install 'post-install
(lambda _ (lambda* (#:key outputs #:allow-other-keys)
;; Use the locale that's actually available in the build (let* ((out (assoc-ref outputs "out"))
;; environment. (dir (string-append out "/share/guile/site/"))
(substitute* "test/f009_form_wide.test" (files (find-files dir ".scm")))
(("en_US\\.utf8") (substitute* files
"en_US.UTF-8"))) (("\"libguile-ncurses\"")
(alist-cons-after (format #f "\"~a/lib/libguile-ncurses\""
'install 'post-install out)))))
(lambda* (#:key outputs #:allow-other-keys) %standard-phases)))
(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/") (home-page "http://www.gnu.org/software/guile-ncurses/")
(synopsis "Guile bindings to ncurses") (synopsis "Guile bindings to ncurses")
(description (description

2
gnu/packages/python.scm
View File

@ -3665,7 +3665,7 @@ cluster without needing to write any wrapper code yourself.")
(man1 (string-append data "/man/man1")) (man1 (string-append data "/man/man1"))
(info (string-append data "/info")) (info (string-append data "/info"))
(examples (string-append doc "/examples"))) (examples (string-append doc "/examples")))
(setenv "LANG" "en_US.UTF-8") (setenv "LANG" "en_US.utf8")
(with-directory-excursion "docs" (with-directory-excursion "docs"
;; FIXME: html and pdf fail to build ;; FIXME: html and pdf fail to build
;; (system* "make" "html") ;; (system* "make" "html")

4
guix/build-system/gnu.scm
View File

@ -287,7 +287,7 @@ standard packages used as implicit inputs of the GNU build system."
"bin" "sbin")) "bin" "sbin"))
(validate-runpath? #t) (validate-runpath? #t)
(phases '%standard-phases) (phases '%standard-phases)
(locale "en_US.UTF-8") (locale "en_US.utf8")
(system (%current-system)) (system (%current-system))
(build (nix-system->gnu-triplet system)) (build (nix-system->gnu-triplet system))
(imported-modules %gnu-build-system-modules) (imported-modules %gnu-build-system-modules)
@ -422,7 +422,7 @@ is one of `host' or `target'."
"bin" "sbin")) "bin" "sbin"))
(validate-runpath? #t) (validate-runpath? #t)
(phases '%standard-phases) (phases '%standard-phases)
(locale "en_US.UTF-8") (locale "en_US.utf8")
(system (%current-system)) (system (%current-system))
(build (nix-system->gnu-triplet system)) (build (nix-system->gnu-triplet system))
(imported-modules %gnu-build-system-modules) (imported-modules %gnu-build-system-modules)

2
guix/build/gnu-build-system.scm
View File

@ -99,7 +99,7 @@
#t) #t)
(define* (install-locale #:key (define* (install-locale #:key
(locale "en_US.UTF-8") (locale "en_US.utf8")
(locale-category LC_ALL) (locale-category LC_ALL)
#:allow-other-keys) #:allow-other-keys)
"Try to install LOCALE; emit a warning if that fails. The main goal is to "Try to install LOCALE; emit a warning if that fails. The main goal is to

2
guix/packages.scm
View File

@ -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 ;; First of all, install a UTF-8 locale so that UTF-8 file names
;; are correctly interpreted. During bootstrap, LOCALES is #f. ;; are correctly interpreted. During bootstrap, LOCALES is #f.
(setenv "LOCPATH" (string-append #+locales "/lib/locale")) (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" ":" (setenv "PATH" (string-append #+xz "/bin" ":"
#+decomp "/bin")) #+decomp "/bin"))

2
guix/profiles.scm
View File

@ -576,7 +576,7 @@ MANIFEST. Single-file bundles are required by programs such as Git and Lynx."
(setenv "LOCPATH" (setenv "LOCPATH"
(string-append #+glibc-utf8-locales "/lib/locale/" (string-append #+glibc-utf8-locales "/lib/locale/"
#+(package-version glibc-utf8-locales))) #+(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)) (match (append-map ca-files '#$(manifest-inputs manifest))
(() (()