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
gnu: libgcrypt: Update to 1.5.2. * gnu/packages/gnupg.scm (libgcrypt): Update to 1.5.2.
gnu: dejagnu: Update to 1.5.1. * gnu/packages/dejagnu.scm (dejagnu): Update to 1.5.1.
gnu: nano: Update to 2.3.2. * gnu/packages/nano.scm (nano): Update to 2.3.2.
gnu: ed: Update to 1.8. * gnu/packages/ed.scm (ed): Update to 1.8.
gnu: wdiff: Update to 1.2.1. * gnu/packages/wdiff.scm (wdiff): Update to 1.2.1. Add Texinfo as an input.
gnu: nettle: Update to 2.7. * gnu/packages/nettle.scm (nettle): Update to 2.7.
gnu: libtasn1: Update to 3.3. * gnu/packages/gnutls.scm (libtasn1): Update to 3.3.
gnu: hop: Update hash to match hop-2.4.0.tar.gz, which was modified in place. * gnu/packages/scheme.scm (hop): Update the hash.
gnu: xorriso: Update to 1.2.8. * gnu/packages/cdrom.scm (xorriso): Update to 1.2.8.
gnu: smalltalk: Update to 3.2.5. * gnu/packages/smalltalk.scm (smalltalk): Update to 3.2.5.
gnu: groff: Update to 1.22.2. * gnu/packages/groff.scm (groff): Update to 1.22.2.
gnu: gprolog: Update to 1.4.3 and download from GNU mirrors * gnu/packages/gprolog.scm (gprolog): Update to 1.4.3. Download from GNU mirrors.
gnu: intltool: Fix typo. * gnu/packages/glib.scm (intltool): Fix typo.
gnu: guile: Update to 2.0.9. * gnu/packages/guile.scm (guile-2.0): Update to 2.0.9. (guile-2.0/fixed): Keep at 2.0.7.
gnu: intltool: Propagate gettext. * gnu/packages/glib.scm (intltool): Propagate gettext.
ui: Add a 'define-diagnostic' macro. * guix/ui.scm (define-diagnostic): New macro, which is based on the previous version of 'warning'. (warning, leave): Redefine using 'define-diagnostic'. (report-error): New macro. (install-locale): Use 'warning' instead of 'format'. (call-with-error-handling): Adjust 'leave'. * gnu/packages.scm (package-files): Use 'warning' instead of 'format'. * guix/gnu-maintenance.scm (http-fetch): Use 'warning' and 'leave'. * guix/scripts/build.scm (derivations-from-package-expressions, guix-build): Adjust 'leave'. * guix/scripts/download.scm (guix-download): Adjust 'leave'. * guix/scripts/gc.scm (size->number, %options): Adjust 'leave'. * guix/scripts/package.scm (roll-back, guix-package): Adjust 'leave'. * po/POTFILES.in: Add 'guix/gnu-maintenance.scm'.
gnu: Add GCC 4.8.0 and Binutils 2.23.2. * gnu/packages/base.scm (binutils-2.23, ld-wrapper-2.23, gcc-4.8): New variables.
gnu: gdbm, nano: Synchronize synopses. * gnu/packages/gdbm.scm, gnu/packages/nano.scm: Synchronize synopses with the Womb.
gnu: Unify the two intltool packages. * gnu/packages/xml.scm (intltool): Delete variable. * gnu/packages/glib.scm (intltool): Update to version 0.50.2.