Merge branch 'master' into core-updates

Conflicts:
	Makefile.am
	gnu/packages/autotools.scm
	gnu/packages/guile.scm
	gnu/packages/python.scm
	gnu/packages/shishi.scm
	guix/gnu-maintenance.scm
	guix/scripts/build.scm
	guix/scripts/gc.scm
	guix/scripts/package.scm
	guix/scripts/substitute-binary.scm
	guix/ui.scm
	nix/nix-daemon/guix-daemon.cc
	test-env.in
	tests/nar.scm
	tests/store.scm

diff --cc Makefile.am
Simple merge

diff --cc gnu/packages/autotools.scm
index 114e98f,4af6d2a..3634338
--- 1/gnu/packages/autotools.scm
--- 2/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@@ -149,8 -148,13 +148,17 @@@ exec ~a --no-auto-compile \"$0\" \"$@\
         ("perl" ,perl)
         ("patch/skip-amhello"
          ,(search-patch "automake-skip-amhello-tests.patch"))))
++    (native-search-paths
++     (list (search-path-specification
++            (variable "ACLOCAL_PATH")
++            (directories '("share/aclocal")))))
      (arguments
       '(#:patches (list (assoc-ref %build-inputs "patch/skip-amhello"))
+        #:modules ((guix build gnu-build-system)
+                   (guix build utils)
+                   (srfi srfi-1)
+                   (srfi srfi-26)
+                   (rnrs io ports))
         #:phases (alist-cons-before
                   'patch-source-shebangs 'patch-tests-shebangs
                   (lambda _

diff --cc gnu/packages/base.scm
index 606e59b,3597e6f..fadc246
--- 1/gnu/packages/base.scm
--- 2/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@@ -96,9 -97,9 +97,9 @@@ lines."
                                  ".tar.bz2"))
              (sha256
               (base32
 -              "13wlsb4sf5d5a82xjhxqmdvrrn36rmw5f0pl9qyb9zkvldnb7hra"))))
 +              "1myvrmh99jsvk7v3d7crm0gcrq51hmmm1r2kjyyci152in1x2j7h"))))
     (build-system gnu-build-system)
-    (synopsis "GNU sed, a batch stream editor")
+    (synopsis "Stream editor")
     (arguments
      `(#:phases (alist-cons-before
                  'patch-source-shebangs 'patch-test-suite
@@@ -368,14 -365,9 +365,13 @@@ that it is possible to use Make to buil
                            "LDFLAGS=-static-libgcc"
  
                            ;; Don't search under /usr/lib & co.
 -                          "--with-lib-path=/no-ld-lib-path")))
 +                          "--with-lib-path=/no-ld-lib-path"
 +
 +                          ;; Glibc 2.17 has a "comparison of unsigned
 +                          ;; expression >= 0 is always true" in wchar.h.
 +                          "--disable-werror")))
  
-    (synopsis "GNU Binutils, tools for manipulating binaries (linker,
- assembler, etc.)")
+    (synopsis "Binary utilities: bfd gas gprof ld")
     (description
      "The GNU Binutils are a collection of binary tools.  The main ones are
  `ld' (the GNU linker) and `as' (the GNU assembler).  They also include the

diff --cc gnu/packages/emacs.scm
Simple merge

diff --cc gnu/packages/gcc.scm
index 878d246,a784118..96b82d5
--- 1/gnu/packages/gcc.scm
--- 2/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -131,16 -132,8 +132,16 @@@
                                            "install"))))
                           %standard-phases)))))
  
 +     (native-search-paths
 +      (list (search-path-specification
 +             (variable "CPATH")
 +             (directories '("include")))
 +            (search-path-specification
 +             (variable "LIBRARY_PATH")
 +             (directories '("lib" "lib64")))))
 +
       (properties `((gcc-libc . ,(assoc-ref inputs "libc"))))
-      (synopsis "The GNU Compiler Collection")
+      (synopsis "GNU Compiler Collection")
       (description
        "The GNU Compiler Collection includes compiler front ends for C, C++,
  Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well as

diff --cc gnu/packages/glib.scm
Simple merge

diff --cc gnu/packages/guile.scm
index c74d051,e0896ec..0b50530
--- 1/gnu/packages/guile.scm
--- 2/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -88,12 -88,7 +88,12 @@@
     ;; When cross-compiling, a native version of Guile itself is needed.
     (self-native-input? #t)
  
-    (synopsis "GNU Guile 1.8, an embeddable Scheme interpreter")
 +   (native-search-paths
 +    (list (search-path-specification
 +           (variable "GUILE_LOAD_PATH")
 +           (directories '("share/guile/site")))))
 +
+    (synopsis "Scheme implementation intended especially for extensions")
     (description
  "GNU Guile 1.8 is an interpreter for the Scheme programming language,
  packaged as a library that can be embedded into programs to make them
@@@ -142,15 -137,7 +142,15 @@@ extensible.  It supports many SRFIs."
                         (string-append bash "/bin/bash")))))
                  %standard-phases)))
  
-    (synopsis "GNU Guile 2.0, an embeddable Scheme implementation")
 +   (native-search-paths
 +    (list (search-path-specification
 +           (variable "GUILE_LOAD_PATH")
 +           (directories '("share/guile/site/2.0")))
 +          (search-path-specification
 +           (variable "GUILE_LOAD_COMPILED_PATH")
 +           (directories '("share/guile/site/2.0")))))
 +
+    (synopsis "Scheme implementation intended especially for extensions")
     (description
  "GNU Guile is an implementation of the Scheme programming language, with
  support for many SRFIs, packaged for use in a wide variety of environments.

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/multiprecision.scm
index acff875,a6130dc..19c3235
--- 1/gnu/packages/multiprecision.scm
--- 2/gnu/packages/multiprecision.scm
+++ b/gnu/packages/multiprecision.scm
@@@ -76,11 -79,10 +76,10 @@@ faster algorithms."
              (uri (string-append "mirror://gnu/mpfr/mpfr-" version
                                  ".tar.xz"))
              (sha256 (base32
 -                     "0ym1ylcq803n52qrggxqmkz66gbn8ncc3ybawal31v5y5p1srma9"))))
 +                     "0fs501qi8l523gs3cpy4jjcnvwxggyfbklcys80wq236xx3hz79r"))))
     (build-system gnu-build-system)
     (propagated-inputs `(("gmp" ,gmp)))            ; <mpfr.h> refers to <gmp.h>
-    (synopsis "GNU MPFR, a library for multiple-precision floating-point
- arithmetic")
+    (synopsis "C library for arbitrary precision floating-point arithmetic")
     (description
      "The GNU MPFR library is a C library for multiple-precision
  floating-point computations with correct rounding.  MPFR is based on the GMP

diff --cc gnu/packages/python.scm
index 30bb8e2,8b45159..4dff1b4
--- 1/gnu/packages/python.scm
--- 2/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -68,12 -66,7 +66,11 @@@
         ("gdbm" ,gdbm)
         ("openssl" ,openssl)
         ("readline" ,readline)
-        ("zlib" ,zlib)
-        ("patch-dbm" ,(search-patch "python-fix-dbm.patch"))))
+        ("zlib" ,zlib)))
 +    (native-search-paths
 +     (list (search-path-specification
 +            (variable "PYTHONPATH")
 +            (directories '("lib/python2.7/site-packages")))))
      (home-page "http://python.org")
      (synopsis
       "Python, a high-level dynamically-typed programming language")

diff --cc gnu/packages/wget.scm
index 1f2f53c,0436c0d..4daa2d8
--- 1/gnu/packages/wget.scm
--- 2/gnu/packages/wget.scm
+++ b/gnu/packages/wget.scm
@@@ -43,9 -43,15 +43,8 @@@
       `(("gnutls" ,gnutls)
         ("perl" ,perl)
         ("gettext" ,guix:gettext)))
 -    (arguments
 -     '(#:phases
 -       (alist-cons-before 'build 'patch-/usr/bin/env
 -                          (lambda _
 -                            (for-each patch-shebang
 -                                      '("doc/texi2pod.pl" "tests/run-px")))
 -                          %standard-phases)))
      (home-page "http://www.gnu.org/software/wget/")
-     (synopsis
-      "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP")
+     (synopsis "Non-interactive command-line utility for downloading files")
      (description
       "GNU Wget is a free software package for retrieving files using HTTP,
  HTTPS and FTP, the most widely-used Internet protocols.  It is a

diff --cc guix/download.scm
Simple merge

diff --cc guix/packages.scm
Simple merge

diff --cc tests/packages.scm
Simple merge