diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-10-12 21:42:06 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-12 21:42:06 +0200 |
commit | adc90e0eac3cb326cd687f80514dad6a5240969d (patch) | |
tree | 6335b4b8cded5dc1518b5494762cdb09d8acbab1 /guix | |
parent | a8bc747ae1ba53c4c8719730284a771187d8ccfb (diff) | |
parent | 9765b3aeac88ae9c9ffc38ed6d1f8dcbd9abca7b (diff) | |
download | guix-patches-adc90e0eac3cb326cd687f80514dad6a5240969d.tar guix-patches-adc90e0eac3cb326cd687f80514dad6a5240969d.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'guix')
-rw-r--r-- | guix/build-system/gnu.scm | 4 | ||||
-rw-r--r-- | guix/build/gnu-build-system.scm | 14 | ||||
-rw-r--r-- | guix/build/utils.scm | 14 | ||||
-rw-r--r-- | guix/packages.scm | 7 | ||||
-rw-r--r-- | guix/profiles.scm | 6 |
5 files changed, 26 insertions, 19 deletions
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 0a774e1e84..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 @@ -409,18 +409,6 @@ makefiles." strip-directories))) outputs)))) -(define (every* pred lst) - "This is like 'every', but process all the elements of LST instead of -stopping as soon as PRED returns false. This is useful when PRED has side -effects, such as displaying warnings or error messages." - (let loop ((lst lst) - (result #t)) - (match lst - (() - result) - ((head . tail) - (loop tail (and (pred head) result)))))) - (define* (validate-runpath #:key (validate-runpath? #t) (elf-directories '("lib" "lib64" "libexec" diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 971929621a..e3f9edc5b5 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -59,10 +59,12 @@ list->search-path-as-string which + every* alist-cons-before alist-cons-after alist-replace modify-phases + with-atomic-file-replacement substitute substitute* @@ -454,6 +456,18 @@ PROGRAM could not be found." ;;; phases. ;;; +(define (every* pred lst) + "This is like 'every', but process all the elements of LST instead of +stopping as soon as PRED returns false. This is useful when PRED has side +effects, such as displaying warnings or error messages." + (let loop ((lst lst) + (result #t)) + (match lst + (() + result) + ((head . tail) + (loop tail (and (pred head) result)))))) + (define* (alist-cons-before reference key value alist #:optional (key=? equal?)) "Insert the KEY/VALUE pair before the first occurrence of a pair whose key diff --git a/guix/packages.scm b/guix/packages.scm index 72822b8c97..68fb0916d8 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -477,8 +477,11 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET." (when #+locales ;; 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")) + (setenv "LOCPATH" + (string-append #+locales "/lib/locale/" + #+(and locales + (package-version locales)))) + (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 0b417a64de..fac322bbab 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -573,8 +573,10 @@ MANIFEST. Single-file bundles are required by programs such as Git and Lynx." ;; Some file names in the NSS certificates are UTF-8 encoded so ;; install a UTF-8 locale. - (setenv "LOCPATH" (string-append #+glibc-utf8-locales "/lib/locale")) - (setlocale LC_ALL "en_US.UTF-8") + (setenv "LOCPATH" + (string-append #+glibc-utf8-locales "/lib/locale/" + #+(package-version glibc-utf8-locales))) + (setlocale LC_ALL "en_US.utf8") (match (append-map ca-files '#$(manifest-inputs manifest)) (() |