* guix/monads.scm (package-file): Add #:target keyword parameter and
  honor it.
  (package->cross-derivation): New procedure.
* tests/monads.scm ("package-file + package->cross-derivation"): New test.
* doc/guix.texi (The Store Monad): Update 'package-file' documentation.
  Add 'package->cross-derivation'.

* gnu/packages/lightning.scm (lightning): Update to 2.0.5.

* gnu/packages/guile.scm (guile-json): Update to 0.4.0.

* gnu/packages/apr.scm (apr): Disable parallel tests.

* gnu/packages/apr.scm (apr-util): Update to 1.5.3.

* gnu/packages/apr.scm (apr): Update to 1.5.1.

* gnu/packages/patches/texi2html-i18n.patch: New patch.
* gnu/packages/texinfo.scm (texi2html)[source]: Use it.
* gnu-system.am (dist_patch_DATA): Add it.

* gnu/packages/version-control.scm (subversion): Update to 1.7.18.

* guix/monad-repl.scm: New file.
* guix.scm: Add it.
* Makefile.am (MODULES): Add it.
* doc/guix.texi (The Store Monad): Document it.

* guix/build/linux-initrd.scm (configure-qemu-networking): Don't create
  /etc/resolv.conf.

* gnu/system/linux-initrd.scm (base-initrd)[virtio-9p-modules]: Add
  "fscache.ko", required by Linux-libre 3.16.

* gnu/packages/emacs.scm (emacs-wget): Improve synopsis.
* gnu/packages/mail.scm (fetchmail): Fix typo in synopsis.

* doc/guix.texi (Invoking guix-daemon): Fix mention of default log location.

* gnu/packages/emacs.scm (emacs-wget): New variable.

* gnu/packages/emacs.scm (emacs-w3m): New variable.

* gnu/packages/emacs.scm (paredit): New variable.

* gnu/packages/emacs.scm (magit): New variable.

* guix/build/emacs-utils.scm: New file.
* Makefile.am (MODULES): Add it.
* .dir-locals.el: Add indentation rules.

* gnu/packages/linux.scm (linux-libre): Update to version 3.16.1.

* gnu/packages/apl.scm (apl): Update to 1.4.  Add 'sqlite' as an input.
  Pass --with-sqlite3 to configure.

* gnu/packages/mysql.scm (mysql): Update to 5.1.73.  Update source URI.

* gnu/packages/gnupg.scm (gpgme): Update to 1.5.1.  Pass "GPG=gpg2"
  to 'make'.

* gnu/packages/linux.scm (lvm2): New variable.
* gnu/packages/lvm.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove it.
* gnu/packages/cryptsetup.scm: Adjust accordingly.

* gnu/system/grub.scm (<grub-configuration>)[default-entry]: Change the
  default to 0.

* gnu/packages/gnupg.scm (gnupg): Update to 2.0.26.

* gnu/packages/fonts.scm (terminus-font): New variable.

* guix/download.scm (%mirrors): Remove ftp.sunet.se URIs.

Reported by Andreas Enge.

* guix/profiles.scm (sexp->manifest): Adjust to handle unintended format
  change introduced in 4ca0b410.

Reported by Alex Kost <alezost@gmail.com>.

* guix/scripts/package.scm (guix-package)[process-actions]: Remove
  'same-package?'.

* gnu/packages/admin.scm (detox): New variable.

* guix/scripts/package.scm (guix-package)[process-actions]: Use
  'manifest-add' instead of the equivalent code.

* guix/profiles.scm (manifest-add): New procedure.
* tests/profiles.scm (guile-1.8.8): New variable.
  ("manifest-add"): New test.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

This reverts commit 648453e8.

See <http://lists.gnu.org/archive/html/bug-gettext/2014-08/msg00005.html>
for the rationale.

Partly fixes <http://bugs.gnu.org/18247>.

* gnu/packages/texinfo.scm (texi2html)[source]: Add 'snippet' field.

* gnu/packages/orpheus.scm: New file.
* gnu/packages/patches/orpheus-cast-errors-and-includes.patch: New patch.
* gnu-system.am (GNU_SYSTEM_MODULES): Add file.
  (dist_patch_DATA): Add patch.

* gnu/packages/emacs.scm (emacs-no-x-toolkit): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

* gnu/system.scm (union): Remove.
  (operating-system-profile): Use 'profile-derivation' and related
  procedures instead of 'union'.

* gnu/packages/texinfo.scm (texi2html): New variable.
* gnu/packages/patches/texi2html-document-encoding.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.

Suggested by Alex Kost <alezost@gmail.com>.

* guix/scripts/package.scm (options->installable)[deduplicate]: Remove.
  [packages-to-upgrade]: Remove unused variable 'newest'.
  (roll-back): Remove unused variable 'manifest'.
  (guix-package): Remove unused variables 'guile-missing?', 'verbose?',
  and 'packages'.