01/01: Merge branch 'master' into core-updates

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 605217beaa6399c62e6b333db75afae722db099a
Merge: a4a17ec c8351d9
Author: Ludovic Courtès <address@hidden>
Date:   Wed Feb 11 22:27:05 2015 +0100

    Merge branch 'master' into core-updates

 doc/guix.texi                            |   10 +++++--
 gnu-system.am                            |    1 +
 gnu/packages/base.scm                    |   36 ++++++++++++++++++++++++++++++
 gnu/packages/gettext.scm                 |    4 +-
 gnu/packages/patches/glibc-locales.patch |   31 +++++++++++++++++++++++++
 guix/derivations.scm                     |    1 +
 guix/gexp.scm                            |   35 +++++++++++++++++++++++++++-
 tests/gexp.scm                           |   25 ++++++++++++++++++++
 8 files changed, 136 insertions(+), 7 deletions(-)

diff --cc gnu-system.am
index 038841b,1a68b8b..561b66c
--- a/gnu-system.am
+++ b/gnu-system.am
@@@ -389,8 -389,12 +389,9 @@@ dist_patch_DATA =                                 
        
    gnu/packages/patches/glib-tests-prlimit.patch                       \
    gnu/packages/patches/glib-tests-timer.patch                 \
    gnu/packages/patches/glib-tests-gapplication.patch          \
 -  gnu/packages/patches/glibc-CVE-2012-3406.patch              \
 -  gnu/packages/patches/glibc-CVE-2014-7817.patch              \
    gnu/packages/patches/glibc-bootstrap-system.patch           \
    gnu/packages/patches/glibc-ldd-x86_64.patch                 \
+   gnu/packages/patches/glibc-locales.patch                    \
 -  gnu/packages/patches/glibc-mips-dangling-vfork-ref.patch    \
    gnu/packages/patches/gmp-arm-asm-nothumb.patch              \
    gnu/packages/patches/gnunet-fix-scheduler.patch             \
    gnu/packages/patches/gnunet-fix-tests.patch                 \
diff --cc gnu/packages/base.scm
index 2de9bc2,554e848..ca440c2
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@@ -503,6 -521,40 +504,41 @@@ with the Linux kernel."
     (license lgpl2.0+)
     (home-page "http://www.gnu.org/software/libc/";)))
  
+ (define-public glibc-locales
+   (package
+     (inherit glibc)
+     (name "glibc-locales")
+     (source (origin (inherit (package-source glibc))
+                     (patches (cons (search-patch "glibc-locales.patch")
+                                    (origin-patches (package-source glibc))))))
+     (synopsis "All the locales supported by the GNU C Library")
+     (description
+      "This package provides all the locales supported by the GNU C Library,
+ more than 400 in total.  To use them set the 'LOCPATH' environment variable to
+ the 'share/locale' sub-directory of this package.")
+     (outputs '("out"))                            ;110+ MiB
++    (native-search-paths '())
+     (arguments
+      (let ((args `(#:tests? #f #:strip-binaries? #f
+                    ,@(package-arguments glibc))))
+        (substitute-keyword-arguments args
+          ((#:phases phases)
+           `(alist-replace
+             'build
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out")))
+                 ;; Delete $out/bin, which contains 'bash'.
+                 (delete-file-recursively (string-append out "/bin")))
+ 
+               (zero? (system* "make" "localedata/install-locales"
+                               "-j" (number->string (parallel-job-count)))))
+             (alist-delete 'install ,phases)))
+          ((#:configure-flags flags)
+           `(append ,flags
+                    (list (string-append "libc_cv_localedir="
+                                         (assoc-ref %outputs "out")
+                                         "/share/locale")))))))))
+ 
  (define-public tzdata
    (package
      (name "tzdata")