build: syscalls: Add pseudo-terminal bindings.

* guix/build/syscalls.scm (openpt, grantpt, unlockpt, ptsname, open-pty-pair, call-with-pty): New procedures.
scripts: Add 'container' subcommand.
2026-07-09 03:14:06 +02:00 · 2015-10-25 20:27:19 -04:00 · 2015-10-25 20:27:19 -04:00 · 2015-10-25 20:27:19 -04:00
618 changed files with 17197 additions and 132121 deletions
@@ -23,7 +23,6 @@
   (eval . (put 'lambda* 'scheme-indent-function 1))
   (eval . (put 'substitute* 'scheme-indent-function 1))
   (eval . (put 'modify-phases 'scheme-indent-function 1))
-   (eval . (put 'modify-services 'scheme-indent-function 1))
   (eval . (put 'with-directory-excursion 'scheme-indent-function 1))
   (eval . (put 'package 'scheme-indent-function 0))
   (eval . (put 'origin 'scheme-indent-function 0))
@@ -1,16 +1,9 @@
-*.eps
-*.go
-*.log
-*.pdf
-*.png
-*.tar.xz
-*.tmp
 *~
 ,*
-/ABOUT-NLS
-/INSTALL
-/aclocal.m4
-/autom4te.cache
+*.tmp
+*.go
+tmp
+*.log
 /build-aux/compile
 /build-aux/config.guess
 /build-aux/config.rpath
@@ -21,41 +14,14 @@
 /build-aux/missing
 /build-aux/test-driver
 /build-aux/texinfo.tex
-/config.status
 /configure
-/doc/*.1
-/doc/.dirstamp
-/doc/guix.aux
-/doc/guix.cp
-/doc/guix.cps
-/doc/guix.fn
-/doc/guix.fns
-/doc/guix.info
-/doc/guix.info-[0-9]
-/doc/guix.ky
-/doc/guix.pg
-/doc/guix.toc
-/doc/guix.tp
-/doc/guix.vr
-/doc/guix.vrs
-/doc/os-config-bare-bones.texi
-/doc/os-config-desktop.texi
-/doc/stamp-vti
-/doc/version.texi
-/emacs/Makefile
-/emacs/Makefile.in
-/emacs/guix-autoloads.el
-/emacs/guix-config.el
-/emacs/guix-helper.scm
-/etc/guix-daemon.conf
-/etc/guix-daemon.service
-/guix-daemon
-/guix-register
-/guix/config.scm
-/libformat.a
-/libstore.a
-/libutil.a
-/m4/*
+Makefile.in
+Makefile
+/autom4te.cache
+config.cache
+/aclocal.m4
+/config.status
+/ABOUT-NLS
 /m4/ChangeLog
 /m4/gettext.m4
 /m4/iconv.m4
@@ -65,20 +31,6 @@
 /m4/nls.m4
 /m4/po.m4
 /m4/progtest.m4
-/nix-setuid-helper
-/nix/AUTHORS
-/nix/COPYING
-/nix/config.h
-/nix/config.h.in
-/nix/nix-daemon/nix-daemon.cc
-/nix/nix-setuid-helper/nix-setuid-helper.cc
-/nix/scripts/guix-authenticate
-/nix/scripts/list-runtime-roots
-/nix/scripts/offload
-/nix/scripts/substitute
-/po/guix/*.gmo
-/po/guix/*.insert-header
-/po/guix/*.mo
 /po/guix/ChangeLog
 /po/guix/Makefile.in.in
 /po/guix/Makevars.template
@@ -87,15 +39,15 @@
 /po/guix/boldquot.sed
 /po/guix/en@boldquot.*
 /po/guix/en@quot.*
-/po/guix/guix.pot
 /po/guix/insert-header.sin
+/po/guix/*.insert-header
 /po/guix/quot.sed
 /po/guix/remove-potcdate.sed
 /po/guix/remove-potcdate.sin
 /po/guix/stamp-po
-/po/packages/*.gmo
-/po/packages/*.insert-header
-/po/packages/*.mo
+/po/guix/guix.pot
+/po/guix/*.mo
+/po/guix/*.gmo
 /po/packages/ChangeLog
 /po/packages/Makefile.in.in
 /po/packages/Makevars.template
@@ -104,23 +56,80 @@
 /po/packages/boldquot.sed
 /po/packages/en@boldquot.*
 /po/packages/en@quot.*
-/po/packages/guix-packages.pot
 /po/packages/insert-header.sin
+/po/packages/*.insert-header
 /po/packages/quot.sed
 /po/packages/remove-potcdate.sed
 /po/packages/remove-potcdate.sin
 /po/packages/stamp-po
-/pre-inst-env
-/scripts/guix
-/test-env
-/test-tmp
+/po/packages/guix-packages.pot
+/po/packages/*.mo
+/po/packages/*.gmo
 /tests/*.trs
+/INSTALL
+/m4/*
+/pre-inst-env
+/doc/.dirstamp
+/doc/guix.info
+/doc/guix.info-[0-9]
+/doc/guix.pdf
+/doc/stamp-vti
+/doc/version.texi
+/gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz
+/gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz
+/gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz
+/gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz
+/guix/config.scm
+/nix/nix-daemon/nix-daemon.cc
+/nix/config.h
+/nix/config.h.in
+stamp-h[0-9]
+/nix/AUTHORS
+/nix/COPYING
+/libformat.a
+/libstore.a
+/libutil.a
+/guix-daemon
+/test-tmp
+/nix/scripts/list-runtime-roots
+/test-env
+/nix/nix-setuid-helper/nix-setuid-helper.cc
+/scripts/guix
+/doc/guix.aux
+/doc/guix.cp
+/doc/guix.cps
+/doc/guix.fn
+/doc/guix.fns
+/doc/guix.ky
+/doc/guix.pg
+/doc/guix.toc
+/doc/guix.tp
+/doc/guix.vr
+/doc/guix.vrs
+/nix/scripts/substitute
+/doc/images/bootstrap-graph.png
+/doc/images/bootstrap-graph.eps
+/guix-register
 GPATH
 GRTAGS
 GTAGS
-Makefile
-Makefile.in
-config.cache
-stamp-h[0-9]
-tmp
-/doc/os-config-lightweight-desktop.texi
+/nix-setuid-helper
+/nix/scripts/guix-authenticate
+/nix/scripts/offload
+/emacs/Makefile.in
+/emacs/Makefile
+/emacs/guix-autoloads.el
+/emacs/guix-helper.scm
+/emacs/guix-config.el
+/doc/os-config-bare-bones.texi
+/doc/os-config-desktop.texi
+/doc/*.1
+/etc/guix-daemon.service
+/doc/images/bootstrap-graph.pdf
+/doc/images/coreutils-bag-graph.png
+/doc/images/coreutils-graph.png
+/doc/images/coreutils-size-map.eps
+/doc/images/service-graph.png
+/doc/images/service-graph.eps
+/doc/images/service-graph.pdf
+/doc/images/dmd-graph.png
@@ -1,20 +1,14 @@
 # This list is used to avoid multiple name/email instances of the same
 # contributors reported by "git log" and "git shortlog" commands.

-Al McElrath <hello@yrns.org> <hello@atonesir.com>
 Alexander I. Grafov <grafov@gmail.com>
-Alírio Eyng <alirioeyng@gmail.com>
 Amirouche Boubekki <amirouche@hypermove.net>
-Andreas Enge <andreas@enge.fr> <andreas.enge@inria.fr>
-Andreas Enge <andreas@enge.fr> <privat@xobs-novena>
 Andy Wingo <wingo@igalia.com> <wingo@pobox.com>
-Ben Woodcroft <donttrustben@gmail.com> <b.woodcroft@uq.edu.au>
-Ben Woodcroft <donttrustben@gmail.com> <donttrustben near gmail.com>
+Ben Woodcroft <b.woodcroft@uq.edu.au> <donttrustben@gmail.com>
 Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
 Cyprien Nicolas <cyprien@nicolas.tf> <c.nicolas+gitorious@gmail.com>
 David Thompson <davet@gnu.org> <dthompson2@worcester.edu>
 David Thompson <davet@gnu.org> <dthompson@member.fsf.org>
-David Thompson <davet@gnu.org> <dthompson@vistahigherlearning.com>
 Deck Pickard <deck.r.pickard@gmail.com> <nebu@kipple>
 Eric Bavier <bavier@member.fsf.org> <ericbavier@gmail.com>
 Eric Dvorsak <eric@dvorsak.fr> <yenda1@gmail.com>
@@ -23,15 +17,11 @@ Joshua Grant <tadni@riseup.net> <gzg@riseup.net>
 Joshua Grant <tadni@riseup.net> <jgrant@parenthetical.io>
 Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com>
 Joshua Grant <tadni@riseup.net> <youlysses@riseup.net>
-Leo Famulari <leo@famulari.name> <lfamular@gmail.com>
 Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr>
-Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org>
-Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
+Mathieu Lirzin <mthl@openmailbox.org> <mathieu.lirzin@openmailbox.org>
 Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
-Nils Gillmann <niasterisk@grrlz.net> <ng@niasterisk.space>
 Pjotr Prins <pjotr.public01@thebird.nl>
 Pjotr Prins <pjotr.public01@thebird.nl> <pjotr.public12@thebird.nl>
-Raimon Grau <raimonster@gmail.com> <raimon@3scale.net>
 Ricardo Wurmus <rekado@elephly.net>
 Ricardo Wurmus <rekado@elephly.net> <ricardo.wurmus@mdc-berlin.de>
 Sou Bunnbu (宋文武) <iyzsong@gmail.com>
@@ -1,48 +0,0 @@
-Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all
-people who contribute through reporting issues, posting feature
-requests, updating documentation, submitting pull requests or patches,
-and other activities.
-
-We are committed to making participation in this project a
-harassment-free experience for everyone, regardless of level of
-experience, gender, gender identity and expression, sexual orientation,
-disability, personal appearance, body size, race, ethnicity, age,
-religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic
-addresses, without explicit permission
-* Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit,
-or reject comments, commits, code, wiki edits, issues, and other
-contributions that are not aligned to this Code of Conduct, or to ban
-temporarily or permanently any contributor for other behaviors that they
-deem inappropriate, threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves
-to fairly and consistently applying these principles to every aspect of
-managing this project. Project maintainers who do not follow or enforce
-the Code of Conduct may be permanently removed from the project team.
-
-This Code of Conduct applies both within project spaces and in public
-spaces when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may
-be reported by contacting a project maintainer at guix-maintainers@gnu.org.
-All complaints will be reviewed and investigated and will
-result in a response that is deemed necessary and appropriate to the
-circumstances. Maintainers are obligated to maintain confidentiality
-with regard to the reporter of an incident.
-
-This Code of Conduct is adapted from the Contributor Covenant
-(http://contributor-covenant.org), version 1.3.0, available at
-http://contributor-covenant.org/version/1/3/0/
@@ -1,9 +1,7 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
 # Copyright © 2015 Alex Kost <alezost@gmail.com>
-# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
-# Copyright © 2016 Mark H Weaver <mhw@netris.org>
 #
 # This file is part of GNU Guix.
 #
@@ -49,14 +47,10 @@ MODULES =					\
  guix/serialization.scm			\
  guix/nar.scm					\
  guix/derivations.scm				\
-  guix/grafts.scm				\
  guix/gnu-maintenance.scm			\
  guix/upstream.scm				\
  guix/licenses.scm				\
-  guix/graph.scm				\
-  guix/cve.scm					\
  guix/build-system.scm				\
-  guix/build-system/ant.scm			\
  guix/build-system/cmake.scm			\
  guix/build-system/emacs.scm			\
  guix/build-system/glib-or-gtk.scm		\
@@ -76,7 +70,6 @@ MODULES =					\
  guix/cvs-download.scm				\
  guix/svn-download.scm				\
  guix/ui.scm					\
-  guix/build/ant-build-system.scm		\
  guix/build/download.scm			\
  guix/build/cmake-build-system.scm		\
  guix/build/emacs-build-system.scm		\
@@ -101,7 +94,6 @@ MODULES =					\
  guix/build/gremlin.scm			\
  guix/build/emacs-utils.scm			\
  guix/build/graft.scm				\
-  guix/build/bournish.scm			\
  guix/search-paths.scm				\
  guix/packages.scm				\
  guix/import/utils.scm				\
@@ -141,19 +133,6 @@ MODULES =					\
  guix.scm					\
  $(GNU_SYSTEM_MODULES)

-if HAVE_GUILE_JSON
-
-MODULES +=					\
-  guix/import/github.scm   			\
-  guix/import/json.scm				\
-  guix/import/pypi.scm				\
-  guix/scripts/import/pypi.scm			\
-  guix/import/cpan.scm				\
-  guix/scripts/import/gem.scm			\
-  guix/import/gem.scm
-
-endif
-
 if BUILD_SYSCALLS_MODULE

 MODULES +=					\
@@ -171,20 +150,20 @@ endif BUILD_DAEMON_OFFLOAD
 # Internal module with test suite support.
 dist_noinst_DATA = guix/tests.scm

+# Because of the autoload hack in (guix build download), we must build it
+# first to avoid errors on systems where (gnutls) is unavailable.
+guix/scripts/download.go: guix/build/download.go
+guix/download.go: guix/build/download.go
+
 # Linux-Libre configurations.
 KCONFIGS =					\
-  gnu/packages/linux-libre-4.5-i686.conf	\
-  gnu/packages/linux-libre-4.5-x86_64.conf	\
-  gnu/packages/linux-libre-4.4-i686.conf	\
-  gnu/packages/linux-libre-4.4-x86_64.conf	\
-  gnu/packages/linux-libre-4.1-i686.conf	\
-  gnu/packages/linux-libre-4.1-x86_64.conf
+  gnu/packages/linux-libre-i686.conf		\
+  gnu/packages/linux-libre-x86_64.conf

 # Templates, examples.
 EXAMPLES =					\
  gnu/system/examples/bare-bones.tmpl		\
-  gnu/system/examples/desktop.tmpl		\
-  gnu/system/examples/lightweight-desktop.tmpl
+  gnu/system/examples/desktop.tmpl

 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go

@@ -210,11 +189,6 @@ clean-go:
 	-$(RM) -f $(GOBJECTS)


-# Test extensions; has to be unconditional.
-TEST_EXTENSIONS = .scm .sh
-
-if CAN_RUN_TESTS
-
 SCM_TESTS =					\
  tests/base32.scm				\
  tests/base64.scm				\
@@ -223,14 +197,11 @@ SCM_TESTS =					\
  tests/pk-crypto.scm				\
  tests/pki.scm					\
  tests/sets.scm				\
-  tests/gnu-maintenance.scm			\
  tests/substitute.scm				\
  tests/builders.scm				\
  tests/derivations.scm				\
-  tests/grafts.scm				\
  tests/ui.scm					\
  tests/records.scm				\
-  tests/upstream.scm				\
  tests/utils.scm				\
  tests/build-utils.scm				\
  tests/packages.scm				\
@@ -252,16 +223,20 @@ SCM_TESTS =					\
  tests/size.scm				\
  tests/graph.scm				\
  tests/challenge.scm				\
-  tests/cve.scm					\
  tests/file-systems.scm			\
-  tests/system.scm				\
  tests/services.scm				\
-  tests/scripts-build.scm			\
-  tests/containers.scm				\
-  tests/import-utils.scm
+  tests/containers.scm

 if HAVE_GUILE_JSON

+MODULES +=					\
+  guix/import/json.scm				\
+  guix/import/pypi.scm				\
+  guix/scripts/import/pypi.scm			\
+  guix/import/cpan.scm				\
+  guix/scripts/import/gem.scm			\
+  guix/import/gem.scm
+
 SCM_TESTS += 					\
  tests/pypi.scm				\
  tests/cpan.scm				\
@@ -293,6 +268,8 @@ endif BUILD_DAEMON

 TESTS = $(SCM_TESTS) $(SH_TESTS)

+TEST_EXTENSIONS = .scm .sh
+
 AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)"

 SCM_LOG_COMPILER = $(top_builddir)/test-env $(GUILE)
@@ -308,22 +285,6 @@ tests/guix-gc.log:							\
  $(patsubst %.sh,%.log,$(filter-out tests/guix-gc.sh,$(SH_TESTS)))	\
  $(SCM_TESTS:%.scm=%.log)

-else !CAN_RUN_TESTS
-
-TESTS =
-SH_TESTS =
-SCM_TESTS =
-
-# Automake always generates a 'check' target, so better not override it.
-check-local:
-	@echo
-	@echo "Cannot run tests because file name limits would be exceeded." >&2
-	@echo "Look for 'length' in the 'config.log' file for details." >&2
-	@echo
-	@exit 1
-
-endif !CAN_RUN_TESTS
-
 # Public key used to sign substitutes from hydra.gnu.org.
 dist_pkgdata_DATA = hydra.gnu.org.pub

@@ -334,10 +295,8 @@ EXTRA_DIST =						\
  HACKING						\
  ROADMAP						\
  TODO							\
-  CODE-OF-CONDUCT					\
  .dir-locals.el					\
  build-aux/build-self.scm				\
-  build-aux/compile-all.scm				\
  build-aux/hydra/gnu-system.scm			\
  build-aux/hydra/demo-os.scm				\
  build-aux/hydra/guix.scm				\
@@ -352,7 +311,6 @@ EXTRA_DIST =						\
  tests/test.drv					\
  tests/signing-key.pub					\
  tests/signing-key.sec					\
-  tests/cve-sample.xml					\
  build-aux/config.rpath				\
  bootstrap						\
  release.nix						\
@@ -377,21 +335,28 @@ CLEANFILES =					\
  $(GOBJECTS)					\
  $(SCM_TESTS:tests/%.scm=%.log)

+AM_V_GUILEC = $(AM_V_GUILEC_$(V))
+AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
+AM_V_GUILEC_0 = @echo "  GUILEC" $@;
+
 # Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling.  Otherwise, if
 # $GUILE_LOAD_COMPILED_PATH contains $(moduledir), we may find .go files in
 # there that are newer than the local .scm files (for instance because the
 # user ran 'make install' recently).  When that happens, we end up loading
 # those previously-installed .go files, which may be stale, thereby breaking
 # the whole thing.
-%.go: make-go ; @:
-make-go: $(MODULES) guix/config.scm guix/tests.scm
-	$(AM_V_at)echo "Compiling Scheme modules..." ;			\
+#
+# XXX: Use the C locale for when Guile lacks
+# <http://git.sv.gnu.org/cgit/guile.git/commit/?h=stable-2.0&id=e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f>.
+.scm.go:
+	$(AM_V_GUILEC)$(MKDIR_P) `dirname "$@"` ;			\
 	unset GUILE_LOAD_COMPILED_PATH ;				\
-	host=$(host) srcdir="$(top_srcdir)"				\
+	LC_ALL=C							\
 	$(top_builddir)/pre-inst-env					\
-	$(GUILE) -L "$(top_builddir)" -L "$(top_srcdir)"		\
-	  --no-auto-compile 						\
-	  -s "$(top_srcdir)"/build-aux/compile-all.scm $^
+	$(GUILD) compile -L "$(top_builddir)" -L "$(top_srcdir)"	\
+	  -Wformat -Wunbound-variable -Warity-mismatch			\
+	  --target="$(host)"						\
+	  -o "$@" "$<"

 SUFFIXES = .go

@@ -422,11 +387,7 @@ include daemon.am
 endif BUILD_DAEMON

 ACLOCAL_AMFLAGS = -I m4
-
-# Pass an explicit '--localstatedir' so that configure does not error out if
-# it finds an existing installation with a different localstatedir.
 AM_DISTCHECK_CONFIGURE_FLAGS =			\
-  --localstatedir="$$dc_install_base/var"	\
  --with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)"	\
  --with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)"	\
  --with-nix-prefix="$(NIX_PREFIX)"		\
@@ -438,7 +399,7 @@ include emacs.am

 # The self-contained tarball.
 guix-binary.%.tar.xz:
-	$(AM_V_GEN)GUIX_PACKAGE_PATH= \
+	-GUIX_PACKAGE_PATH= \
 	$(top_builddir)/pre-inst-env "$(GUILE)"			\
 	  "$(top_srcdir)/build-aux/make-binary-tarball.scm" "$*" "$@"

@@ -449,11 +410,11 @@ dist-hook: assert-no-store-file-names
 distcheck-hook: assert-binaries-available assert-final-inputs-self-contained

 sync-descriptions:
-	$(AM_V_at)GUIX_PACKAGE_PATH= \
+	-GUIX_PACKAGE_PATH= \
 	 $(top_builddir)/pre-inst-env guix lint --checkers=gnu-description

 gen-ChangeLog:
-	$(AM_V_GEN)if test -d .git; then		\
+	if test -d .git; then				\
 	  $(top_srcdir)/build-aux/gitlog-to-changelog	\
 	    > $(distdir)/cl-t;				\
 	  rm -f $(distdir)/ChangeLog;			\
@@ -461,7 +422,7 @@ gen-ChangeLog:
 	fi

 gen-AUTHORS:
-	$(AM_V_GEN)if test -d .git; then			\
+	if test -d .git; then					\
 	  rm -f "$(distdir)/AUTHORS";				\
 	  $(top_builddir)/pre-inst-env "$(GUILE)"		\
 	    "$(top_srcdir)/build-aux/generate-authors.scm"	\
@@ -470,7 +431,7 @@ gen-AUTHORS:

 # Make sure we're not shipping a file that embeds a local /gnu/store file name.
 assert-no-store-file-names:
-	$(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info			\
+	if grep -r --exclude=*.texi --exclude=*.info				\
 	     "$(storedir)/[a-z0-9]{32}-" $(distdir) ;				\
 	then									\
 	  echo "error: store file names embedded in the distribution" >&2 ;	\
@@ -479,34 +440,14 @@ assert-no-store-file-names:

 # Make sure hydra.gnu.org has the important binaries.
 assert-binaries-available:
-	$(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)"			\
+	$(top_builddir)/pre-inst-env "$(GUILE)"				\
 	  "$(top_srcdir)/build-aux/check-available-binaries.scm"

 # Make sure the final inputs don't refer to bootstrap tools.
 assert-final-inputs-self-contained:
-	$(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)"			\
+	$(top_builddir)/pre-inst-env "$(GUILE)"				\
 	  "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm"

-.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go
+.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go
 .PHONY: assert-no-store-file-names assert-binaries-available
 .PHONY: assert-final-inputs-self-contained
-
-## -------------- ##
-## Silent rules.  ##
-## -------------- ##
-
-AM_V_DL = $(AM_V_DL_$(V))
-AM_V_DL_ = $(AM_V_DL_$(AM_DEFAULT_VERBOSITY))
-AM_V_DL_0 = @echo "  DL      " $@;
-
-AM_V_DOT = $(AM_V_DOT_$(V))
-AM_V_DOT_ = $(AM_V_DOT_$(AM_DEFAULT_VERBOSITY))
-AM_V_DOT_0 = @echo "  DOT     " $@;
-
-AM_V_EMACS = $(AM_V_EMACS_$(V))
-AM_V_EMACS_ = $(AM_V_EMACS_$(AM_DEFAULT_VERBOSITY))
-AM_V_EMACS_0 = @echo "  EMACS   " $@;
-
-AM_V_HELP2MAN = $(AM_V_HELP2MAN_$(V))
-AM_V_HELP2MAN_ = $(AM_V_HELP2MAN_$(AM_DEFAULT_VERBOSITY))
-AM_V_HELP2MAN_0 = @echo "  HELP2MAN" $@;
@@ -2,7 +2,7 @@
 #+TITLE: Guix NEWS – history of user-visible changes
 #+STARTUP: content hidestars

-Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>

  Copying and distribution of this file, with or without modification,
  are permitted in any medium without royalty provided the copyright
@@ -10,709 +10,6 @@ Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>

 Please send Guix bug reports to bug-guix@gnu.org.

-* Changes in 0.10.0 (since 0.9.0)
-
-** Community
-
-GNU Guix adopted a contributor code of conduct, see ‘CODE-OF-CONDUCT’ in the
-source tree.
-
-** Package management
-
-*** New command-line syntax for separating package names and version numbers
-
-Use ‘@’ instead of ‘-’ as a separator, as in ‘gnupg@2.0’.  This new separator
-is a reserved character which is not allowed both in package names and version
-numbers.
-
-The old syntax to specify a package’s version—e.g., as “gnupg-2.0”—is obsolete
-and support for it will be removed in the future.
-
-*** “Grafts” apply recursively, based on run-time dependencies
-
-“Grafts” is the mechanism by which we can apply security updates of core
-packages without rebuilding or re-downloading the entire set of dependent
-packages.  See “Security Updates” in the manual, as well as
-<https://savannah.gnu.org/forum/forum.php?forum_id=8470> and
-<http://bugs.gnu.org/22139> for more info.
-
-*** Substitutes are fetched over HTTPS by default
-*** Substitutes are cached for the duration reported in ‘Cache-Control’ headers
-*** Default substitute URL list includes a faster mirror, mirror.hydra.gnu.org
-*** New ‘--with-input’ and ‘--with-source’ for ‘guix package’ and ‘guix build’
-
-See “Package Transformation Options” in the manual.
-
-*** ‘guix package --search-paths -p X -p Y’ combines search paths for X and Y
-*** ‘guix package’ can be passed several ‘--search’ options
-*** New ‘--rounds’ and ‘--check’ for ‘guix build’, for bit-reproducibility
-*** New ‘--rounds’ option for ‘guix-daemon’
-*** New ‘--quiet’ option for ‘guix build’
-*** ‘guix package -u’ no longer checks for upstream GNU releases
-*** ‘guix-daemon’ always uses /tmp in chroots, regardless of $TMPDIR
-*** New Emacs interface to browse licenses: M-x guix-licenses
-*** New Emacs interface to list system generations: M-x guix-system-generations
-*** New Emacs interface for hydra.gnu.org: M-x guix-hydra-…
-*** Changes in Emacs interface variables and faces
-
-In the following names, BUFFER-TYPE means "info" or "list";
-ENTRY-TYPE means "package", "output" or "generation".
-
-**** Removed
-
- guix-info-fill-column
- guix-info-insert-ENTRY-TYPE-function
-
-**** Renamed
-
- guix-info-ignore-empty-vals -> guix-info-ignore-empty-values
- guix-output-name-width -> guix-generation-output-name-width
- guix-buffer-name-function -> guix-ui-buffer-name-function
- guix-update-after-operation -> guix-ui-update-after-operation
- guix-search-params -> guix-package-search-params
- guix-BUFFER-TYPE-file-path (face) -> guix-BUFFER-TYPE-file-name
-
-**** Replaced
-
- guix-list-column-format, guix-list-column-value-methods ->
-  guix-ENTRY-TYPE-list-format
- guix-info-displayed-params, guix-info-insert-methods,
-  guix-package-info-heading-params -> guix-ENTRY-TYPE-info-format
- guix-param-titles, guix-list-column-titles ->
-  guix-ENTRY-TYPE-BUFFER-TYPE-titles
- guix-list-describe-warning-count ->
-  guix-ENTRY-TYPE-list-describe-warning-count
- guix-package-info-fill-heading -> guix-info-fill
-
-*** New ‘cve’ linter: ‘guix lint -c cve’ reports pending vulnerabilities
-*** New ‘gnome’, ‘xorg’, and ‘github’ updaters for ‘guix refresh’
-*** ‘guix lint’ times out after 3 seconds when probing URLs
-*** ‘guix graph -t bag-with-origins’ includes origins in the graph
-*** ‘guix import cran’ can import packages from bioconductor.org
-
-** Distribution
-
-*** GuixSD upgraded to GNU Shepherd 0.3.1 and GNU Linux-libre 4.5.0
-
-See <http://git.savannah.gnu.org/cgit/shepherd.git/tree/NEWS?id=v0.3.1> for
-information on the changes between GNU dmd 0.2 and the GNU Shepherd 0.3.1.
-
-*** “System Installation” section of the manual has been expounded
-*** Installation image runs GPM and includes more programs
-*** GNOME and Xfce desktops are available via services; see "Desktop Services"
-*** New ‘tor-hidden-service’ procedure, to declare Tor hidden services
-*** New Dovecot service
-*** New ‘fstab-service-type’, to populate /etc/fstab
-*** New ‘mount?’ field for ‘file-system’ forms
-*** Most global environment variables are now set in /etc/environment (pam_env)
-*** ‘guix system reconfigure’ now loads/starts new services, stops old ones
-    (see <http://bugs.gnu.org/22039>)
-*** ‘local-file’ resolves file names relative to the current source file
-*** Many reproducibility issues fixed: glibc, perl, bison, emacs-*, python-*, …
-*** Initial RAM disk supports ‘modprobe.blacklist’ on the kernel command line
-*** New “Running GuixSD in a VM” section in the manual
-*** ‘dmd’ changed to ’shepherd’ in ‘guix system’ sub-commands
-*** A Bourne-like shell is spawned upon ‘fsck’ failure
-    (see <http://bugs.gnu.org/22588>)
-*** 639 new packages
-
-aide, allegro, amb-plugins, aria2, armadillo, armadillo, artanis, aseprite,
-aspell-dict-it, aspell-dict-nl, assword, asymptote, audit, augeas, autojump,
-awscli, baobab, beets, bioawk, blender, bless, borg, bristol, btrfs-progs,
-bwa-pssm, byzanz, c-ares, caribou, cd-hit, cereal, cmocka, codingquarry,
-colord-gtk, cppcheck, cpulimit, cracklib, crossguid, cuetools, cufflinks,
-dcadec, dconf-editor, desmume, devil, dialog, docker-compose, drumstick,
-einstein, emacs-async, emacs-constants, emacs-god-mode, emacs-mit-scheme-doc,
-emacs-popup, emacs-scheme-complete, emacs-slime, emacs-undo-tree,
-emacs-with-editor, emulation-station, etl, evolution-data-server, eyed3, fdm,
-fil-plugins, findnewest, fluxbox, font-abattis-cantarell, font-google-noto,
-font-un, fraggenescan, freefall, fritzing, fxtract, g-wrap, g2reverb,
-gdk-pixbuf+svg, gdm, gdsl, gedit, ghc-aeson-qq, ghc-asn1-encoding,
-ghc-asn1-parse, ghc-asn1-types, ghc-byteable, ghc-chasingbottoms, ghc-cmark,
-ghc-conduit, ghc-connection, ghc-cryptonite, ghc-deepseq-generics, ghc-diff,
-ghc-enclosed-exceptions, ghc-executable-path, ghc-filemanip,
-ghc-haskell-src-meta, ghc-highlighting-kate, ghc-hostname, ghc-hourglass,
-ghc-hslua, ghc-hspec-contrib, ghc-http-client, ghc-http-client-tls,
-ghc-juicypixels, ghc-libxml, ghc-logging-facade, ghc-memory, ghc-mime-types,
-ghc-mmap, ghc-mockery, ghc-packedstring, ghc-pandoc, ghc-pandoc-types,
-ghc-pem, ghc-regex-pcre-builtin, ghc-sha, ghc-socks, ghc-tasty-kat,
-ghc-test-framework, ghc-test-framework-hunit, ghc-test-framework-quickcheck2,
-ghc-texmath, ghc-th-expand-syns, ghc-th-lift, ghc-th-orphans,
-ghc-th-reify-many, ghc-tls, ghc-x509, ghc-x509-store, ghc-x509-system,
-ghc-x509-validation, ghc-yaml, git-annex-remote-hubic, gjs, gnome,
-gnome-backgrounds, gnome-bluetooth, gnome-control-center,
-gnome-online-accounts, gnome-screenshot, gnome-session, gnome-shell,
-gnunet-gtk, gpm, graphicsmagick, gst-plugins-bad, gtk-engines, gtk-vnc,
-gtklick, guile-config, guile-gnunet, guile-irregex, guile-sly, gumbo-parser,
-icedtea, icedtea, idle3-tools, iftop, info-reader, inklingreader, jasper,
-jellyfish, jpegoptim, khal, khard, kodi, kyotocabinet, lcov, ldb, ldc, ledger,
-letsencrypt, libbigwig, libcanberra-gtk2, libconfig, libgit2, libgtop,
-liblangtag, libmateweather, libmbim, libotf, libpwquality, libqmi, libvdpau,
-libxml++, lispf4, love, mate-desktop, mate-icon-theme, mate-menus,
-mate-themes, mcp-plugins, microscheme, mlt, modem-manager, munge,
-mupen64plus-audio-sdl, mupen64plus-core, mupen64plus-input-sdl,
-mupen64plus-rsp-hle, mupen64plus-rsp-z64, mupen64plus-ui-console,
-mupen64plus-video-arachnoid, mupen64plus-video-glide64,
-mupen64plus-video-glide64mk2, mupen64plus-video-rice, mupen64plus-video-z64,
-murrine, mutter, myrepos, nagios, nautilus, network-manager,
-network-manager-applet, nload, notmuch-addrlookup-c, nqc, obs, ocaml-findlib,
-owncloud-client, password-store, pepr, perl-cgi, perl-dbd-mysql,
-perl-file-slurp-tiny, perl-html-template, perl-log-report,
-perl-log-report-optional, perl-mime-charset, perl-module-pluggable,
-perl-shell-command, perl-string-print, perl-text-neattemplate,
-perl-unicode-linebreak, perl-xml-compile, perl-xml-compile-cache,
-perl-xml-compile-soap, perl-xml-compile-tester, perl-xml-compile-wsdl11,
-perl-xml-libxml-simple, pfff, pianobar, pinball, pioneers, pixz, powwow, ppp,
-procmail, pyicoteo, python-acme, python-alembic, python-amqp, python-anyjson,
-python-apipkg, python-args, python-astor, python-atomicwrites,
-python-backports-abc, python-beautifulsoup4, python-billiard, python-botocore,
-python-celery, python-click-log, python-click-threading, python-clint,
-python-colorama, python-configargparse, python-configobj, python-contextlib2,
-python-cookies, python-docker-py, python-dockerpty, python-docopt,
-python-editor, python-efl, python-execnet, python-flask, python-futures,
-python-gst, python-hy, python-hypothesis, python-icalendar, python-jellyfish,
-python-jmespath, python-keystoneclient, python-kombu, python-mako,
-python-markdown, python-minimal-wrapper, python-mpd2, python-munkres,
-python-musicbrainzngs, python-mutagen, python-ndg-httpsclient, python-paste,
-python-pastedeploy, python-pastescript, python-pathlib, python-pluggy,
-python-psycopg2, python-pyasn1-modules, python-pybigwig, python-pyechonest,
-python-pygpgme, python-pyicu, python-pylast, python-pyliblo, python-pyquery,
-python-pyrfc3339, python-pystache, python-pytest-cache, python-pytest-cov,
-python-pytest-localserver, python-pytest-subtesthack, python-pytest-xdist,
-python-pytest-xprocess, python-rarfile, python-rauth,
-python-requests-toolbelt, python-responses, python-rply, python-rsa,
-python-sphinx-repoze-autointerface, python-sphinxcontrib-newsfeed,
-python-sphinxcontrib-programoutput, python-swiftclient, python-texttable,
-python-tox, python-translitcodec, python-urllib3, python-vcversioner,
-python-vobject, python-waitress, python-websocket-client, python-webtest,
-python-werkzeug, python-wheel, python-wsgi-intercept, python-wsgiproxy2,
-python-wtforms, python-zope-component, python-zope-configuration,
-python-zope-event, python-zope-exceptions, python-zope-i18nmessageid,
-python-zope-interface, python-zope-location, python-zope-proxy,
-python-zope-schema, python-zope-security, python-zope-testing,
-python-zope-testrunner, python2-acme, python2-alembic, python2-amqp,
-python2-anyjson, python2-apipkg, python2-args, python2-astor,
-python2-atomicwrites, python2-backports-abc, python2-beautifulsoup4,
-python2-billiard, python2-botocore, python2-celery, python2-clint,
-python2-colorama, python2-configargparse, python2-configobj,
-python2-contextlib2, python2-cookies, python2-docopt, python2-editor,
-python2-efl, python2-enum34, python2-execnet, python2-flask,
-python2-functools32, python2-futures, python2-gst, python2-hy,
-python2-hypothesis, python2-jellyfish, python2-jmespath,
-python2-keystoneclient, python2-kombu, python2-mako, python2-markdown,
-python2-mpd2, python2-munkres, python2-musicbrainzngs, python2-mutagen,
-python2-ndg-httpsclient, python2-parsedatetime, python2-paste,
-python2-pastedeploy, python2-pastescript, python2-pathlib, python2-pluggy,
-python2-psycopg2, python2-pyasn1-modules, python2-pybigwig,
-python2-pyechonest, python2-pygpgme, python2-pylast, python2-pyliblo,
-python2-pyquery, python2-pyrfc3339, python2-pystache, python2-pytest-cov,
-python2-pytest-subtesthack, python2-pytest-xdist, python2-pythondialog,
-python2-rarfile, python2-rauth, python2-responses, python2-rply, python2-rsa,
-python2-sphinx-repoze-autointerface, python2-sphinxcontrib-programoutput,
-python2-swiftclient, python2-texttable, python2-tox, python2-translitcodec,
-python2-unicodecsv, python2-urllib3, python2-vcversioner, python2-vobject,
-python2-waitress, python2-websocket-client, python2-webtest, python2-werkzeug,
-python2-wheel, python2-wsgiproxy2, python2-wtforms, python2-xdo,
-python2-zope-component, python2-zope-configuration, python2-zope-event,
-python2-zope-exceptions, python2-zope-i18nmessageid, python2-zope-interface,
-python2-zope-location, python2-zope-proxy, python2-zope-schema,
-python2-zope-security, python2-zope-testing, python2-zope-testrunner, qca,
-qemu-minimal, qtkeychain, qtractor, quassel, r-acsnminer, r-adaptivesparsity,
-r-annotationdbi, r-base64enc, r-biobase, r-biocgenerics, r-biocparallel,
-r-biomart, r-biostrings, r-bitops, r-brew, r-bsgenome, r-catools, r-curl,
-r-data-table, r-devtools, r-dnacopy, r-doparallel, r-dt, r-foreach,
-r-futile-logger, r-futile-options, r-genomation, r-genomeinfodb,
-r-genomicalignments, r-genomicfeatures, r-genomicranges, r-git2r, r-go-db,
-r-graph, r-gridbase, r-gridextra, r-httr, r-impute, r-iranges, r-iterators,
-r-lambda-r, r-lattice, r-matrixstats, r-org-ce-eg-db, r-org-dm-eg-db,
-r-org-hs-eg-db, r-org-mm-eg-db, r-plotly, r-plotrix, r-r-cache, r-r-methodss3,
-r-r-oo, r-r-rsp, r-r-utils, r-rcpparmadillo, r-rcurl, r-readr, r-rmarkdown,
-r-roxygen2, r-rsamtools, r-rsqlite, r-rstudioapi, r-rtracklayer, r-rversions,
-r-s4vectors, r-seqpattern, r-snow, r-sparsem, r-summarizedexperiment, r-topgo,
-r-viridis, r-whisker, r-xml, r-xml2, r-xvector, radicale, ragel, rakarrack,
-rdmd, redshift, rev-plugins, ruby-ae, ruby-afm, ruby-ansi, ruby-ascii85,
-ruby-atoulme-saikuro, ruby-bio-commandeer, ruby-blankslate, ruby-brass,
-ruby-ci-reporter, ruby-clap, ruby-crass, ruby-cutest, ruby-domain-name,
-ruby-eventmachine, ruby-fivemat, ruby-gem-hadar, ruby-gettext, ruby-guard,
-ruby-hashery, ruby-http-cookie, ruby-instantiator, ruby-introspection,
-ruby-json-pure, ruby-lemon, ruby-locale, ruby-metaclass, ruby-mime-types,
-ruby-mime-types-data, ruby-minitest-bonus-assertions, ruby-minitest-focus,
-ruby-minitest-moar, ruby-minitest-pretty-diff, ruby-minitest-rg,
-ruby-minitest-tu-shim, ruby-mocha, ruby-net-ssh, ruby-netrc,
-ruby-nokogiri-diff, ruby-nokogumbo, ruby-packnga, ruby-power-assert,
-ruby-pry-editline, ruby-pstree, ruby-pygmentize, ruby-qed, ruby-rb-fsevent,
-ruby-rc4, ruby-redcarpet, ruby-redcloth, ruby-rubytest, ruby-rubytest-cli,
-ruby-saikuro-treemap, ruby-sanitize, ruby-sdoc, ruby-shoulda,
-ruby-shoulda-context, ruby-shoulda-matchers, ruby-shoulda-matchers,
-ruby-simplecov, ruby-sqlite3, ruby-systemu, ruby-tdiff, ruby-term-ansicolor,
-ruby-test-unit, ruby-text, ruby-tins, ruby-ttfunk, ruby-turn, ruby-unf,
-ruby-unf-ext, ruby-utils, scribus, sdl2-image, sdl2-mixer, sdl2-ttf, sdparm,
-shepherd, shntool, slurm, smithlab-cpp, snap-aligner, snorenotify, sortmerna,
-sparsehash, ste-plugins, stringtie, synfig, synfigstudio, tcllib, tclxml,
-telepathy-logger, tevent, texlive-minimal, tilda, tinyxml, tlsdate, tophat,
-transmission-remote-cli, ustr, v4l-utils, vco-plugins, vdirsyncer, vdpauinfo,
-vmpk, wah-plugins, wcalc, xaos, xfce4-power-manager, xfce4-xkb-plugin,
-xmlstarlet, yoshimi, zenity
-
-*** 577 package updates
-
-abcde-2.7.1, abduco-0.5, adwaita-icon-theme-3.18.0, aisleriot-3.18.2,
-alsa-modular-synth-2.1.2, alsa-utils-1.1.0, american-fuzzy-lop-1.96b,
-ant-1.9.6, ao-1.2.0, arb-2.8.1, ardour-4.7, aspell-dict-en-2016.01.19-0,
-atkmm-2.24.2, attr-2.4.47, autogen-5.18.7, bash-4.3.42, bash-minimal-4.3.42,
-bash-static-4.3.42, bazaar-2.7.0, bdftopcf-1.0.5, bedtools-2.25.0,
-bind-utils-9.10.3-P4, bitcoin-core-0.11.2, bitlbee-3.4.1, bluez-5.36,
-boost-1.60.0, bowtie-2.2.6, bundler-1.11.2, calibre-2.51.0, catch-1.3.5,
-ccache-3.2.4, chicken-4.10.0, clang-3.6.2, claws-mail-3.13.2, clutter-1.24.2,
-clutter-gst-3.0.14, clutter-gtk-1.6.6, cm-0.3, cogl-1.22.0, colordiff-1.0.16,
-complexity-1.10, cppunit-1.13.2, cups-filters-1.4.0, curl-7.47.0,
-datamash-1.1.0, dconf-0.24.0, ddrescue-1.21, deeptools-2.1.1, devhelp-3.18.1,
-diffoscope-51, docbook-xml-4.3, docbook-xml-4.4, docbook-xml-4.5,
-dovecot-2.2.19, doxygen-1.8.11, dropbear-2016.72, dvdisaster-0.79.5,
-dvtm-0.15, edirect-3.50, efl-1.17.0, eigen-3.2.7, elementary-1.17.0,
-elogind-219.14, emacs-dash-2.12.1, emacs-debbugs-0.9, emacs-pdf-tools-0.70,
-emacs-w3m-1.4.538+0.20141022, emotion-generic-players-1.17.0,
-enlightenment-0.20.6, eog-3.18.1, epiphany-3.18.2,
-evas-generic-loaders-1.17.0, evince-3.18.1, exim-4.86.2,
-extra-cmake-modules-5.19.0, feh-2.14.1, ffmpeg-2.8.6, file-5.25,
-file-roller-3.16.4, findutils-4.6.0, flex-2.6.0,
-font-adobe-source-han-sans-1.004, font-terminus-4.40, font-ubuntu-0.83,
-font-util-1.3.1, fontforge-20150824, freeipmi-1.5.1, frescobaldi-2.18.2,
-fribidi-0.19.7, fuse-2.9.5, gajim-0.16.5, gcc-5.3.0, gcc-toolchain-5.3.0,
-gccgo-4.9.3, gcr-3.18.0, gdb-7.11, gdk-pixbuf-2.32.3, geocode-glib-3.18.0,
-getmail-4.48.0, gettext-0.19.7, gfortran-5.3.0, git-2.7.3, git-manpages-2.7.3,
-git-modes-1.2.1, gitolite-3.6.5, glade-3.18.3, glibc-2.22, glibmm-2.46.3,
-global-6.5.2, glpk-4.59, gmime-2.6.20, gmp-6.1.0, gmsh-2.11.0, gmtp-1.3.10,
-gnome-common-3.18.0, gnome-desktop-3.18.1, gnome-keyring-3.18.3,
-gnome-klotski-3.18.2, gnome-mines-3.18.2, gnome-settings-daemon-3.18.2,
-gnome-terminal-3.18.2, gnome-themes-standard-3.18.0, gnucash-2.6.9,
-gnumeric-1.12.24, gnupg-2.0.29, gnupg-2.1.11, gnuplot-5.0.2, gnutls-3.4.7,
-goffice-0.10.24, gp2c-0.0.9pl5, gpgme-1.6.0, gpsbabel-1.5.2, graphite2-1.3.6,
-grep-2.22, grilo-0.2.14, grilo-plugins-0.2.16, gsl-2.1, gst-libav-1.6.3,
-gst-plugins-base-1.6.3, gst-plugins-good-1.6.3, gst-plugins-ugly-1.6.3,
-gstreamer-1.6.3, gtksourceview-3.18.2, guile-2.0.11, guile-2.0.11,
-guile-json-0.5.0, guile-ssh-0.9.0, guitarix-0.34.0, guix-0.9.0,
-guix-0.9.0-1.dd21, gvfs-1.26.2, harfbuzz-1.0.6, help2man-1.47.3, hevea-2.28,
-htop-2.0.1, hwloc-1.11.1, hydrogen-0.9.6.1, iceauth-1.0.7, icecast-2.4.3,
-icecat-38.6.0-gnu1, iproute2-4.4.0, irssi-0.8.18, isc-dhcp-4.3.3-P1,
-isync-1.2.1, jrnl-1.9.7, julia-0.4.3, kbproto-1.0.7, keepassx-2.0.2,
-kwindowsystem-5.19.0, libass-0.13.2, libassuan-2.4.2, libbluray-0.9.2,
-libcddb-1.3.2, libchamplain-0.12.12, libdvdcss-1.4.0, libevent-2.0.22,
-libffi-3.2.1, libfontenc-1.1.3, libfs-1.0.7, libgcrypt-1.6.5,
-libgnome-keyring-3.12.0, libgpg-error-1.21, libgweather-3.18.1,
-libinput-1.2.0, libjpeg-9a, libmicrohttpd-0.9.48, libotr-4.1.1,
-libpeas-1.16.0, libpng-1.5.26, librecad-2.0.9, libreoffice-5.0.5.2,
-libressl-2.3.3, librsvg-2.40.13, libsecret-0.18.3, libshout-2.4.1,
-libsndfile-1.0.26, libssh-0.7.3, libssh2-1.7.0, libstdc++-doc-5.3.0,
-libtasn1-4.7, libtiff-4.0.6, libuninameslist-0.5.20150701, libvpx-1.5.0,
-libwnck-3.14.0, libx11-1.6.3, libx264-20160220-2245, libxaw-1.0.13,
-libxdmcp-1.1.2, libxi-1.7.6, libxkbfile-1.0.9, libxml2-2.9.3, libxmp-4.3.10,
-libxp-1.0.3, libxrandr-1.5.0, libxrender-0.9.9, libxshmfence-1.2, libxt-1.1.5,
-libxvmc-1.0.9, libxxf86vm-1.1.4, libyubikey-1.13, lilypond-2.19.33,
-linux-libre-4.4.6, linux-libre-4.5, lua-5.2.3, macs-2.1.0.20151222,
-mafft-7.267, magit-2.5.0, man-pages-4.04, manaplus-1.6.3.12, mariadb-10.1.12,
-mercurial-3.7.2, mesa-11.0.9, mesa-headers-11.0.9, mit-krb5-1.13.3,
-mkfontscale-1.1.2, moe-1.8, moreutils-0.57, mozjs-24.2.0, mpd-0.19.12,
-mplayer-1.2.1, mpv-0.16.0, msmtp-1.6.3, mumps-5.0.1, mumps-metis-5.0.1,
-mumps-metis-openmpi-5.0.1, mumps-openmpi-5.0.1, mupdf-1.8, mysql-5.7.11,
-nano-2.5.3, ncbi-vdb-2.5.7, ncmpcpp-0.7.3, neon-0.30.1, nettle-3.2,
-nginx-1.8.1, ngs-java-1.2.3, ngs-sdk-1.2.3, nix-1.11.2, notmuch-0.21,
-nspr-4.10.10, nss-3.21.1, nss-certs-3.21.1, ntp-4.2.8p6, numactl-2.0.11,
-octave-4.0.0, offlineimap-6.7.0, openbox-3.6.1, openjpeg-2.0.1,
-openjpeg-2.1.0, openmpi-1.10.1, openssh-7.2p2, openssl-1.0.2g, opus-1.1.2,
-opusfile-0.7, orc-0.4.25, orfm-0.5.3, oxygen-icons-5.19.0, parallel-20160222,
-paredit-24, pari-gp-2.7.5, parted-3.2, pcre-8.38, pelican-3.6.3, perf-4.5,
-perl-5.22.1, perl-tk-804.033, petsc-3.6.2, petsc-complex-3.6.2,
-petsc-complex-openmpi-3.6.2, petsc-openmpi-3.6.2, pidgin-otr-4.0.2,
-pinentry-0.9.6, pius-2.2.2, pkg-config-0.29, postgresql-9.5.1, powertop-2.8,
-preseq-2.0, privoxy-3.0.24, procps-3.3.11, prodigal-2.6.3, pspp-0.10.0,
-pulseaudio-8.0, pumpa-0.9.2, python-3.4.3, python-apsw-3.9.2-r1,
-python-babel-2.1.1, python-biopython-1.66, python-blinker-1.4,
-python-certifi-2015.11.20.1, python-cffi-1.4.2, python-click-6.2,
-python-coverage-4.0.3, python-cryptography-1.2.3,
-python-cryptography-vectors-1.2.3, python-cython-0.23.4,
-python-dateutil-2.4.2, python-debtcollector-1.0.0, python-decorator-4.0.9,
-python-enum34-1.1.0, python-exif-read-2.1.2, python-file-5.25,
-python-fixtures-1.4.0, python-flake8-2.5.4, python-gnupg-0.3.8,
-python-html5lib-1.0b8, python-isodate-0.5.4, python-jinja2-2.8,
-python-jsonschema-2.5.1, python-keyring-5.7.1, python-libarchive-c-2.2,
-python-libxml2-2.9.3, python-llfuse-0.41.1, python-llfuse-1.0,
-python-lxml-3.5.0, python-ly-0.9.3, python-matplotlib-1.4.3,
-python-mccabe-0.4.0, python-mox3-0.13.0, python-msgpack-0.4.7,
-python-networkx-1.11, python-nose-1.3.7, python-numpy-1.10.4,
-python-oauthlib-1.0.3, python-os-client-config-1.12.0, python-os-testr-0.5.0,
-python-oslo.context-1.0.0, python-oslo.i18n-3.0.0,
-python-oslo.serialization-2.2.0, python-oslo.utils-3.0.0,
-python-oslosphinx-4.2.0, python-pandas-0.16.2, python-parsedatetime-1.5,
-python-passlib-1.6.5, python-patsy-0.4.1, python-pbr-1.8.1, python-pep8-1.7.0,
-python-pillow-3.1.1, python-pip-8.0.2, python-psutil-3.3.0, python-py-1.4.31,
-python-pycparser-2.14, python-pyflakes-1.0.0, python-pygments-2.0.2,
-python-pyjwt-1.4.0, python-pyld-0.6.8, python-pysam-0.8.4, python-pytz-2015.7,
-python-pyzmq-15.1.0, python-requests-2.9.1, python-requests-mock-0.7.0,
-python-rpy2-2.7.6, python-setuptools-scm-1.9.0, python-six-1.10.0,
-python-sqlalchemy-1.0.12, python-stevedore-1.10.0, python-tempest-lib-0.12.0,
-python-tlsh-3.4.4, python-tornado-4.3, python-traitlets-4.1.0,
-python-tzlocal-1.2, python-unidecode-0.04.18, python-virtualenv-13.1.2,
-python-webob-1.5.1, python2-apsw-3.9.2-r1, python2-babel-2.1.1,
-python2-backport-ssl-match-hostname-3.5.0.1, python2-biopython-1.66,
-python2-blinker-1.4, python2-certifi-2015.11.20.1, python2-cffi-1.4.2,
-python2-click-6.2, python2-coverage-4.0.3, python2-cryptography-1.2.3,
-python2-cryptography-vectors-1.2.3, python2-cython-0.23.4,
-python2-dateutil-2.4.2, python2-debtcollector-1.0.0, python2-decorator-4.0.9,
-python2-exif-read-2.1.2, python2-fastlmm-0.2.21, python2-file-5.25,
-python2-fixtures-1.4.0, python2-flake8-2.5.4, python2-gnupg-0.3.8,
-python2-html5lib-1.0b8, python2-isodate-0.5.4, python2-jinja2-2.8,
-python2-jsonschema-2.5.1, python2-keyring-5.7.1, python2-libarchive-c-2.2,
-python2-libxml2-2.9.3, python2-llfuse-1.0, python2-lxml-3.5.0,
-python2-matplotlib-1.4.3, python2-mccabe-0.4.0, python2-mox3-0.13.0,
-python2-msgpack-0.4.7, python2-networkx-1.11, python2-nose-1.3.7,
-python2-numpy-1.10.4, python2-oauthlib-1.0.3, python2-os-client-config-1.12.0,
-python2-os-testr-0.5.0, python2-oslo.context-1.0.0, python2-oslo.i18n-3.0.0,
-python2-oslo.serialization-2.2.0, python2-oslo.utils-3.0.0,
-python2-oslosphinx-4.2.0, python2-pandas-0.16.2, python2-passlib-1.6.5,
-python2-patsy-0.4.1, python2-pbr-1.8.1, python2-pep8-1.7.0,
-python2-pillow-3.1.1, python2-pip-8.0.2, python2-psutil-3.3.0,
-python2-py-1.4.31, python2-pycparser-2.14, python2-pyflakes-1.0.0,
-python2-pygments-2.0.2, python2-pyicu-1.9.2, python2-pyjwt-1.4.0,
-python2-pyld-0.6.8, python2-pysam-0.8.4, python2-pysnptools-0.3.5,
-python2-pysqlite-2.8.1, python2-pytz-2015.7, python2-pyzmq-15.1.0,
-python2-requests-2.9.1, python2-requests-mock-0.7.0, python2-rpy2-2.7.6,
-python2-setuptools-scm-1.9.0, python2-six-1.10.0, python2-sqlalchemy-1.0.12,
-python2-stevedore-1.10.0, python2-tempest-lib-0.12.0, python2-tlsh-3.4.4,
-python2-tornado-4.3, python2-traitlets-4.1.0, python2-unidecode-0.04.18,
-python2-virtualenv-13.1.2, python2-webob-1.5.1, qemu-2.5.0, qrencode-3.4.4,
-r-3.2.3, r-ggplot2-2.0.0, r-qtl-1.38-4, randrproto-1.5.0, retroarch-1.3.1,
-rsync-3.1.2, ruby-2.2.4, ruby-2.3.0, ruby-mini-portile-2.0.0,
-ruby-nokogiri-1.6.7.1, samba-4.3.6, samtools-1.3, sdl2-2.0.4, seahorse-3.18.0,
-sessreg-1.1.0, setxkbmap-1.3.1, shflags-1.2.0, simple-scan-3.19.91,
-sipwitch-1.9.15, skribilo-0.9.3, slepc-3.6.2, slepc-complex-3.6.2,
-slepc-complex-openmpi-3.6.2, slepc-openmpi-3.6.2, smproxy-1.0.6,
-socat-1.7.3.1, sqlite-3.10.0, sra-tools-2.5.7, star-2.5.1b, stow-2.2.2,
-subversion-1.8.15, sudo-1.8.15, sxiv-1.3.2, talloc-2.1.5, tdb-1.3.8,
-texinfo-5.2, texinfo-6.0, texinfo-6.1, the-silver-searcher-0.31.0, tig-2.1.1,
-tiled-0.15.1, tmux-2.1, tor-0.2.7.6, torsocks-2.0.0, totem-3.18.1,
-tzdata-2015g, ucommon-7.0.0, upower-0.99.3, utf8proc-1.3.1, vapoursynth-28,
-vera-1.23, vigra-1.11.0, vsearch-1.10.0, vte-0.42.3, wayland-1.10.0,
-webkitgtk-2.12.0, webkitgtk-2.4.10, webkitgtk-gtk2-2.4.10, weechat-1.4,
-wget-1.17.1, wine-1.9.4, x11perf-1.6.0, xcmsdb-1.0.5, xdotool-3.20150503.1,
-xdpyinfo-1.3.2, xdriinfo-1.0.5, xev-1.2.2, xf86-input-evdev-2.10.1,
-xf86-input-keyboard-1.8.1, xf86-input-libinput-0.16.0,
-xf86-input-synaptics-1.8.3, xf86-input-void-1.4.1, xf86-video-ati-7.6.1,
-xf86-video-cirrus-1.5.3, xf86-video-geode-2.11.18,
-xf86-video-intel-2.99.917-1-d167280, xf86-video-mach64-6.9.5,
-xf86-video-mga-1.6.4, xf86-video-neomagic-1.2.9, xf86-video-nouveau-1.0.12,
-xf86-video-r128-6.10.1, xf86-video-savage-2.3.8,
-xf86-video-siliconmotion-1.7.8, xf86-video-sis-0.10.8, xf86-video-tdfx-1.4.6,
-xf86-video-trident-1.3.7, xf86-video-vesa-2.3.4, xf86-video-vmware-13.1.0,
-xgamma-1.0.6, xhost-1.0.7, xinput-1.6.2, xkbevd-1.1.4, xkeyboard-config-2.17,
-xlockmore-5.46, xlsatoms-1.1.2, xmlto-0.0.28, xmodmap-1.0.9,
-xorg-server-1.18.1, xorriso-1.4.2, xproto-7.0.28, xrandr-1.5.0, xterm-322,
-xvid-1.3.4, xvinfo-1.1.3, xz-5.2.2, yasm-1.3.0, yelp-3.18.1,
-yelp-tools-3.18.0, yelp-xsl-3.18.1, ykclient-2.15, youtube-dl-2016.03.01,
-zlib-1.2.8, znc-1.6.2, zynaddsubfx-2.5.3
-
-** Programming interfaces
-
-*** Build systems always set the ‘SOURCE_DATE_EPOCH’ environment variable
-*** New (guix graph) graph manipulation module, abstracted from ‘guix graph’
-*** New (guix cve) module, to navigate the CVE database
-*** ‘build-things’ procedure takes a new ‘mode’ parameter
-*** Mass rename of ‘dmd’ to ‘shepherd’ in the (gnu …) modules
-*** New ‘gnome-desktop-service’ and ‘xfce-desktop-service’ procedures
-*** ‘pam-root-service-type’ can be extended with cross-cutting transformations
-*** ‘package-with-python2’ honors the ‘python2-variant’ package property
-    (see <http://bugs.gnu.org/22437>)
-
-** Noteworthy bug fixes
-
-*** Grafts are applied recursively (<http://bugs.gnu.org/22139>)
-*** Commands correctly handle numbers in package names
-    (http://bugs.gnu.org/19219)
-*** ‘guix-daemon’ deduplication code detects corrupt items
-*** eudev now populates /dev/disk/by-{id,label}
-*** Selected locale is automatically built (<http://bugs.gnu.org/22572>)
-*** Substitutes can be downloaded over HTTPS (<http://bugs.gnu.org/22937>)
-*** umask explicitly set in /etc/profile (<http://bugs.gnu.org/22650>)
-*** ‘guix system init’ writes GC root on the target file system
-    (<http://bugs.gnu.org/22802>)
-*** ‘guix system vm’ now works in the absence of KVM support
-    (<http://bugs.gnu.org/22633>)
-*** GuixSD includes an Info reader by default (<http://bugs.gnu.org/22598>)
-*** MacBook keyboards are now properly detected (<http://bugs.gnu.org/20433>)
-*** GRUB searches root by label or UUID (<http://bugs.gnu.org/22281>)
-*** ‘guix package --search-paths’ honors propagated inputs
-    (<http://bugs.gnu.org/22073>)
-*** GCC uses ‘C_INCLUDE_PATH’ et al. instead of ‘CPATH’
-    (<http://bugs.gnu.org/22186>)
-*** ‘ld-wrapper’ computes library search path based on all ‘-L’ flags
-    (<http://bugs.gnu.org/21941>)
-*** ‘guix environment --container’ gracefully handles abnormal exists
-    (<http://bugs.gnu.org/21958>)
-
-** Native language support
-
-*** Updated translations: da, de
-*** New translation: pl (Polish)
-
-* Changes in 0.9.0 (since 0.8.3)
-
-** Package management
-
-*** New ‘guix graph’ command, to draw package graphs
-*** New ‘guix challenge’ command, to challenge the authenticity of binaries
-*** ‘guix environment’ has a new ‘--container’ option
-*** ‘guix substitute’ now honors all the specified substitute URLs
-*** New ‘guix import cran’ command, to import R packages from CRAN
-*** Package descriptions can now include Texinfo markup rendered on the fly
-*** ‘guix package’ has a new ‘--install-from-file’ option
-*** ‘guix package --search’ shows package outputs
-*** ‘guix refresh’ can refresh selected non-GNU package definitions
-*** The ‘--ad-hoc’ option of ‘guix environment’ is now positional
-*** The ‘--exec’ option of ‘guix environment’ is deprecated; use ‘--’ instead
-*** ‘guix build’ has a new ‘--file’ option
-*** ‘guix build --log-file’ can now return URLs
-*** ‘guix size’ now has a ‘--substitute-urls’ option and is much faster
-*** New ‘guix lint’ checkers: ‘formatting’, ‘license’, ‘source-file-name’
-*** Download progress report has been improved
-*** Emacs shell-mode completions for ‘guix’ commands updated
-*** Emacs: New ‘M-x guix’ popup interface
-*** Emacs: modes for viewing build logs (‘guix-build-log-mode’)
-
-** Distribution
-
-*** New extensible service composition API
-
-The operating system service API in (gnu services) has been completely
-rewritten, significantly improving extensibility and modularity, while
-providing a framework that makes it easy to reason about service composition.
-Consequently, several sources of redundancy and confusion in
-‘operating-system’ declarations have been eliminated.  See “Service
-Composition” in the manual.
-
-*** New ‘extension-graph’ and ‘dmd-graph’ sub-commands for ‘guix system’
-*** New ‘container’ sub-command for ‘guix system’
-*** New ‘guix container’ command, to deal with GuixSD containers
-*** New ‘list-generations’ sub-command for ‘guix system’
-*** ‘operating-system’ has a new ‘locale-libcs’ field
-*** New services: ‘nginx-service’, ‘udisks-service’, ‘guix-publish-service’
-*** ‘%desktop-services’ now includes Polkit, GeoClue, elogind, UDisks, and more
-*** ‘dbus-daemon’ now has proper support for lazy service activation
-*** ‘wicd-service’ automatically adds Wicd to the system profile
-*** ‘slim-service’ automatically adds xterm to the system profile
-*** hydra.gnu.org now provides substitutes for ‘armhf-linux’
-*** /run/systemd is mounted as tmpfs by default, for use by elogind
-*** ‘glibc’ package no longer contains Bash in its bin/ directory
-*** libc now looks for locale data in a versioned sub-directory
-*** libc honors the new ‘GUIX_LOCPATH’ environment variable
-*** Xfce now defaults to the GNOME icon theme
-*** 543 new packages
-
-abduco, accountsservice, american-fuzzy-lop, ansible, arandr, attic,
-autobuild, bash-minimal, bash-static, bio-blastxmlparser, bio-locus,
-bioperl-minimal, bioruby, bitcoin-core, bspwm, byobu, cabal-install, cityhash,
-clang-runtime, clang-runtime, cm, cmus, conky, coreutils-minimal, cpphs,
-cvs-fast-export, d-feet, deeptools, diffoscope, dosbox, dvtm, emacs-butler,
-emacs-dash, emacs-debbugs, emacs-deferred, emacs-f, emacs-flycheck,
-emacs-let-alist, emacs-ob-ipython, emacs-s, emacs-typo, enblend-enfuse,
-epiphany, esmtp, ethtool, evilwm, exfat-utils, express-beta-diversity,
-extra-cmake-modules, extundelete, fastcap, fasthenry, figlet, file-roller,
-flann, font-anonymous-pro, font-gnu-unifont, font-inconsolata, font-tex-gyre,
-font-ubuntu, frescobaldi, fuse-exfat, gajim, gamine, gerbv, gexiv2,
-ghc-adjunctions, ghc-aeson, ghc-alex, ghc-annotated-wl-pprint,
-ghc-ansi-terminal, ghc-ansi-wl-pprint, ghc-appar, ghc-async, ghc-attoparsec,
-ghc-auto-update, ghc-base-compat, ghc-base-orphans, ghc-base64-bytestring,
-ghc-bifunctors, ghc-blaze-builder, ghc-blaze-html, ghc-blaze-markup,
-ghc-byteorder, ghc-bytestring-builder, ghc-cereal, ghc-cgi, ghc-charset,
-ghc-cheapskate, ghc-clock, ghc-cmdargs, ghc-comonad, ghc-contravariant,
-ghc-cookie, ghc-css-text, ghc-data-default, ghc-data-default-class,
-ghc-data-default-instances-base, ghc-data-default-instances-containers,
-ghc-data-default-instances-dlist, ghc-data-default-instances-old-locale,
-ghc-digest, ghc-distributive, ghc-dlist, ghc-doctest, ghc-easy-file,
-ghc-exceptions, ghc-extensible-exceptions, ghc-extra, ghc-fast-logger,
-ghc-fingertree, ghc-free, ghc-generic-deriving, ghc-gluraw, ghc-glut,
-ghc-haddock, ghc-haddock-api, ghc-haddock-library, ghc-half, ghc-happy,
-ghc-haskell-src, ghc-haskell-src-exts, ghc-hspec, ghc-hspec-core,
-ghc-hspec-expectations, ghc-hspec-meta, ghc-html, ghc-http-types, ghc-iproute,
-ghc-kan-extensions, ghc-lens, ghc-lifted-base, ghc-logict, ghc-mmorph,
-ghc-monad-control, ghc-multipart, ghc-nats, ghc-objectname, ghc-old-locale,
-ghc-old-time, ghc-opengl, ghc-openglraw, ghc-optparse-applicative,
-ghc-parsers, ghc-pcre-light, ghc-polyparse, ghc-prelude-extras,
-ghc-profunctors, ghc-quickcheck-instances, ghc-quickcheck-io,
-ghc-quickcheck-unicode, ghc-reducers, ghc-reflection, ghc-regex-base,
-ghc-regex-compat, ghc-regex-posix, ghc-regex-tdfa-rc, ghc-resourcet, ghc-safe,
-ghc-scientific, ghc-sdl, ghc-sdl-image, ghc-sdl-mixer, ghc-semigroupoids,
-ghc-semigroups, ghc-setenv, ghc-silently, ghc-simple-reflect, ghc-smallcheck,
-ghc-statevar, ghc-streaming-commons, ghc-stringbuilder, ghc-stringsearch,
-ghc-tagged, ghc-tagsoup, ghc-tasty, ghc-tasty-ant-xml, ghc-tasty-golden,
-ghc-tasty-hunit, ghc-tasty-quickcheck, ghc-tasty-smallcheck, ghc-temporary,
-ghc-temporary-rc, ghc-transformers-base, ghc-transformers-compat,
-ghc-trifecta, ghc-unbounded-delays, ghc-uniplate, ghc-unix-compat,
-ghc-unix-time, ghc-utf8-string, ghc-vault, ghc-vector-binary-instances,
-ghc-void, ghc-wai, ghc-wai-extra, ghc-wai-logger, ghc-word8, ghc-x11,
-ghc-x11-xft, ghc-xhtml, ghc-xml, ghc-xmonad-contrib, ghc-xss-sanitize,
-ghc-zip-archive, glibc-hurd, glibc-hurd-headers, gmtp, graphios, gtk-doc,
-guile-next, guile-present, guile-redis, guile-rsvg, guile-wisp, gusb, gvfs,
-gzochi, haunt, hlint, hscolour, hspec-discover, hurd-minimal, i3-wm, i3status,
-ibus-libpinyin, idris, ifstatus, keepassx, klick, kwindowsystem, lablgtk,
-libatasmart, libchamplain, libchop, libconfuse, libcue, libesmtp, libev,
-libfm, libfm-extra, libgee, libgudev, liblxqt, libndp, libpano13, libpinyin,
-libraw, libusb-compat, libyajl, lxqt-common, lxqt-session, lxrandr, lxtask,
-lxterminal, lz4, mafft, manaplus, mars, menu-cache, minixml, mosaik,
-nestopia-ue, newt, non-sequencer, ntk, openimageio, opusfile, patches, pbzip2,
-pcmanfm, pcre2, pd, pelican, perl-czplib, perl-date-manip, perl-finance-quote,
-perl-html-element-extended, perl-html-tableextract, perl-pod-simple, physfs,
-pidgin, pidgin-otr, pigz, po4a, poppler-qt4, pwgen, python-appdirs,
-python-bandit, python-blinker, python-ccm, python-chardet,
-python-cryptography, python-cryptography-vectors, python-debian,
-python-debtcollector, python-ecdsa, python-file, python-fonttools,
-python-gnupg, python-hacking, python-httplib2, python-idna,
-python-ipython-genutils, python-iso8601, python-joblib, python-libarchive-c,
-python-llfuse, python-ly, python-minimal, python-minimal, python-mistune,
-python-monotonic, python-mox3, python-msgpack, python-nbxmpp, python-netaddr,
-python-numexpr, python-os-client-config, python-os-testr, python-oslo.config,
-python-oslo.context, python-oslo.i18n, python-oslo.log,
-python-oslo.serialization, python-oslo.utils, python-oslosphinx,
-python-oslotest, python-paramiko, python-passlib, python-pathpy, python-patsy,
-python-pbr, python-pbr, python-pexpect, python-pickleshare, python-pip,
-python-poppler-qt4, python-pretend, python-prettytable, python-ptyprocess,
-python-py-bcrypt, python-pyasn1, python-pyopenssl, python-pytest-runner,
-python-requests-mock, python-setuptools-scm, python-simplegeneric,
-python-statsmodels, python-stevedore, python-tempest-lib, python-terminado,
-python-tlsh, python-traitlets, python-webob, python-wrapt, python-xlrd,
-python2-appdirs, python2-bandit, python2-blinker, python2-ccm,
-python2-chardet, python2-cryptography, python2-cryptography-vectors,
-python2-debian, python2-debtcollector, python2-ecdsa, python2-file,
-python2-fonttools, python2-gnupg, python2-hacking, python2-httplib2,
-python2-idna, python2-ipaddress, python2-ipython-genutils, python2-iso8601,
-python2-joblib, python2-keyring, python2-libarchive-c, python2-llfuse,
-python2-mistune, python2-monotonic, python2-mox3, python2-msgpack,
-python2-nbxmpp, python2-netaddr, python2-notmuch, python2-numexpr,
-python2-os-client-config, python2-os-testr, python2-oslo.config,
-python2-oslo.context, python2-oslo.i18n, python2-oslo.log,
-python2-oslo.serialization, python2-oslo.utils, python2-oslosphinx,
-python2-oslotest, python2-paramiko, python2-passlib, python2-pathpy,
-python2-patsy, python2-pbr, python2-pbr, python2-pexpect, python2-pickleshare,
-python2-pip, python2-pretend, python2-prettytable, python2-ptyprocess,
-python2-py-bcrypt, python2-pyasn1, python2-pycrypto, python2-pyopenssl,
-python2-pytest-runner, python2-requests-mock, python2-setuptools-scm,
-python2-simplegeneric, python2-statsmodels, python2-stevedore,
-python2-tempest-lib, python2-terminado, python2-tlsh, python2-traitlets,
-python2-webob, python2-wrapt, python2-xlrd, r-assertthat, r-bh, r-chron,
-r-codetools, r-colorspace, r-crayon, r-data.table, r-dbi, r-dichromat,
-r-digest, r-dplyr, r-evaluate, r-formatr, r-ggplot2, r-gtable, r-highr,
-r-htmltools, r-htmlwidgets, r-httpuv, r-jsonlite, r-knitr, r-labeling,
-r-lazyeval, r-magrittr, r-markdown, r-memoise, r-microbenchmark, r-mime,
-r-munsell, r-plyr, r-proto, r-pryr, r-qtl, r-r6, r-rcolorbrewer, r-rcpp,
-r-reshape2, r-scales, r-servr, r-stringi, r-stringr, r-testthat, r-yaml, rage,
-raincat, redis, rest, rfkill, rpm, ruby-activesupport, ruby-atoulme-antwrap,
-ruby-bio-logger, ruby-builder, ruby-byebug, ruby-coderay, ruby-cucumber-core,
-ruby-diff-lcs, ruby-docile, ruby-ffi, ruby-formatador, ruby-gherkin3,
-ruby-json, ruby-libxml, ruby-listen, ruby-log4r, ruby-lumberjack,
-ruby-method-source, ruby-mini-portile, ruby-minitar, ruby-nenv, ruby-nokogiri,
-ruby-notiffany, ruby-orderedhash, ruby-ox, ruby-permutation, ruby-pg,
-ruby-pry, ruby-rack, ruby-rb-inotify, ruby-rjb, ruby-rubygems-tasks,
-ruby-shellany, ruby-shindo, ruby-simplecov-html, ruby-thor, ruby-thread-safe,
-ruby-tzinfo, ruby-xml-simple, ruby-yard, sassc, scmutils, seqmagick, shotwell,
-shroud, simple-scan, squashfs-tools, sxhkd, tinc, udisks, unison, vsearch,
-webkitgtk-gtk2, wesnoth, wpa-supplicant-minimal, xcb-util-cursor, xcompmgr,
-xfce4-pulseaudio-plugin, xjackfreak, xlsfonts, xmonad, yapet, yelp,
-yelp-tools, yelp-xsl, znc, zynaddsubfx
-
-*** 268 package updates
-
-abcde-2.7, arb-2.7.0, ardour-4.2, at-spi2-atk-2.18.1, at-spi2-core-2.18.1,
-ath9k-htc-firmware-1.4.0, atk-2.18.0, atkmm-2.24.1, autogen-5.18.6,
-avidemux-2.6.10, bedtools-2.24.0, binutils-2.25.1,
-binutils-static-stripped-tarball-2.25.1, bison-3.0.4, bluez-5.35,
-bundler-1.10.6, c-reduce-2.3.0, cairomm-1.12.0, calcurse-4.0.0,
-calibre-2.41.0, camlp5-6.14, cgal-4.6.3, chess-6.2.2, clang-3.6.2,
-claws-mail-3.13.0, cmake-3.3.2, complexity-1.3, conkeror-1.0pre1.20150730,
-cpio-2.12, crossmap-0.2.1, csound-6.05, cups-2.1.0, cups-filters-1.0.75,
-cups-minimal-2.1.0, curl-7.45.0, dbus-1.10.0, dbus-1.10.0.a, ddrescue-1.20,
-dmd-0.2.01, docbook-xml-4.4, docbook-xml-4.5, dosfstools-3.0.28,
-e2fsck-static-1.42.13, e2fsprogs-1.42.13, efl-1.15.2, eigen-3.2.6,
-elementary-1.15.2, emotion-generic-players-1.15.0, enlightenment-0.19.12,
-eudev-3.1.5, evas-generic-loaders-1.15.0, feh-2.14, ffmpeg-2.8, fish-2.2.0,
-flint-2.5.2, fontconfig-2.11.94, freeglut-3.0.0, freeimage-3.17.0,
-freeipmi-1.4.11, gcc-4.9.3, gcc-4.9.3, gcc-4.9.3, gcc-5.2.0,
-gcc-toolchain-5.2.0, gcj-4.9.3, gdb-7.10, gdk-pixbuf-2.32.1, geiser-0.8.1,
-gettext-0.19.6, ghc-7.10.2, ghc-hashable-1.2.3.3, ghc-http-4000.2.20,
-ghc-mtl-2.2.1, ghc-network-2.6.2.1, ghc-network-uri-2.6.0.3,
-ghc-primitive-0.6.1.0, ghc-quickcheck-2.8.1, ghc-syb-0.6, ghc-text-1.2.1.3,
-ghc-vector-0.11.0.0, giflib-5.1.1, git-2.5.0, git-manpages-2.5.0,
-git-modes-1.2.0, glib-2.46.1, glib-networking-2.46.1, glibc-2.22,
-glibc-locales-2.22, glibc-stripped-tarball-2.22, glibc-utf8-locales-2.22,
-glibmm-2.46.1, global-6.5.1, glpk-4.56, gnome-desktop-3.16.2,
-gnome-themes-standard-3.16.2, gnu-pw-mgr-1.6, gnumach-headers-1.6,
-gnupg-2.1.9, gnurl-7.45.0, gnutls-3.4.5, gobject-introspection-1.46.0,
-gp2c-0.0.9pl3, graphite2-1.3.3, graphviz-2.38.0,
-gsettings-desktop-schemas-3.18.0, gsl-2.0, gst-libav-1.6.1,
-gst-plugins-base-1.6.1, gst-plugins-good-1.6.1, gst-plugins-ugly-1.6.1,
-gstreamer-1.6.1, gtk+-3.18.2, gtkmm-3.18.0, guile-ssh-0.8.0, guitarix-0.33.0,
-guix-0.8.3, guix-0.8.3.b485f75, harfbuzz-1.0.5, help2man-1.47.2,
-hurd-headers-0.7, ibus-1.5.11, icecat-38.3.0-gnu1, icedtea6-1.13.8,
-icedtea7-2.6.2, imagemagick-6.9.2-1, intltool-0.51.0, json-glib-1.0.4,
-leptonica-1.72, less-481, libbluray-0.9.0, libcap-2.24, libdrm-2.4.65,
-libdvdcss-1.3.99, libedit-20150325-3.1, libgcrypt-1.6.3, libgsf-1.14.34,
-libidn-1.32, libinput-0.21.0, libmicrohttpd-0.9.45, libmtp-1.1.9,
-libotr-4.1.0, libpcap-1.7.4, libpciaccess-0.13.4, libqtxdg-1.2.0,
-librsvg-2.40.11, libsigc++-2.6.1, libsoup-2.52.1, libssh-0.6.5, libtiff-4.0.5,
-libtorrent-0.13.6, libva-1.6.1, lilypond-2.19.27, links-2.12,
-linux-libre-4.2.5, linux-pam-1.2.1, lirc-0.9.3, llvm-3.6.2, lua-5.2.3,
-lzo-2.09, magit-2.3.0, mesa-11.0.3, mesa-headers-11.0.3, mig-1.6,
-minetest-0.4.13, mosh-1.2.5, mpg123-1.22.4, mplayer-1.2, mpv-0.11.0,
-mu-0.9.13, mutt-1.5.24, ncdu-1.11, ncmpcpp-0.6.7, ncurses-6.0, node-0.12.7,
-notmuch-0.20.2, ntp-4.2.8p4, ocaml-4.02.3, offlineimap-6.5.7, openblas-0.2.15,
-openjpeg-2.1.0, openldap-2.4.42, openssh-7.0p1, orc-0.4.24, pango-1.38.1,
-pangomm-2.38.1, parallel-20151022, pavucontrol-3.0,
-pbtranscript-tofu-2.2.3.8f5467fe6, pciutils-3.3.1, perf-4.2.5,
-perl-xml-parser-2.44, pixman-0.32.8, poppler-0.37.0, powertop-2.7,
-python-cffi-1.2.1, python-dateutil-2.2, python-fixtures-1.3.1,
-python-ipython-3.2.1, python-pyflakes-0.9.2, python-pygobject-3.18.0,
-python-pyqt-4.11.4, python-pyqt-5.5, python-requests-2.8.0,
-python-scipy-0.16.0, python-setuptools-18.3.1, python-sip-4.16.9,
-python-six-1.9.0, python2-cffi-1.2.1, python2-dateutil-2.2,
-python2-fixtures-1.3.1, python2-ipython-3.2.1, python2-pygobject-3.18.0,
-python2-pyqt-4.11.4, python2-pyqt-5.5, python2-requests-2.8.0,
-python2-scipy-0.16.0, python2-setuptools-18.3.1, python2-sip-4.16.9,
-python2-six-1.9.0, qemu-2.4.0.1, qemu-headless-2.4.0.1, qpdf-5.1.3,
-qsynth-0.4.0, qt-5.5.1, r-3.2.2, racket-6.2.1, ratpoison-1.4.8, readline-6.3,
-retroarch-1.2.2, ripperx-2.8.0, rtorrent-0.9.6, ruby-2.2.3, ruby-arel-6.0.3,
-ruby-bacon-1.2.0, ruby-i18n-0.7.0, samtools-1.2, sfarklib-2.24, sfml-2.3.2,
-shadow-4.2.1, sipwitch-1.9.14, sqlite-3.8.11.1, subversion-1.8.14,
-synergy-1.7.4, tcl-8.6.4, tcpdump-4.7.4, teckit-2.5.4, terminology-0.9.1,
-texlive-2015, texlive-bin-2015, texlive-texmf-2015, tiled-0.13.1, tk-8.6.4,
-tmux-2.0, tor-0.2.6.10, ucommon-6.6.2, units-2.12, util-linux-2.27,
-vala-0.30.0, valgrind-3.11.0, vlc-2.2.1, webkitgtk-2.8.5, weechat-1.3,
-wine-1.7.52, wpa-supplicant-2.5, xapian-1.2.21, xterm-320,
-youtube-dl-2015.11.01, zsh-5.1.1
-
-** Programming interfaces
-
-*** Rewritten (gnu services) module; (gnu services …) modules adjusted
-*** New Emacs development tools, see “Development” in the manual
-*** (guix gexp) provides the declarative ‘computed-file’, ‘program-file’, etc.
-*** New (guix upstream) module, for generalized upstream release tracking
-
-** Noteworthy bug fixes
-
-*** Passwords in /etc/shadow are SHA512-hashed (http://bugs.gnu.org/21318)
-*** daemon: Require a signature for imports made by root
-    (http://bugs.gnu.org/21354)
-*** emacs: Fix guix-guile-program default value (http://bugs.gnu.org/21127)
-*** Compressed initrds no longer include timestamps
-*** Partly fix handling of encrypted root partitions
-    (http://bugs.gnu.org/19190)
-*** Python now includes tkinter (http://bugs.gnu.org/20889)
-*** Memoize the results of ‘package-with-python2’ (http://bugs.gnu.org/21675)
-*** Use the daemon's substitute URLs by default (http://bugs.gnu.org/20217)
-*** ‘guix system --no-grub’ works correctly for ‘init’ and ‘reconfigure’
-    (http://bugs.gnu.org/21068)
-
-** Native language support
-
-*** Updated translations: da
-
 * Changes in 0.8.3 (since 0.8.2)

 ** Package management
@@ -77,6 +77,6 @@ Freenode!
    + build containers like guix-daemon does
    + provide a Plash-like interface in Bash
  - daemon rewritten in Guile
-  - more shepherd integration
+  - more dmd integration
    + monitor network interfaces and start/stop events based on that
    + include a DHCP client written in Scheme
@@ -25,7 +25,6 @@ infrastructure help:
           Daniel Kochmański <dkochmanski@hellsgate.pl>
 	  Matthew Lien <bluet@bluet.org>
             Dave Love <fx@gnu.org>
-            Chris Marusich <cmmarusich@gmail.com>
            Niels Möller <nisse@lysator.liu.se>
          Cyprien Nicolas <cyprien@nicolas.tf>
 	   Yutaka Niibe <gniibe@fsij.org>
@@ -40,7 +39,6 @@ infrastructure help:
           Thomas Schwinge <thomas@codesourcery.com>
        Alexander Shendi <Alexander.Shendi@web.de>
 	     Alen Skondro <askondro@gmail.com>
-              Jan Synáček <jan.synacek@gmail.com>
 	 Matthias Wachs <wachs@net.in.tum.de>
 Christopher Allan Webber <cwebber@dustycloud.org>
           Philip Woods <elzairthesorcerer@gmail.com>
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,7 +21,6 @@
 ;;;

 (use-modules (guix store)
-             (guix grafts)
             (guix packages)
             (guix derivations)
             (gnu packages emacs)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,7 +21,6 @@
 ;;;

 (use-modules (guix store)
-             (guix grafts)
             (guix packages)
             (guix derivations)
             (guix ui)
@@ -1,90 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
-;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(use-modules (system base target)
-             (system base message)
-             (ice-9 match)
-             (ice-9 threads)
-             (guix build utils))
-
-(define warnings
-  '(unsupported-warning format unbound-variable arity-mismatch))
-
-(define host (getenv "host"))
-
-(define srcdir (getenv "srcdir"))
-
-(define (relative-file file)
-  (if (string-prefix? (string-append srcdir "/") file)
-      (string-drop file (+ 1 (string-length srcdir)))
-      file))
-
-(define (file-mtime<? f1 f2)
-  (< (stat:mtime (stat f1))
-     (stat:mtime (stat f2))))
-
-(define (scm->go file)
-  (let* ((relative (relative-file file))
-         (without-extension (string-drop-right relative 4)))
-    (string-append without-extension ".go")))
-
-(define (file-needs-compilation? file)
-  (let ((go (scm->go file)))
-    (or (not (file-exists? go))
-        (file-mtime<? go file))))
-
-(define (file->module file)
-  (let* ((relative (relative-file file))
-         (module-path (string-drop-right relative 4)))
-    (map string->symbol
-         (string-split module-path #\/))))
-
-;;; To work around <http://bugs.gnu.org/15602> (FIXME), we want to load all
-;;; files to be compiled first.  We do this via resolve-interface so that the
-;;; top-level of each file (module) is only executed once.
-(define (load-module-file file)
-  (let ((module (file->module file)))
-    (format #t "  LOAD     ~a~%" module)
-    (resolve-interface module)))
-
-(define (compile-file* file output-mutex)
-  (let ((go (scm->go file)))
-    (with-mutex output-mutex
-      (format #t "  GUILEC   ~a~%" go)
-      (force-output))
-    (mkdir-p (dirname go))
-    (with-fluids ((*current-warning-prefix* ""))
-      (with-target host
-        (lambda ()
-          (compile-file file
-                        #:output-file go
-                        #:opts `(#:warnings ,warnings)))))))
-
-(match (command-line)
-  ((_ . files)
-   (let ((files (filter file-needs-compilation? files)))
-     (for-each load-module-file files)
-     (let ((mutex (make-mutex)))
-       (par-for-each (lambda (file)
-                       (compile-file* file mutex))
-                     files)))))
-
-;;; Local Variables:
-;;; eval: (put 'with-target 'scheme-indent-function 1)
-;;; End:
@@ -56,7 +56,7 @@
 (match (command-line)
  ((_ file expected-hash)
   (let ((uri (file-name->uri file)))
-     (format #t "downloading file `~a'~%from `~a'...~%"
+     (format #t "downloading file `~a' from `~a'...~%"
             file (uri->string uri))
     (let*-values (((resp data) (http-get uri #:decode-body? #f))
                   ((hash)      (bytevector->base16-string (sha256 data)))
@@ -57,7 +57,7 @@ This is an alpha preview of the GNU system.  Welcome.

 This image features the GNU Guix package manager, which was used to
 build it (http://www.gnu.org/software/guix/).  The init system is
-the GNU Shepherd (http://www.gnu.org/software/shepherd/).
+GNU dmd (http://www.gnu.org/software/dmd/).

 You can log in as 'guest' or 'root' with no password.
 ")
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,7 +38,6 @@

 (use-modules (guix config)
             (guix store)
-             (guix grafts)
             (guix packages)
             (guix derivations)
             (guix monads)
@@ -79,9 +78,6 @@
    (license . ,(package-license package))
    (home-page . ,(package-home-page package))
    (maintainers . ("bug-guix@gnu.org"))
-    (max-silent-time . ,(or (assoc-ref (package-properties package)
-                                       'max-silent-time)
-                            3600))                ; 1 hour by default
    (timeout . ,(or (assoc-ref (package-properties package) 'timeout)
                    72000)))) ; 20 hours by default

@@ -161,7 +157,7 @@ system.")
                       (set-guile-for-build (default-guile))
                       (system-disk-image installation-os
                                          #:disk-image-size
-                                          (* 1024 MiB))))))
+                                          (* 860 MiB))))))
      '()))

 (define (tarball-jobs store system)
@@ -249,35 +245,27 @@ valid."
                       %packages-to-cross-build))
                (remove (either from-32-to-64? same?) %cross-targets)))

-  ;; Turn off grafts.  Grafting is meant to happen on the user's machines.
-  (parameterize ((%graft? #f))
-    ;; Return one job for each package, except bootstrap packages.
-    (append-map (lambda (system)
-                  (case subset
-                    ((all)
-                     ;; Build everything, including replacements.
-                     (let ((all (fold-packages
-                                 (lambda (package result)
-                                   (if (package-replacement package)
-                                       (cons* package
-                                              (package-replacement package)
-                                              result)
-                                       (cons package result)))
-                                 '()))
-                           (job (lambda (package)
-                                  (package->job store package
-                                                system))))
-                       (append (filter-map job all)
-                               (qemu-jobs store system)
-                               (tarball-jobs store system)
-                               (cross-jobs system))))
-                    ((core)
-                     ;; Build core packages only.
-                     (append (map (lambda (package)
-                                    (package-job store (job-name package)
-                                                 package system))
-                                  %core-packages)
-                             (cross-jobs system)))
-                    (else
-                     (error "unknown subset" subset))))
-                %hydra-supported-systems)))
+  ;; Return one job for each package, except bootstrap packages.
+  (append-map (lambda (system)
+                (case subset
+                  ((all)
+                   ;; Build everything.
+                   (fold-packages (lambda (package result)
+                                    (let ((job (package->job store package
+                                                             system)))
+                                      (if job
+                                          (cons job result)
+                                          result)))
+                                  (append (qemu-jobs store system)
+                                          (tarball-jobs store system)
+                                          (cross-jobs system))))
+                  ((core)
+                   ;; Build core packages only.
+                   (append (map (lambda (package)
+                                  (package-job store (job-name package)
+                                               package system))
+                                %core-packages)
+                           (cross-jobs system)))
+                  (else
+                   (error "unknown subset" subset))))
+              %hydra-supported-systems))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,7 +47,6 @@
             (guix build-system gnu)
             (gnu packages version-control)
             (gnu packages package-management)
-             (gnu packages imagemagick)
             (gnu packages graphviz)
             (gnu packages man)
             (srfi srfi-1)
@@ -73,25 +72,12 @@
 (define (tarball-package checkout)
  "Return a package that does `make distcheck' from CHECKOUT, a directory
 containing a Git checkout of Guix."
-  (let ((guix (@@ (gnu packages package-management) guix)))
-    (dist-package (package
-                    (inherit guix)
-                    (arguments (package-arguments guix))
-                    (native-inputs `(("imagemagick" ,imagemagick)
-                                     ,@(package-native-inputs guix))))
-                  checkout
-
-                  #:phases
-                  '(modify-phases %dist-phases
-                     (add-before 'build 'build-daemon
-                       ;; Build 'guix-daemon' first so that help2man
-                       ;; successfully creates 'guix-daemon.1'.
-                       (lambda _
-                         (let ((n (number->string
-                                   (parallel-job-count))))
-                           (zero? (system* "make"
-                                           "nix/libstore/schema.sql.hh"
-                                           "guix-daemon" "-j" n)))))))))
+  (dist-package (package
+                  (inherit guix)
+                  (native-inputs `(("graphviz" ,graphviz)
+                                   ("help2man" ,help2man)
+                                   ,@(package-native-inputs guix))))
+                checkout))

 (define (hydra-jobs store arguments)
  "Return Hydra jobs."
@@ -14,6 +14,14 @@ if test "x$guix_build_daemon" = "xyes"; then
  AC_PROG_RANLIB
  AC_CONFIG_HEADER([nix/config.h])

+  dnl Decompressors, for use by the substituter.
+  AC_PATH_PROG([GZIP], [gzip])
+  AC_PATH_PROG([BZIP2], [bzip2])
+  AC_PATH_PROG([XZ], [xz])
+  AC_SUBST([GZIP])
+  AC_SUBST([BZIP2])
+  AC_SUBST([XZ])
+
  dnl Use 64-bit file system calls so that we can support files > 2 GiB.
  AC_SYS_LARGEFILE

@@ -110,20 +118,6 @@ if test "x$guix_build_daemon" = "xyes"; then
  dnl Check for <linux/fs.h> (for immutable file support).
  AC_CHECK_HEADERS([linux/fs.h])

-  dnl Determine the appropriate default list of substitute URLs.
-  GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)])
-  if test "x$have_gnutls" = "xyes"; then
-    guix_substitute_urls="https://mirror.hydra.gnu.org https://hydra.gnu.org"
-  else
-    AC_MSG_WARN([GnuTLS is missing, substitutes will be downloaded in the clear])
-    guix_substitute_urls="http://mirror.hydra.gnu.org http://hydra.gnu.org"
-  fi
-  AC_MSG_CHECKING([for default substitute URLs])
-  AC_MSG_RESULT([$guix_substitute_urls])
-
-  AC_DEFINE_UNQUOTED([GUIX_SUBSTITUTE_URLS], ["$guix_substitute_urls"],
-    [Default list of substitute URLs used by 'guix-daemon'.])
-
  dnl Check whether the 'offload' build hook can be built (uses
  dnl 'restore-file-set', which requires unbuffered custom binary input
  dnl ports from Guile >= 2.0.10.)
@@ -140,8 +134,6 @@ if test "x$guix_build_daemon" = "xyes"; then
  GUIX_TEST_ROOT="$ac_cv_guix_test_root"
  AC_SUBST([GUIX_TEST_ROOT])

-  GUIX_CHECK_LOCALSTATEDIR
-
  AC_CONFIG_FILES([nix/scripts/list-runtime-roots],
    [chmod +x nix/scripts/list-runtime-roots])
  AC_CONFIG_FILES([nix/scripts/substitute],
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.68)
-AC_INIT([GNU Guix], [0.10.0], [bug-guix@gnu.org], [guix],
+AC_INIT([GNU Guix], [0.9.0], [bug-guix@gnu.org], [guix],
  [http://www.gnu.org/software/guix/])
 AC_CONFIG_AUX_DIR([build-aux])

@@ -60,8 +60,7 @@ AC_SUBST([guix_localstatedir])
 AC_SUBST([guix_sysconfdir])
 AC_SUBST([guix_sbindir])

-GUIX_CHECK_FILE_NAME_LIMITS([can_run_tests])
-AM_CONDITIONAL([CAN_RUN_TESTS], [test "x$can_run_tests" = "xyes"])
+GUIX_CHECK_FILE_NAME_LIMITS

 dnl We require pkg.m4 (from pkg-config) and guile.m4 (from Guile.)
 dnl Make sure they are available.
@@ -91,14 +90,6 @@ GUIX_CHECK_LIBC_MOUNT
 AM_CONDITIONAL([BUILD_SYSCALLS_MODULE],
  [test "x$guix_cv_libc_has_mount" = "xyes"])

-dnl Decompressors, for use by the substituter and other modules.
-AC_PATH_PROG([GZIP], [gzip])
-AC_PATH_PROG([BZIP2], [bzip2])
-AC_PATH_PROG([XZ], [xz])
-AC_SUBST([GZIP])
-AC_SUBST([BZIP2])
-AC_SUBST([XZ])
-
 AC_ARG_WITH([nix-prefix],
  [AS_HELP_STRING([--with-nix-prefix=DIR],
    [search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])],
@@ -1,6 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
-# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -22,7 +21,7 @@
 #

 BUILT_SOURCES += nix/libstore/schema.sql.hh
-CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service etc/guix-daemon.conf
+CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service

 noinst_LIBRARIES = libformat.a libutil.a libstore.a

@@ -70,8 +69,7 @@ libutil_headers =				\
  nix/libutil/gcrypt-hash.hh			\
  nix/libutil/md5.h				\
  nix/libutil/sha1.h				\
-  nix/libutil/sha256.h				\
-  nix/libutil/sha512.h
+  nix/libutil/sha256.h

 libutil_a_CPPFLAGS =				\
  -I$(top_builddir)/nix				\
@@ -86,6 +84,7 @@ libstore_a_SOURCES =				\
  nix/libstore/store-api.cc			\
  nix/libstore/optimise-store.cc		\
  nix/libstore/local-store.cc			\
+  nix/libstore/remote-store.cc			\
  nix/libstore/build.cc				\
  nix/libstore/pathlocks.cc			\
  nix/libstore/derivations.cc
@@ -95,6 +94,7 @@ libstore_headers =				\
  nix/libstore/pathlocks.hh			\
  nix/libstore/globals.hh			\
  nix/libstore/worker-protocol.hh		\
+  nix/libstore/remote-store.hh			\
  nix/libstore/derivations.hh			\
  nix/libstore/misc.hh				\
  nix/libstore/local-store.hh			\
@@ -156,7 +156,7 @@ noinst_HEADERS =						\
  $(guix_daemon_headers)

 nix/libstore/schema.sql.hh: nix/libstore/schema.sql
-	$(AM_V_GEN)$(GUILE) --no-auto-compile -c		\
+	$(GUILE) --no-auto-compile -c				\
 	  "(use-modules (rnrs io ports))			\
 	   (call-with-output-file \"$@\"			\
 	     (lambda (out)					\
@@ -186,30 +186,16 @@ nodist_systemdservice_DATA = etc/guix-daemon.service

 etc/guix-daemon.service: etc/guix-daemon.service.in	\
 			 $(top_builddir)/config.status
-	$(AM_V_GEN)$(MKDIR_P) "`dirname $@`";				\
+	$(MKDIR_P) "`dirname "$@"`"
 	$(SED) -e 's|@''bindir''@|$(bindir)|' <				\
-	       "$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp";	\
-	mv "$@.tmp" "$@"
-
-# The '.conf' job for Upstart.
-upstartjobdir = $(libdir)/upstart/system
-nodist_upstartjob_DATA = etc/guix-daemon.conf
-
-etc/guix-daemon.conf: etc/guix-daemon.conf.in	\
-			 $(top_builddir)/config.status
-	$(AM_V_GEN)$(MKDIR_P) "`dirname $@`";				\
-	$(SED) -e 's|@''bindir''@|$(bindir)|' <				\
-	       "$(srcdir)/etc/guix-daemon.conf.in" > "$@.tmp";		\
+	       "$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp"
 	mv "$@.tmp" "$@"

 EXTRA_DIST +=					\
  nix/libstore/schema.sql			\
  nix/AUTHORS					\
  nix/COPYING					\
-  etc/guix-daemon.service.in	\
-  etc/guix-daemon.conf.in
-
-if CAN_RUN_TESTS
+  etc/guix-daemon.service.in

 AM_TESTS_ENVIRONMENT +=				\
  top_builddir="$(abs_top_builddir)"
@@ -217,8 +203,6 @@ AM_TESTS_ENVIRONMENT +=				\
 TESTS +=					\
  tests/guix-daemon.sh

-endif CAN_RUN_TESTS
-
 clean-local:
 	-if test -d "$(GUIX_TEST_ROOT)"; then		\
 	  find "$(GUIX_TEST_ROOT)" | xargs chmod +w;	\
@@ -1,9 +1,6 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
-# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
-# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
-# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -24,18 +21,16 @@ info_TEXINFOS = doc/guix.texi

 DOT_FILES =					\
  doc/images/bootstrap-graph.dot		\
-  doc/images/bootstrap-packages.dot		\
  doc/images/coreutils-graph.dot		\
  doc/images/coreutils-bag-graph.dot		\
  doc/images/service-graph.dot			\
-  doc/images/shepherd-graph.dot
+  doc/images/dmd-graph.dot

 DOT_VECTOR_GRAPHICS =				\
  $(DOT_FILES:%.dot=%.eps)			\
  $(DOT_FILES:%.dot=%.pdf)

 EXTRA_DIST +=					\
-  doc/htmlxref.cnf				\
  doc/contributing.texi				\
  doc/emacs.texi				\
  doc/fdl-1.3.texi				\
@@ -47,8 +42,7 @@ EXTRA_DIST +=					\

 OS_CONFIG_EXAMPLES_TEXI =			\
  doc/os-config-bare-bones.texi			\
-  doc/os-config-desktop.texi			\
-  doc/os-config-lightweight-desktop.texi
+  doc/os-config-desktop.texi

 # Bundle this file so that makeinfo finds it in out-of-source-tree builds.
 BUILT_SOURCES        += $(OS_CONFIG_EXAMPLES_TEXI)
@@ -56,7 +50,7 @@ EXTRA_DIST           += $(OS_CONFIG_EXAMPLES_TEXI)
 MAINTAINERCLEANFILES  = $(OS_CONFIG_EXAMPLES_TEXI)

 doc/os-config-%.texi: gnu/system/examples/%.tmpl
-	$(AM_V_GEN)$(MKDIR_P) "`dirname $@`";	\
+	$(MKDIR_P) "`dirname "$@"`"
 	cp "$<" "$@"

 infoimagedir = $(infodir)/images
@@ -71,19 +65,19 @@ DOT_OPTIONS =					\
  -Nfontsize=9 -Nheight=.1 -Nwidth=.1

 .dot.png:
-	$(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-	mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+	$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$@.tmp"
+	mv "$@.tmp" "$@"

 .dot.pdf:
-	$(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-	mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+	$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$@.tmp"
+	mv "$@.tmp" "$@"

 .dot.eps:
-	$(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-	mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+	$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$@.tmp"
+	mv "$@.tmp" "$@"

 .png.eps:
-	$(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
+	convert "$<" "$@-tmp.eps"
 	mv "$@-tmp.eps" "$@"

 # We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake)
@@ -95,63 +89,55 @@ ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps)		\
 	  $(top_srcdir)/doc/images/coreutils-size-map.eps
 dvi-local: ps-local

-## ----------- ##
-##  Man pages. ##
-## ----------- ##
+
+# Manual pages.

-# The man pages are generated using GNU Help2man.  In makefiles rules they
-# depend not on the binary, but on the source files.  This usage allows a
-# manual page to be generated by the maintainer and included in the
-# distribution without requiring the end-user to have 'help2man' installed.
-# They are built in $(srcdir) like info manuals.
+doc/guix.1: $(SUBCOMMANDS:%=guix/scripts/%.scm)
+	-LANGUAGE= $(top_builddir)/pre-inst-env	\
+	  $(HELP2MAN) --output="$@" guix

-sub_commands_mans =				\
-  $(srcdir)/doc/guix-archive.1			\
-  $(srcdir)/doc/guix-build.1			\
-  $(srcdir)/doc/guix-challenge.1		\
-  $(srcdir)/doc/guix-download.1			\
-  $(srcdir)/doc/guix-edit.1			\
-  $(srcdir)/doc/guix-environment.1		\
-  $(srcdir)/doc/guix-gc.1			\
-  $(srcdir)/doc/guix-hash.1			\
-  $(srcdir)/doc/guix-import.1			\
-  $(srcdir)/doc/guix-lint.1			\
-  $(srcdir)/doc/guix-package.1			\
-  $(srcdir)/doc/guix-publish.1			\
-  $(srcdir)/doc/guix-pull.1			\
-  $(srcdir)/doc/guix-refresh.1			\
-  $(srcdir)/doc/guix-size.1			\
-  $(srcdir)/doc/guix-system.1
+# Note: Do not depend on 'guix-daemon' since that would trigger a rebuild even
+# for people building from a tarball.
+doc/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
+	-LANGUAGE= $(top_builddir)/pre-inst-env	\
+	  $(HELP2MAN) --output="$@" guix-daemon
+
+define subcommand-manual-target
+
+doc/guix-$(1).1: guix/scripts/$(1).scm
+	-LANGUAGE= $(top_builddir)/pre-inst-env		\
+	  $(HELP2MAN) --output="$$@" "guix $(1)"
+
+endef
+
+SUBCOMMANDS :=					\
+  archive					\
+  build						\
+  challenge					\
+  download					\
+  edit						\
+  environment					\
+  gc						\
+  hash						\
+  import					\
+  lint						\
+  package					\
+  publish					\
+  pull						\
+  refresh					\
+  size						\
+  system
+
+$(eval $(foreach subcommand,$(SUBCOMMANDS),			\
+          $(call subcommand-manual-target,$(subcommand))))

 dist_man1_MANS =				\
-  $(srcdir)/doc/guix.1				\
-  $(sub_commands_mans)
-
-gen_man =						\
-  LANGUAGE= $(top_builddir)/pre-inst-env $(HELP2MAN)	\
-  $(HELP2MANFLAGS)
-
-HELP2MANFLAGS = --source=GNU --info-page=$(PACKAGE_TARNAME)
-
-$(srcdir)/doc/guix.1: scripts/guix.in $(sub_commands_mans)
-	-$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
-
-# The 'case' ensures the man pages are only generated if the corresponding
-# source script (the first prerequisite) has been changed.  The $(GOBJECTS)
-# prerequisite is solely meant to force these docs to be made only after all
-# Guile modules have been compiled.
-$(srcdir)/doc/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
-	-@case '$?' in \
-	  *$<*) $(AM_V_P) && set -x || echo "  HELP2MAN $@"; \
-	        $(gen_man) --output="$@" "guix $*";; \
-	  *)    : ;; \
-	esac
+  doc/guix.1					\
+  $(SUBCOMMANDS:%=doc/guix-%.1)

 if BUILD_DAEMON

-dist_man1_MANS += $(srcdir)/doc/guix-daemon.1
-
-$(srcdir)/doc/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
-	-$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
+dist_man1_MANS +=				\
+  doc/guix-daemon.1

 endif
@@ -7,14 +7,6 @@ grow!  Please get in touch with us on @email{guix-devel@@gnu.org} and
 reports, patches, and anything that may be helpful to the project.  We
 particularly welcome help on packaging (@pxref{Packaging Guidelines}).

-@cindex code of conduct, of contributors
-@cindex contributor covenant
-We want to provide a warm, friendly, and harassment-free environment, so
-that anyone can contribute to the best of their abilities.  To this end
-our project uses a ``Contributor Covenant'', which was adapted from
-@url{http://contributor-covenant.org/}.  You can find a local version in
-the @file{CODE-OF-CONDUCT} file in the source tree.
-
@menu
 * Building from Git::           The latest and greatest.
 * Running Guix Before It Is Installed::  Hacker tricks.
@@ -35,47 +27,33 @@ the installation instructions (@pxref{Requirements}).
@item @url{http://gnu.org/software/autoconf/, GNU Autoconf};
@item @url{http://gnu.org/software/automake/, GNU Automake};
@item @url{http://gnu.org/software/gettext/, GNU Gettext};
-@item @url{http://gnu.org/software/texinfo/, GNU Texinfo};
@item @url{http://www.graphviz.org/, Graphviz};
@item @url{http://www.gnu.org/software/help2man/, GNU Help2man (optional)}.
@end itemize

-The easiest way to set up a development environment for Guix is, of
-course, by using Guix!  The following command starts a new shell where
-all the dependencies and appropriate environment variables are set up to
-hack on Guix:
+Run @command{./bootstrap} to download the Nix daemon source code and to
+generate the build system infrastructure using autoconf.  It reports an
+error if an inappropriate version of the above packages is being used.

-@example
-guix environment guix
-@end example
-
-@xref{Invoking guix environment}, for more information on that command.
-Extra dependencies can be added with @option{--ad-hoc}:
-
-@example
-guix environment guix --ad-hoc help2man git strace
-@end example
-
-Run @command{./bootstrap} to generate the build system infrastructure
-using Autoconf and Automake.  If you get an error like this one:
+@noindent
+If you get an error like this one:

@example
 configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES
@end example

-@noindent
 it probably means that Autoconf couldn’t find @file{pkg.m4}, which is
-provided by pkg-config.  Make sure that @file{pkg.m4} is available.  The
-same holds for the @file{guile.m4} set of macros provided by Guile.  For
-instance, if you installed Automake in @file{/usr/local}, it wouldn’t
-look for @file{.m4} files in @file{/usr/share}.  In that case, you have
-to invoke the following command:
+provided by @command{pkg-config}.  Make sure that @file{pkg.m4} is
+available.  For instance, if you installed Automake in
+@file{/usr/local}, it wouldn’t look for @file{.m4} files in
+@file{/usr/share}.  So you have to invoke the following command in that
+case

@example
 export ACLOCAL_PATH=/usr/share/aclocal
@end example

-@xref{Macro Search Path,,, automake, The GNU Automake Manual}, for
+See @pxref{Macro Search Path,,, automake, The GNU Automake Manual} for
 more information.

 Then, run @command{./configure} as usual.
@@ -108,46 +86,11 @@ Similarly, for a Guile session using the Guix modules:

@example
 $ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'
-
-;;; ("x86_64-linux")
-@end example
-
-@noindent
-@cindex REPL
-@cindex read-eval-print loop
-@dots{} and for a REPL (@pxref{Using Guile Interactively,,, guile, Guile
-Reference Manual}):
-
-@example
-$ ./pre-inst-env guile
-scheme@@(guile-user)> ,use(guix)
-scheme@@(guile-user)> ,use(gnu)
-scheme@@(guile-user)> (define snakes
-                       (fold-packages
-                         (lambda (package lst)
-                           (if (string-prefix? "python"
-                                               (package-name package))
-                               (cons package lst)
-                               lst))
-                         '()))
-scheme@@(guile-user)> (length snakes)
-$1 = 361
@end example

 The @command{pre-inst-env} script sets up all the environment variables
 necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}.

-Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the
-local source tree; it simply updates the @file{~/.config/guix/latest}
-symlink (@pxref{Invoking guix pull}).  Run @command{git pull} instead if
-you want to upgrade your local source tree.@footnote{If you would like
-to set up @command{guix} to use your Git checkout, you can point the
-@file{~/.config/guix/latest} symlink to your Git checkout directory.
-If you are the sole user of your system, you may also consider pointing
-the @file{/root/.config/guix/latest} symlink to point to
-@file{~/.config/guix/latest}; this way it will always use the same
-@command{guix} as your user does.}
-

@node The Perfect Setup
@section The Perfect Setup
@@ -168,8 +111,7 @@ that it finds source files from your checkout:

@lisp
 ;; @r{Assuming the Guix checkout is in ~/src/guix.}
-(with-eval-after-load 'geiser-guile
-  (add-to-list 'geiser-guile-load-path "~/src/guix"))
+(add-to-list 'geiser-guile-load-path "~/src/guix")
@end lisp

 To actually edit the code, Emacs already has a neat Scheme mode.  But in
@@ -293,34 +235,18 @@ not affected by the change; @code{guix refresh --list-dependent
@var{package}} will help you do that (@pxref{Invoking guix refresh}).

@item
-@cindex determinism, of build processes
-@cindex reproducible builds, checking
 Check whether the package's build process is deterministic.  This
 typically means checking whether an independent build of the package
 yields the exact same result that you obtained, bit for bit.

-A simple way to do that is by building the same package several times in
-a row on your machine (@pxref{Invoking guix build}):
-
-@example
-guix build --rounds=2 my-package
-@end example
-
-This is enough to catch a class of common non-determinism issues, such
-as timestamps or randomly-generated output in the build result.
-
-Another option is to use @command{guix challenge} (@pxref{Invoking guix
-challenge}).  You may run it once the package has been committed and
-built by @code{hydra.gnu.org} to check whether it obtains the same
-result as you did.  Better yet: Find another machine that can build it
-and run @command{guix publish}.  Since the remote build machine is
-likely different from yours, this can catch non-determinism issues
-related to the hardware---e.g., use of different instruction set
-extensions---or to the operating system kernel---e.g., reliance on
-@code{uname} or @file{/proc} files.
+A simple way to do that is with @command{guix challenge}
+(@pxref{Invoking guix challenge}).  You may run it once the package has
+been committed and built by @code{hydra.gnu.org} to check whether it
+obtains the same result as you did.  Better yet: Find another machine
+that can build it and run @command{guix publish}.

@end enumerate

-When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as
-a subject.  You may use your email client or the @command{git
-send-email} command.
+When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as a
+subject.  You may use your email client or the @command{git send-mail}
+command.
@@ -9,13 +9,11 @@ Guix convenient and fun.
@menu
 * Initial Setup: Emacs Initial Setup.	Preparing @file{~/.emacs}.
 * Package Management: Emacs Package Management.	Managing packages and generations.
-* Licenses: Emacs Licenses.		Interface for licenses of Guix packages.
 * Popup Interface: Emacs Popup Interface.	Magit-like interface for guix commands.
 * Prettify Mode: Emacs Prettify.	Abbreviating @file{/gnu/store/@dots{}} file names.
 * Build Log Mode: Emacs Build Log.	Highlighting Guix build logs.
 * Completions: Emacs Completions.	Completing @command{guix} shell command.
 * Development: Emacs Development.	Tools for Guix developers.
-* Hydra: Emacs Hydra.			Interface for Guix build farm.
@end menu


@@ -48,19 +46,13 @@ command (@pxref{Emacs Popup Interface}).

@end itemize

-When it is done, ``guix.el'' may be configured by requiring
-@code{guix-autoloads} file.  If you install Guix in your user profile,
-this auto-loading is done automatically by our Emacs package
-(@pxref{Application Setup}), so a universal recipe for configuring
-``guix.el'' is: @command{guix package -i guix}.  If you do this, there
-is no need to read further.
-
-For the manual installation, you need to add the following code into
-your init file (@pxref{Init File,,, emacs, The GNU Emacs Manual}):
+When it is done ``guix.el'' may be configured by requiring a special
+@code{guix-init} file---i.e., by adding the following code into your
+init file (@pxref{Init File,,, emacs, The GNU Emacs Manual}):

@example
 (add-to-list 'load-path "/path/to/directory-with-guix.el")
-(require 'guix-autoloads nil t)
+(require 'guix-init nil t)
@end example

 So the only thing you need to figure out is where the directory with
@@ -72,19 +64,17 @@ If it was installed by a package manager of your distribution or by a
 usual @code{./configure && make && make install} command sequence, then
 elisp files are placed in a standard directory with Emacs packages
 (usually it is @file{/usr/share/emacs/site-lisp/}), which is already in
-@code{load-path}, so there is no need to add that directory there.  Note
-that if you don't update this installation periodically, you may get an
-outdated Emacs code which does not work with the current Guile code of
-Guix.
+@code{load-path}, so there is no need to add that directory there.

@item
 If you used a binary installation method (@pxref{Binary Installation}),
 then Guix is installed somewhere in the store, so the elisp files are
 placed in @file{/gnu/store/@dots{}-guix-0.8.2/share/emacs/site-lisp/} or
 alike.  However it is not recommended to refer directly to a store
-directory, as it may be garbage-collected one day.  So a better choice
-would be to install Guix using Guix itself with @command{guix package -i
-guix}.
+directory.  Instead you can install Guix using Guix itself with
+@command{guix package -i guix} command (@pxref{Invoking guix package})
+and add @file{~/.guix-profile/share/emacs/site-lisp/} directory to
+@code{load-path} variable.

@item
 If you did not install Guix at all and prefer a hacking way
@@ -96,10 +86,26 @@ same directory, so your final configuration will look like this:
 (let ((dir "/path/to/your-guix-git-tree/emacs"))
  (add-to-list 'load-path dir)
  (setq guix-load-path dir))
-(require 'guix-autoloads nil t)
+(require 'guix-init nil t)
@end example
@end itemize

+By default, along with autoloading (@pxref{Autoload,,, elisp, The GNU
+Emacs Lisp Reference Manual}) the main interactive commands for
+``guix.el'' (@pxref{Emacs Commands}), requiring @code{guix-init} will
+also autoload commands for the Emacs packages installed in your user
+profile.
+
+To disable automatic loading of installed Emacs packages, set
+@code{guix-package-enable-at-startup} variable to @code{nil} before
+requiring @code{guix-init}.  This variable has the same meaning for
+Emacs packages installed with Guix, as @code{package-enable-at-startup}
+for the built-in Emacs package system (@pxref{Package Installation,,,
+emacs, The GNU Emacs Manual}).
+
+You can activate Emacs packages installed in your profile whenever you
+want using @kbd{M-x@tie{}guix-emacs-load-autoloads}.
+

@node Emacs Package Management
@section Package Management
@@ -142,33 +148,19 @@ Commands for displaying packages:
 Display all/newest available packages.

@item M-x guix-installed-packages
-@itemx M-x guix-installed-user-packages
-@itemx M-x guix-installed-system-packages
-Display installed packages.  As described above, @kbd{M-x
-guix-installed-packages} uses an arbitrary profile that you can specify,
-while the other commands display packages installed in 2 special
-profiles: @file{~/.guix-profile} and @file{/run/current-system/profile}
-(only on GuixSD).
+Display all installed packages.

@item M-x guix-obsolete-packages
 Display obsolete packages (the packages that are installed in a profile
 but cannot be found among available packages).

-@item M-x guix-packages-by-name
+@item M-x guix-search-by-name
 Display package(s) with the specified name.

-@item M-x guix-packages-by-license
-Display package(s) with the specified license.
-
@item M-x guix-search-by-regexp
 Search for packages by a specified regexp.  By default ``name'',
 ``synopsis'' and ``description'' of the packages will be searched.  This
-can be changed by modifying @code{guix-package-search-params} variable.
-
-@item M-x guix-search-by-name
-Search for packages with names matching a specified regexp.  This
-command is the same as @code{guix-search-by-regexp}, except only a
-package ``name'' is searched.
+can be changed by modifying @code{guix-search-params} variable.

@end table

@@ -198,14 +190,6 @@ date/time prompt,,, org, The Org Manual}).

@end table

-Analogously on GuixSD you can also display system generations:
-
-@table @kbd
-@item M-x guix-system-generations
-@item M-x guix-last-system-generations
-@item M-x guix-system-generations-by-time
-@end table
-
 You can also invoke the @command{guix pull} command (@pxref{Invoking
 guix pull}) from Emacs using:

@@ -217,31 +201,6 @@ With @kbd{C-u}, make it verbose.
 Once @command{guix pull} has succeeded, the Guix REPL is restared.  This
 allows you to keep using the Emacs interface with the updated Guix.

-Finally, there is an Emacs variant of @command{guix edit} command
-(@pxref{Invoking guix edit}):
-
-@table @kbd
-@item M-x guix-edit
-As with @kbd{M-x guix-packages-by-name}, you can press @key{TAB} to
-complete a package name.
-@end table
-
-If you are contributing to Guix, you may find it useful for @kbd{M-x
-guix-edit} to open package files from your git directory.  This can be
-done by setting @code{guix-directory} variable.  For example, after
-this:
-
-@example
-(setq guix-directory "~/src/guix")
-@end example
-
-@kbd{M-x guix-edit guix} opens
-@file{~/src/guix/gnu/packages/package-management.scm} file.
-
-Also you can use @kbd{C-u} prefix argument to specify a directory just
-for the current @kbd{M-x guix-edit} command.
-
-
@node Emacs General info
@subsection General information

@@ -268,8 +227,6 @@ prefix argument is used.  This has the same meaning as @code{--manifest}
 option (@pxref{Invoking guix package}).

@item C-c C-z
-@cindex REPL
-@cindex read-eval-print loop
 Go to the Guix REPL (@pxref{The REPL,,, geiser, Geiser User Manual}).

@item h
@@ -328,8 +285,6 @@ similar to @command{guix edit} command (@pxref{Invoking guix edit}), but
 for opening a package recipe in the current Emacs instance.
@item x
 Execute actions on the marked packages.
-@item B
-Display latest builds of the current package (@pxref{Emacs Hydra}).
@end table

 A ``generation-list'' buffer additionally provides the following
@@ -382,7 +337,6 @@ emacs, The GNU Emacs Manual}) which can be used to:
@item install/remove a package;
@item jump to a package location;
@item browse home page of a package;
-@item browse license URL;
@item describe packages from ``Inputs'' fields.
@end itemize

@@ -458,7 +412,7 @@ changed with the following variables:

 By default, the name of a profile is also displayed in a ``list'' or
 ``info'' buffer name.  To change this behavior, use
-@code{guix-ui-buffer-name-function} variable.
+@code{guix-buffer-name-function} variable.

 For example, if you want to display all types of results in a single
 buffer (in such case you will probably use a history (@kbd{l}/@kbd{r})
@@ -472,7 +426,8 @@ extensively), you may do it like this:
   guix-generation-list-buffer-name name
   guix-package-info-buffer-name    name
   guix-output-info-buffer-name     name
-   guix-generation-info-buffer-name name))
+   guix-generation-info-buffer-name name
+   guix-buffer-name-function        #'guix-buffer-name-simple))
@end example

@node Emacs Keymaps
@@ -482,12 +437,8 @@ If you want to change default key bindings, use the following keymaps
 (@pxref{Init Rebinding,,, emacs, The GNU Emacs Manual}):

@table @code
-@item guix-buffer-map
-Parent keymap with general keys for any buffer type.
-
-@item guix-ui-map
-Parent keymap with general keys for buffers used for Guix package
-management (for packages, outputs and generations).
+@item guix-root-map
+Parent keymap with general keys for all guix modes.

@item guix-list-mode-map
 Parent keymap with general keys for ``list'' buffers.
@@ -522,49 +473,28 @@ Keymap with keys available when a point is placed on a button.
@subsubsection Appearance

 You can change almost any aspect of ``list'' / ``info'' buffers using
-the following variables (@dfn{ENTRY-TYPE} means @code{package},
-@code{output} or @code{generation}):
+the following variables:

@table @code
-@item guix-ENTRY-TYPE-list-format
-@itemx guix-ENTRY-TYPE-list-titles
+@item guix-list-column-format
+@itemx guix-list-column-titles
+@itemx guix-list-column-value-methods
 Specify the columns, their names, what and how is displayed in ``list''
 buffers.

-@item guix-ENTRY-TYPE-info-format
-@itemx guix-ENTRY-TYPE-info-titles
-@itemx guix-info-ignore-empty-values
+@item guix-info-displayed-params
+@itemx guix-info-insert-methods
+@itemx guix-info-ignore-empty-vals
@itemx guix-info-param-title-format
@itemx guix-info-multiline-prefix
@itemx guix-info-indent
-@itemx guix-info-fill
+@itemx guix-info-fill-column
@itemx guix-info-delimiter
 Various settings for ``info'' buffers.

@end table


-@node Emacs Licenses
-@section Licenses
-
-If you want to browse the URL of a particular license, or to look at a
-list of licenses, you may use the following commands:
-
-@table @kbd
-
-@item M-x guix-browse-license-url
-Choose a license from a completion list to browse its URL using
-@code{browse-url} function (@pxref{Browse-URL,,, emacs, The GNU Emacs
-Manual}).
-
-@item M-x guix-licenses
-Display a list of available licenses.  You can press @kbd{@key{RET}}
-there to display packages with this license in the same way as @kbd{M-x
-guix-packages-by-license} would do (@pxref{Emacs Commands}).
-
-@end table
-
-
@node Emacs Popup Interface
@section Popup Interface

@@ -601,7 +531,7 @@ GNU Emacs Manual}).

@end itemize

-Several commands (@command{guix graph}, @command{guix system shepherd-graph}
+Several commands (@command{guix graph}, @command{guix system dmd-graph}
 and @command{guix system extension-graph}) also have a ``View graph''
 action, which allows you to view a generated graph using @command{dot}
 command (specified by @code{guix-dot-program} variable).  By default a
@@ -714,11 +644,12 @@ Toggle (show/hide) the bodies of all build phases.
@end table

 There is also @kbd{M-x guix-build-log-minor-mode} which also provides
-the same highlighting and the same key bindings as the major mode, but
-prefixed with @kbd{C-c}.  By default, this minor mode is enabled in
-shell buffers (@pxref{Interactive Shell,,, emacs, The GNU Emacs
-Manual}).  If you don't like it, set
-@code{guix-build-log-minor-mode-activate} to nil.
+the same highlighting (but not key bindings).  And as it is a minor
+mode, it can be enabled in any buffer.  For example, if you are building
+some package in a shell buffer (@pxref{Interactive Shell,,, emacs, The
+GNU Emacs Manual}), you may enable @command{guix-build-log-minor-mode}
+to make it more colorful.  Guix build output is rather specific, so this
+new highlighting shouldn't conflict with the existing one.


@node Emacs Completions
@@ -806,41 +737,3 @@ evaluation will be finished in the REPL.
 Alternatively, to avoid this limitation, you may just run another Geiser
 REPL, and while something is being evaluated in the previous REPL, you
 can continue editing a scheme file with the help of the current one.
-
-
-@node Emacs Hydra
-@section Hydra
-
-The continuous integration server at @code{hydra.gnu.org} builds all
-the distribution packages on the supported architectures and serves
-them as substitutes (@pxref{Substitutes}).  Continuous integration is
-currently orchestrated by @uref{https://nixos.org/hydra/, Hydra}.
-
-This section describes an Emacs interface to query Hydra to know the
-build status of specific packages, discover recent and ongoing builds,
-view build logs, and so on.  This interface is mostly the same as the
-``list''/``info'' interface for displaying packages and generations
-(@pxref{Emacs Package Management}).
-
-The following commands are available:
-
-@table @kbd
-
-@item M-x guix-hydra-latest-builds
-Display latest failed or successful builds (you will be prompted for a
-number of builds).  With @kbd{C-u}, you will also be prompted for other
-parameters (project, jobset, job and system).
-
-@item M-x guix-hydra-queued-builds
-Display scheduled or currently running builds (you will be prompted for
-a number of builds).
-
-@item M-x guix-hydra-jobsets
-Display available jobsets (you will be prompted for a project).
-
-@end table
-
-In a list of builds you can press @kbd{L} key to display a build log of
-the current build.  Also both a list of builds and a list of jobsets
-provide @kbd{B} key to display latest builds of the current job or
-jobset (don't forget about @kbd{C-u}).
@@ -1,652 +0,0 @@
-# htmlxref.cnf - reference file for free Texinfo manuals on the web.
-# Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual.
-
-htmlxrefversion=2016-02-21.21; # UTC
-
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
-# 
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-#
-# The latest version of this file is available at
-# http://ftpmirror.gnu.org/texinfo/htmlxref.cnf.
-# Email corrections or additions to bug-texinfo@gnu.org.
-# The primary goal is to list all relevant GNU manuals;
-# other free manuals are also welcome.
-#
-# To be included in this list, a manual must:
-#
-# - have a generic url, e.g., no version numbers;
-# - have a unique file name (e.g., manual identifier), i.e., be related to the
-#   package name.  Things like "refman" or "tutorial" don't work.
-# - follow the naming convention for nodes described at
-# http://www.gnu.org/software/texinfo/manual/texinfo/html_node/HTML-Xref.html
-#   This is what makeinfo and texi2html implement.
-# 
-# Unless the above criteria are met, it's not possible to generate
-# reliable cross-manual references.
-# 
-# For information on automatically generating all the useful formats for
-# a manual to put on the web, see
-# http://www.gnu.org/prep/maintain/html_node/Manuals-on-Web-Pages.html.
-
-# For people editing this file: when a manual named foo is related to a
-# package named bar, the url should contain a variable reference ${BAR}.
-# Otherwise, the gnumaint scripts have no way of knowing they are
-# associated, and thus gnu.org/manual can't include them.
-
-# shorten references to manuals on www.gnu.org.
-G = http://www.gnu.org
-GS = ${G}/software
-
-3dldf		mono	${GS}/3dldf/manual/user_ref/3DLDF.html
-3dldf		node	${GS}/3dldf/manual/user_ref/
-
-alive		mono	${GS}/alive/manual/alive.html
-alive		node	${GS}/alive/manual/html_node/
-
-anubis		chapter	${GS}/anubis/manual/html_chapter/
-anubis		section	${GS}/anubis/manual/html_section/
-anubis		node	${GS}/anubis/manual/html_node/
-
-artanis		mono	${GS}/artanis/manual/artanis.html
-artanis		node	${GS}/artanis/manual/html_node/
-
-aspell		section	http://aspell.net/man-html/index.html
-
-auctex		mono	${GS}/auctex/manual/auctex.html
-auctex		node	${GS}/auctex/manual/auctex/
-
-autoconf	mono	${GS}/autoconf/manual/autoconf.html
-autoconf	node	${GS}/autoconf/manual/html_node/
-
-autogen		mono	${GS}/autogen/manual/html_mono/autogen.html
-autogen		chapter	${GS}/autogen/manual/html_chapter/
-autogen		node	${GS}/autoconf/manual/html_node/
-
-automake	mono	${GS}/automake/manual/automake.html
-automake	node	${GS}/automake/manual/html_node/
-
-avl		node	http://www.stanford.edu/~blp/avl/libavl.html/
-
-bash		mono	${GS}/bash/manual/bash.html
-bash		node	${GS}/bash/manual/html_node/
-
-BINUTILS = http://sourceware.org/binutils/docs
-binutils	node	${BINUTILS}/binutils/
- as		node	${BINUTILS}/as/
- bfd		node	${BINUTILS}/bfd/
- gprof		node	${BINUTILS}/gprof/
- ld		node	${BINUTILS}/ld/
-
-bison		mono	${GS}/bison/manual/bison.html
-bison		node	${GS}/bison/manual/html_node/
-
-bpel2owfn	mono	${GS}/bpel2owfn/manual/2.0.x/bpel2owfn.html
-
-ccd2cue		mono	${GS}/ccd2cue/manual/ccd2cue.html
-ccd2cue		node	${GS}/ccd2cue/manual/html_node/
-
-cflow		mono	${GS}/cflow/manual/cflow.html
-cflow		node	${GS}/cflow/manual/html_node/
-
-chess		mono	${GS}/chess/manual/gnuchess.html
-chess		node	${GS}/chess/manual/html_node/
-
-combine		mono	${GS}/combine/manual/combine.html
-combine		chapter	${GS}/combine/manual/html_chapter/
-combine		section	${GS}/combine/manual/html_section/
-combine		node	${GS}/combine/manual/html_node/
-
-complexity	mono	${GS}/complexity/manual/complexity.html
-complexity	node	${GS}/complexity/manual/html_node/
-
-coreutils	mono	${GS}/coreutils/manual/coreutils
-coreutils	node	${GS}/coreutils/manual/html_node/
-
-cpio		mono	${GS}/cpio/manual/cpio
-cpio		node	${GS}/cpio/manual/html_node/
-
-cssc		node	${GS}/cssc/manual/
-
-#cvs cannot be handled here; see http://ximbiot.com/cvs/manual.
-
-ddd		mono	${GS}/ddd/manual/html_mono/ddd.html
-
-ddrescue	mono	${GS}/ddrescue/manual/ddrescue_manual.html
-
-DICO = http://puszcza.gnu.org.ua/software/dico/manual
-dico		mono	${DICO}/dico.html
-dico		chapter	${DICO}/html_chapter/
-dico		section	${DICO}/html_section/
-dico		node	${DICO}/html_node/
-
-diffutils	mono	${GS}/diffutils/manual/diffutils
-diffutils	node	${GS}/diffutils/manual/html_node/
-
-ed		mono	${GS}/ed/manual/ed_manual.html
-
-EMACS = ${GS}/emacs/manual
-emacs		mono	${EMACS}/html_mono/emacs.html
-emacs		node	${EMACS}/html_node/emacs/
- #
- ada-mode	mono	${EMACS}/html_mono/ada-mode.html
- ada-mode	node	${EMACS}/html_node/ada-mode/
- #
- autotype	mono	${EMACS}/html_mono/autotype.html
- autotype	node	${EMACS}/html_node/autotype/
- #
- ccmode		mono	${EMACS}/html_mono/ccmode.html
- ccmode		node	${EMACS}/html_node/ccmode/
- #
- cl		mono	${EMACS}/html_mono/cl.html
- cl		node	${EMACS}/html_node/cl/
- #
- ebrowse	mono	${EMACS}/html_mono/ebrowse.html
- ebrowse	node	${EMACS}/html_node/ebrowse/
- #
- ediff		mono	${EMACS}/html_mono/ediff.html
- ediff		node	${EMACS}/html_node/ediff/
- #
- eieio		mono	${EMACS}/html_mono/eieio.html
- eieio		node	${EMACS}/html_node/eieio/
- #
- elisp		mono	${EMACS}/html_mono/elisp.html
- elisp		node	${EMACS}/html_node/elisp/
- #
- epa		mono	${EMACS}/html_mono/epa.html
- epa		node	${EMACS}/html_node/epa/
- #
- erc		mono	${EMACS}/html_mono/erc.html
- erc		node	${EMACS}/html_node/erc/
- #
- dired-x	mono	${EMACS}/html_mono/dired-x.html
- dired-x	node	${EMACS}/html_node/dired-x/
- #
- eshell		mono	${EMACS}/html_mono/eshell.html
- eshell		node	${EMACS}/html_node/eshell/
- #
- flymake	mono	${EMACS}/html_mono/flymake.html
- flymake	node	${EMACS}/html_node/flymake/
- #
- gnus		mono	${EMACS}/html_mono/gnus.html
- gnus		node	${EMACS}/html_node/gnus/
- #
- idlwave	mono	${EMACS}/html_mono/idlwave.html
- idlwave	node	${EMACS}/html_node/idlwave/
- #
- message	mono	${EMACS}/html_mono/message.html
- message	node	${EMACS}/html_node/message/
- #
- mh-e		mono	${EMACS}/html_mono/mh-e.html
- mh-e		node	${EMACS}/html_node/mh-e/
- #
- nxml-mode	mono	${EMACS}/html_mono/nxml-mode.html
- nxml-mode	node	${EMACS}/html_node/nxml-mode/
- #
- org		mono	${EMACS}/html_mono/org.html
- org		node	${EMACS}/html_node/org/
- #
- pcl-cvs	mono	${EMACS}/html_mono/pcl-cvs.html
- pcl-cvs	node	${EMACS}/html_node/pcl-cvs/
- #
- rcirc		mono	${EMACS}/html_mono/rcirc.html
- rcirc		node	${EMACS}/html_node/rcirc/
- #
- semantic	mono	${EMACS}/html_mono/semantic.html
- semantic	node	${EMACS}/html_node/semantic/
- #
- smtp		mono	${EMACS}/html_mono/smtpmail.html
- smtp		node	${EMACS}/html_node/smtpmail/
- #
- speedbar	mono	${EMACS}/html_mono/speedbar.html
- speedbar	node	${EMACS}/html_node/speedbar/
- #
- tramp		mono	${EMACS}/html_mono/tramp.html
- tramp		node	${EMACS}/html_node/tramp/
- #
- vip		mono	${EMACS}/html_mono/vip.html
- vip		node	${EMACS}/html_node/vip/
- #
- viper		mono	${EMACS}/html_mono/viper.html
- viper		node	${EMACS}/html_node/viper/
- #
- woman		mono	${EMACS}/html_mono/woman.html
- woman		node	${EMACS}/html_node/woman/
- # (end emacs manuals)
-
-easejs		mono	${GS}/easejs/manual/easejs.html
-easejs		node	${GS}/easejs/manual/
-
-emacs-muse	node	${GS}/emacs-muse/manual/muse.html
-emacs-muse	node	${GS}/emacs-muse/manual/html_node/
-
-emms		node	${GS}/emms/manual/
-
-findutils	mono	${GS}/findutils/manual/html_mono/find.html
-findutils	node	${GS}/findutils/manual/html_node/find_html
-
-FLEX = http://flex.sourceforge.net
-flex		node	${FLEX}/manual/
-
-gama		mono	${GS}/gama/manual/gama.html
-gama		node	${GS}/gama/manual/html_node/
-
-GAWK = ${GS}/gawk/manual
-gawk		mono	${GAWK}/gawk.html
-gawk		node	${GAWK}/html_node/
- gawkinet	mono	${GAWK}/gawkinet/gawkinet.html
- gawkinet	node	${GAWK}/gawkinet/html_node/
-
-gcal		mono	${GS}/gcal/manual/gcal.html
-gcal		node	${GS}/gcal/manual/html_node/
-
-GCC = http://gcc.gnu.org/onlinedocs
-gcc		node	${GCC}/gcc/
- cpp		node	${GCC}/cpp/
- gcj		node	${GCC}/gcj/
- gfortran	node	${GCC}/gfortran/
- gnat_rm	node	${GCC}/gnat_rm/
- gnat_ugn_unw	node	${GCC}/gnat_ugn_unw/
- libgomp	node	${GCC}/libgomp/
- libstdc++	node	${GCC}/libstdc++/
- #
- gccint		node	${GCC}/gccint/
- cppinternals	node	${GCC}/cppinternals/
- gfc-internals	node	${GCC}/gfc-internals/
- gnat-style	node	${GCC}/gnat-style/
- libiberty	node	${GCC}/libiberty/
-
-GDB = http://sourceware.org/gdb/current/onlinedocs
-gdb		node	${GDB}/gdb/
- stabs		node	${GDB}/stabs/
-
-GDBM = http://www.gnu.org.ua/software/gdbm/manual
-gdbm		mono	${GDBM}/gdbm.html
-gdbm		chapter	${GDBM}/html_chapter/
-gdbm		section ${GDBM}/html_section/
-gdbm		node	${GDBM}/html_node/
-
-gettext		mono	${GS}/gettext/manual/gettext.html
-gettext		node	${GS}/gettext/manual/html_node/
-
-gforth		node	http://www.complang.tuwien.ac.at/forth/gforth/Docs-html/
-
-global		mono	${GS}/global/manual/global.html
-
-gmediaserver	node	${GS}/gmediaserver/manual/
-
-gmp		node	http://www.gmplib.org/manual/
-
-gnu-arch	node	${GS}/gnu-arch/tutorial/
-
-gnu-c-manual	mono	${GS}/gnu-c-manual/gnu-c-manual.html
-
-gnu-crypto	node	${GS}/gnu-crypto/manual/
-
-gnubg		mono	${GS}/gnubg/manual/gnubg.html
-gnubg		node	${GS}/gnubg/manual/html_node/
-
-gnubik		mono	${GS}/gnubik/manual/gnubik.html
-gnubik		node	${GS}/gnubik/manual/html_node/
-
-gnulib		mono	${GS}/gnulib/manual/gnulib.html
-gnulib		node	${GS}/gnulib/manual/html_node/
-
-GNUN = ${GS}/trans-coord/manual
-gnun		mono	${GNUN}/gnun/gnun.html
-gnun		node	${GNUN}/gnun/html_node/
- web-trans	mono	${GNUN}/web-trans/web-trans.html
- web-trans	node	${GNUN}/web-trans/html_node/
-
-GNUPG = http://www.gnupg.org/documentation/manuals
-gnupg		node	${GNUPG}/gnupg/
- dirmngr	node	${GNUPG}/dirmngr/
- gcrypt		node	${GNUPG}/gcrypt/
- libgcrypt	node	${GNUPG}/gcrypt/
- ksba		node	${GNUPG}/ksba/
- assuan		node	${GNUPG}/assuan/
- gpgme		node	${GNUPG}/gpgme/
-
-gnuprologjava	node	${GS}/gnuprologjava/manual/
-
-gnuschool	mono	${GS}/gnuschool/gnuschool.html
-
-GNUSTANDARDS = ${G}/prep
- maintain	mono	${GNUSTANDARDS}/maintain/maintain.html
- maintain	node	${GNUSTANDARDS}/maintain/html_node/
- #
- standards	mono	${GNUSTANDARDS}/standards/standards.html
- standards	node	${GNUSTANDARDS}/standards/html_node/
-
-gnutls		mono	http://gnutls.org/manual/gnutls.html
-gnutls		node	http://gnutls.org/manual/html_node/
-
-gnutls-guile	mono	http://gnutls.org/manual/gnutls-guile.html
-gnutls-guile	node	http://gnutls.org/manual/gnutls-guile/index.html
-
-gperf		mono	${GS}/gperf/manual/gperf.html
-gperf		node	${GS}/gperf/manual/html_node/
-
-grep		mono	${GS}/grep/manual/grep.html
-grep		node	${GS}/grep/manual/html_node/
-
-groff		node	${GS}/groff/manual/html_node/
-
-GRUB = ${GS}/grub/manual
-  grub		mono	${GRUB}/grub.html
-  grub		node	${GRUB}/html_node/
-  #
-  multiboot	mono	${GRUB}/multiboot/multiboot.html
-  multiboot	node	${GRUB}/multiboot/html_node/
-
-gsasl		mono	${GS}/gsasl/manual/gsasl.html
-gsasl		node	${GS}/gsasl/manual/html_node/
-
-gsl		node	${GS}/gsl/manual/html_node/
-
-gsrc		mono	${GS}/gsrc/manual/gsrc.html
-gsrc		node	${GS}/gsrc/manual/html_node/
-
-gss		mono	${GS}/gss/manual/gss.html
-gss		node	${GS}/gss/manual/html_node/
-
-gtypist		mono	${GS}/gtypist/doc/
-
-guile		mono	${GS}/guile/manual/guile.html
-guile		node	${GS}/guile/manual/html_node/
-
-guile-avahi	mono	http://nongnu.org/guile-avahi/doc/guile-avahi.html
-
-GUILE_GNOME = ${GS}/guile-gnome/docs
- gobject 	node	${GUILE_GNOME}/gobject/html/
- glib		node	${GUILE_GNOME}/glib/html/
- atk		node	${GUILE_GNOME}/atk/html/
- pango		node	${GUILE_GNOME}/pango/html/
- pangocairo	node	${GUILE_GNOME}/pangocairo/html/
- gdk		node	${GUILE_GNOME}/gdk/html/
- gtk		node	${GUILE_GNOME}/gtk/html/
- libglade	node	${GUILE_GNOME}/libglade/html/
- gnome-vfs	node	${GUILE_GNOME}/gnome-vfs/html/
- libgnomecanvas	node	${GUILE_GNOME}/libgnomecanvas/html/
- gconf		node	${GUILE_GNOME}/gconf/html/
- libgnome	node	${GUILE_GNOME}/libgnome/html/
- libgnomeui	node	${GUILE_GNOME}/libgnomeui/html/
- corba		node	${GUILE_GNOME}/corba/html/
- clutter	node	${GUILE_GNOME}/clutter/html/
- clutter-glx	node	${GUILE_GNOME}/clutter-glx/html/
-
-guile-gtk	node	${GS}/guile-gtk/docs/guile-gtk/
-
-guile-rpc	mono	${GS}/guile-rpc/manual/guile-rpc.html
-guile-rpc	node	${GS}/guile-rpc/manual/html_node/
-
-guix		mono	${GS}/guix/manual/guix.html
-guix		node	${GS}/guix/manual/html_node/
-
-gv		mono	${GS}/gv/manual/gv.html
-gv		node	${GS}/gv/manual/html_node/
-
-gzip		mono	${GS}/gzip/manual/gzip.html
-gzip		node	${GS}/gzip/manual/html_node/
-
-hello		mono	${GS}/hello/manual/hello.html
-hello		node	${GS}/hello/manual/html_node/
-
-help2man	mono	${GS}/help2man/help2man.html
-
-idutils		mono	${GS}/idutils/manual/idutils.html
-idutils		node	${GS}/idutils/manual/html_node/
-
-inetutils	mono	${GS}/inetutils/manual/inetutils.html
-inetutils	node	${GS}/inetutils/manual/html_node/
-
-jwhois		mono	${GS}/jwhois/manual/jwhois.html
-jwhois		node	${GS}/jwhois/manual/html_node/
-
-libc		mono	${GS}/libc/manual/html_mono/libc.html
-libc		node	${GS}/libc/manual/html_node/
-
-LIBCDIO = ${GS}/libcdio
- libcdio	mono	${LIBCDIO}/libcdio.html
- cd-text	mono	${LIBCDIO}/cd-text-format.html
-
-libextractor	mono	${GS}/libextractor/manual/libextractor.html
-libextractor	node	${GS}/libextractor/manual/html_node/
-
-libidn		mono	${GS}/libidn/manual/libidn.html
-libidn		node	${GS}/libidn/manual/html_node/
-
-librejs		mono	${GS}/librejs/manual/librejs.html
-librejs		node	${GS}/librejs/manual/html_node/
-
-libmatheval	mono	${GS}/libmatheval/manual/libmatheval.html
-
-LIBMICROHTTPD = ${GS}/libmicrohttpd
-libmicrohttpd		mono	${LIBMICROHTTPD}/manual/libmicrohttpd.html
-libmicrohttpd		node	${LIBMICROHTTPD}/manual/html_node/
- microhttpd-tutorial	mono	${LIBMICROHTTPD}/tutorial.html
-
-libtasn1	mono	${GS}/libtasn1/manual/libtasn1.html
-libtasn1	node	${GS}/libtasn1/manual/html_node/
-
-libtool		mono	${GS}/libtool/manual/libtool.html
-libtool		node	${GS}/libtool/manual/html_node/
-
-lightning	mono	${GS}/lightning/manual/lightning.html
-lightning	node	${GS}/lightning/manual/html_node/
-
-# The stable/ url redirects immediately, but that's ok.
-# The .html extension is omitted on their web site, but it works if given.
-LILYPOND = http://lilypond.org/doc/stable/Documentation
- lilypond-internals	node ${LILYPOND}/internals/
- lilypond-learning	node ${LILYPOND}/learning/
- lilypond-notation 	node ${LILYPOND}/notation/
- lilypond-snippets 	node ${LILYPOND}/snippets/
- lilypond-usage		node ${LILYPOND}/usage/
- lilypond-web		node ${LILYPOND}/web/
- music-glossary		node ${LILYPOND}/music-glossary/
-
-liquidwar6	mono	${GS}/liquidwar6/manual/liquidwar6.html
-liquidwar6	node	${GS}/liquidwar6/manual/html_node/
-
-lispintro	mono	${GS}/emacs/emacs-lisp-intro/html_mono/emacs-lisp-intro.html
-lispintro	node	${GS}/emacs/emacs-lisp-intro/html_node/index.html
-
-LSH = http://www.lysator.liu.se/~nisse/lsh
-  lsh		mono	${LSH}/lsh.html
-
-m4		mono	${GS}/m4/manual/m4.html
-m4		node	${GS}/m4/manual/html_node/
-
-mailutils	mono	${GS}/mailutils/manual/mailutils.html
-mailutils	chapter	${GS}/mailutils/manual/html_chapter/
-mailutils	section	${GS}/mailutils/manual/html_section/
-mailutils	node	${GS}/mailutils/manual/html_node/
-
-make		mono	${GS}/make/manual/make.html
-make		node	${GS}/make/manual/html_node/
-
-mdk		mono	${GS}/mdk/manual/mdk.html
-mdk		node	${GS}/mdk/manual/html_node/
-
-METAEXCHANGE = http://ftp.gwdg.de/pub/gnu2/iwfmdh/doc/texinfo
- iwf_mh		node	${METAEXCHANGE}/iwf_mh.html
- scantest	node	${METAEXCHANGE}/scantest.html
-
-MIT_SCHEME = ${GS}/mit-scheme/documentation
- mit-scheme-ref	  node	${MIT_SCHEME}/mit-scheme-ref/
- mit-scheme-user  node	${MIT_SCHEME}/mit-scheme-user/
- sos		  node	${MIT_SCHEME}/mit-scheme-sos/
- mit-scheme-imail node	${MIT_SCHEME}/mit-scheme-imail/
-
-moe		mono	${GS}/moe/manual/moe_manual.html
-
-motti		node	${GS}/motti/manual/
-
-mpc		node	http://www.multiprecision.org/index.php?prog=mpc&page=html
-
-mpfr		mono	http://www.mpfr.org/mpfr-current/mpfr.html
-
-mtools		mono	${GS}/mtools/manual/mtools.html
-
-myserver	node	http://www.myserverproject.net/documentation/
-
-nano		mono	http://www.nano-editor.org/dist/latest/nano.html
-
-nettle		chapter	http://www.lysator.liu.se/~nisse/nettle/nettle.html
-
-ocrad		mono	${GS}/ocrad/manual/ocrad_manual.html
-
-parted		mono	${GS}/parted/manual/parted.html
-parted		node	${GS}/parted/manual/html_node/
-
-pascal		mono	http://www.gnu-pascal.de/gpc/
-
-# can't use pcb since url's contain dates --30nov10
-
-perl		mono	${GS}/perl/manual/perldoc-all.html
-
-PIES = http://www.gnu.org.ua/software/pies/manual
-pies		mono	${PIES}/pies.html
-pies 		chapter	${PIES}/html_chapter/
-pies 		section	${PIES}/html_section/
-pies		node	${PIES}/html_node/
-
-plotutils	mono	${GS}/plotutils/manual/en/plotutils.html
-plotutils	node	${GS}/plotutils/manual/en/html_node/
-
-proxyknife	mono	${GS}/proxyknife/manual/proxyknife.html
-proxyknife	node	${GS}/proxyknife/manual/html_node/
-
-pspp		mono	${GS}/pspp/manual/pspp.html
-pspp		node	${GS}/pspp/manual/html_node/
-
-pyconfigure	mono	${GS}/pyconfigure/manual/pyconfigure.html
-pyconfigure	node	${GS}/pyconfigure/manual/html_node/
-
-R = http://cran.r-project.org/doc/manuals
- R-intro	mono	${R}/R-intro.html
- R-lang		mono	${R}/R-lang.html
- R-exts		mono	${R}/R-exts.html
- R-data		mono	${R}/R-data.html
- R-admin	mono	${R}/R-admin.html
- R-ints		mono	${R}/R-ints.html
-
-rcs		mono	${GS}/rcs/manual/rcs.html
-rcs		node	${GS}/rcs/manual/html_node/
-
-READLINE = http://cnswww.cns.cwru.edu/php/chet/readline
-readline        mono    ${READLINE}/readline.html
- rluserman      mono    ${READLINE}/rluserman.html
- history        mono    ${READLINE}/history.html
-
-recode		mono	http://recode.progiciels-bpi.ca/manual/index.html
-
-recutils	mono	${GS}/recutils/manual/recutils.html
-recutils	node	${GS}/recutils/manual/html_node/
-
-reftex		mono	${GS}/auctex/manual/reftex.html
-reftex		node	${GS}/auctex/manual/reftex/
-
-remotecontrol	mono	${GS}/remotecontrol/manual/remotecontrol.html
-remotecontrol	node	${GS}/remotecontrol/manual/html_node/
-
-rottlog		mono	${GS}/rottlog/manual/rottlog.html
-rottlog		node	${GS}/rottlog/manual/html_node/
-
-RUSH = http://www.gnu.org.ua/software/rush/manual
-rush		mono	${RUSH}/rush.html
-rush 		chapter	${RUSH}/html_chapter/
-rush 		section	${RUSH}/html_section/
-rush		node	${RUSH}/html_node/
-
-screen		mono	${GS}/screen/manual/screen.html
-screen		node	${GS}/screen/manual/html_node/
-
-sed		mono	${GS}/sed/manual/sed.html
-sed		node	${GS}/sed/manual/html_node/
-
-sharutils	mono	${GS}/sharutils/manual/html_mono/sharutils.html
-sharutils	chapter	${GS}/sharutils/manual/html_chapter/
-sharutils	node	${GS}/sharutils/manual/html_node/
-
-shepherd	mono	${GS}/shepherd/manual/shepherd.html
-shepherd	node	${GS}/shepherd/manual/html_node/
-
-# can't use mono files since they have generic names
-SMALLTALK = ${GS}/smalltalk
-smalltalk	node	${SMALLTALK}/manual/html_node/
- smalltalk-base	node	${SMALLTALK}/manual-base/html_node/
- smalltalk-libs	node	${SMALLTALK}/manual-libs/html_node/
-
-sourceinstall	mono	${GS}/sourceinstall/manual/sourceinstall.html
-sourceinstall	node	${GS}/sourceinstall/manual/html_node/
-
-sqltutor	mono	${GS}/sqltutor/manual/sqltutor.html
-sqltutor	node	${GS}/sqltutor/manual/html_node/
-
-src-highlite	mono	${GS}/src-highlite/source-highlight.html
-
-swbis		mono	${GS}/swbis/manual.html
-
-tar		mono	${GS}/tar/manual/tar.html
-tar		chapter	${GS}/tar/manual/html_chapter/
-tar		section	${GS}/tar/manual/html_section/
-tar		node	${GS}/autoconf/manual/html_node/
-
-teseq		mono	${GS}/teseq/teseq.html
-teseq		node	${GS}/teseq/html_node/
-
-TEXINFO = ${GS}/texinfo/manual
-texinfo		mono	${TEXINFO}/texinfo/texinfo.html
-texinfo		node	${TEXINFO}/texinfo/html_node/
- #
- info		mono	${TEXINFO}/info/info.html
- info		node	${TEXINFO}/info/html_node/
- #
- info-stnd	mono	${TEXINFO}/info-stnd/info-stnd.html
- info-stnd	node	${TEXINFO}/info-stnd/html_node/
-
-thales		node	${GS}/thales/manual/
-
-units		mono	${GS}/units/manual/units.html
-units		node	${GS}/units/manual/html_node/
-
-vc-dwim		mono	${GS}/vc-dwim/manual/vc-dwim.html
-vc-dwim		node	${GS}/vc-dwim/manual/html_node/
-
-wdiff		mono	${GS}/wdiff/manual/wdiff.html
-wdiff		node	${GS}/wdiff/manual/html_node/
-
-websocket4j	mono	${GS}/websocket4j/manual/websocket4j.html
-websocket4j	node	${GS}/websocket4j/manual/html_node/
-
-wget		mono	${GS}/wget/manual/wget.html
-wget		node	${GS}/wget/manual/html_node/
-
-xboard		mono	${GS}/xboard/manual/xboard.html
-xboard		node	${GS}/xboard/manual/html_node/
-
-# emacs-page
-# Free TeX-related Texinfo manuals on tug.org.
-
-T = http://tug.org/texinfohtml
-
-dvipng		mono	${T}/dvipng.html
-dvips		mono	${T}/dvips.html
-eplain		mono	${T}/eplain.html
-kpathsea	mono	${T}/kpathsea.html
-latex2e		mono	${T}/latex2e.html
-tlbuild		mono	${T}/tlbuild.html
-web2c		mono	${T}/web2c.html
-
-
-# Local Variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "htmlxrefversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
@@ -1,105 +0,0 @@
-digraph "Guix bag" {
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" [label = "glibc-intermediate-2.22", shape = box, fontname = Helvetica];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/rkm2xr9581hfvcimz6a8xav2s5vfjciv-glibc-intermediate-2.22.drv" -> "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" [color = red];
-  "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" [label = "texinfo-6.0", shape = box, fontname = Helvetica];
-  "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" -> "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" [color = red];
-  "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" -> "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" [color = red];
-  "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" -> "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" [color = red];
-  "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" -> "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" [color = red];
-  "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" -> "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [color = red];
-  "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" -> "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [color = red];
-  "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" -> "/gnu/store/sd2k1ljlzpkp3n5rk5y3dp2l73h3qkpp-binutils-bootstrap-0.drv" [color = red];
-  "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/r5bbwfhkj6c65mlfki4vgb0xczm3qmlg-texinfo-6.0.drv" -> "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" [color = red];
-  "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" [label = "make-boot0-4.1", shape = box, fontname = Helvetica];
-  "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" -> "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [color = red];
-  "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" -> "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [color = red];
-  "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" -> "/gnu/store/sd2k1ljlzpkp3n5rk5y3dp2l73h3qkpp-binutils-bootstrap-0.drv" [color = red];
-  "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [label = "glibc-bootstrap-0", shape = box, fontname = Helvetica];
-  "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [label = "gcc-bootstrap-0", shape = box, fontname = Helvetica];
-  "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" -> "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [color = red];
-  "/gnu/store/sd2k1ljlzpkp3n5rk5y3dp2l73h3qkpp-binutils-bootstrap-0.drv" [label = "binutils-bootstrap-0", shape = box, fontname = Helvetica];
-  "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [label = "bootstrap-binaries-0", shape = box, fontname = Helvetica];
-  "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" [label = "diffutils-boot0-3.3", shape = box, fontname = Helvetica];
-  "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" -> "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" [color = red];
-  "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" -> "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [color = red];
-  "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" -> "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [color = red];
-  "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" -> "/gnu/store/sd2k1ljlzpkp3n5rk5y3dp2l73h3qkpp-binutils-bootstrap-0.drv" [color = red];
-  "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" [label = "findutils-boot0-4.6.0", shape = box, fontname = Helvetica];
-  "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" -> "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" [color = red];
-  "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" -> "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" [color = red];
-  "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" -> "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [color = red];
-  "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" -> "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [color = red];
-  "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" -> "/gnu/store/sd2k1ljlzpkp3n5rk5y3dp2l73h3qkpp-binutils-bootstrap-0.drv" [color = red];
-  "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" [label = "file-boot0-5.25", shape = box, fontname = Helvetica];
-  "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" -> "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" [color = red];
-  "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" -> "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [color = red];
-  "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" -> "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [color = red];
-  "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" -> "/gnu/store/sd2k1ljlzpkp3n5rk5y3dp2l73h3qkpp-binutils-bootstrap-0.drv" [color = red];
-  "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" [label = "perl-boot0-5.22.0", shape = box, fontname = Helvetica];
-  "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" -> "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" [color = red];
-  "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" -> "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" [color = red];
-  "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" -> "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" [color = red];
-  "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" -> "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" [color = red];
-  "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" -> "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [color = red];
-  "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" -> "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [color = red];
-  "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" -> "/gnu/store/sd2k1ljlzpkp3n5rk5y3dp2l73h3qkpp-binutils-bootstrap-0.drv" [color = red];
-  "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" [label = "gcc-cross-boot0-4.9.3", shape = box, fontname = Helvetica];
-  "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" -> "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" [color = red];
-  "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" -> "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [color = red];
-  "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" -> "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" [color = red];
-  "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" -> "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" [color = red];
-  "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" -> "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" [color = red];
-  "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" -> "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" [color = red];
-  "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" -> "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [color = red];
-  "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" -> "/gnu/store/sd2k1ljlzpkp3n5rk5y3dp2l73h3qkpp-binutils-bootstrap-0.drv" [color = red];
-  "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/fxzy6h3c9ls97lw9wgv9m5w2ga7mw0kk-gcc-cross-boot0-4.9.3.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" [label = "binutils-cross-boot0-2.25.1", shape = box, fontname = Helvetica];
-  "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" -> "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" [color = red];
-  "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" -> "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" [color = red];
-  "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" -> "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" [color = red];
-  "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" -> "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" [color = red];
-  "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" -> "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [color = red];
-  "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" -> "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [color = red];
-  "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" -> "/gnu/store/sd2k1ljlzpkp3n5rk5y3dp2l73h3qkpp-binutils-bootstrap-0.drv" [color = red];
-  "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/bhv3jml5s1llmsswnw3wvw57dj44lgjc-binutils-cross-boot0-2.25.1.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" [label = "linux-libre-headers-3.14.37", shape = box, fontname = Helvetica];
-  "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" -> "/gnu/store/w88h2mp610hy4i8758bhq6nrjlilzsym-perl-boot0-5.22.0.drv" [color = red];
-  "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" -> "/gnu/store/yzr9lpl44ixp4k2g7r6sh4fhsx2qx9vd-make-boot0-4.1.drv" [color = red];
-  "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" -> "/gnu/store/hwk4rrydk5amqw5xws5p34gi77j0m7m2-diffutils-boot0-3.3.drv" [color = red];
-  "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" -> "/gnu/store/xf07iqpsiygw2z8rvwdf19zjdlhrl03q-findutils-boot0-4.6.0.drv" [color = red];
-  "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" -> "/gnu/store/b33cj0h9ii7lnk233sy5q4hlz36cx5x3-file-boot0-5.25.drv" [color = red];
-  "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" -> "/gnu/store/dmj22s341y334xwwkimrz4d3d0a4mzdp-glibc-bootstrap-0.drv" [color = red];
-  "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" -> "/gnu/store/wp4gm50d3jyzxr9pj5b43j05ildh4mfq-gcc-bootstrap-0.drv" [color = red];
-  "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" -> "/gnu/store/sd2k1ljlzpkp3n5rk5y3dp2l73h3qkpp-binutils-bootstrap-0.drv" [color = red];
-  "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-  "/gnu/store/2m0i57ad07cmgxh3ij89d4lmf7lngpdz-linux-libre-headers-3.14.37.drv" -> "/gnu/store/xyzv7w42bxs5zhs6b5a9s7gbiq571psm-bootstrap-binaries-0.drv" [color = red];
-
-}
@@ -1,4 +1,4 @@
-digraph "Guix shepherd-service" {
+digraph "Guix dmd-service" {
  "user-file-systems" [label = "user-file-systems", shape = box, fontname = Helvetica];
  "user-processes" -> "user-file-systems" [color = red];
  "user-processes" [label = "user-processes", shape = box, fontname = Helvetica];
@@ -1,20 +1,18 @@
 digraph "Service Type Dependencies" {
-  shepherd [shape = box, fontname = Helvetica];
+  dmd [shape = box, fontname = Helvetica];
  pam [shape = box, fontname = Helvetica];
  etc [shape = box, fontname = Helvetica];
-  profile [shape = box, fontname = Helvetica];
  accounts [shape = box, fontname = Helvetica];
  activation [shape = box, fontname = Helvetica];
-  boot [shape = box, fontname = Helvetica];
-  system [shape = house, fontname = Helvetica];
-  lshd -> shepherd;
+  boot [shape = house, fontname = Helvetica];
+  lshd -> dmd;
  lshd -> pam;
-  udev -> shepherd;
-  nscd -> shepherd [label = "extends"];
+  udev -> dmd;
+  nscd -> dmd [label = "extends"];
  "nss-mdns" -> nscd;
  "kvm-rules" -> udev;
  colord -> udev;
-  dbus -> shepherd;
+  dbus -> dmd;
  colord -> dbus;
  upower -> udev;
  upower -> dbus;
@@ -23,7 +21,7 @@ digraph "Service Type Dependencies" {
  elogind -> dbus;
  elogind -> udev;
  elogind -> polkit [label = "extends"];
-  shepherd -> boot;
+  dmd -> boot;
  colord -> accounts;
  accounts -> activation;
  accounts -> etc;
@@ -31,10 +29,7 @@ digraph "Service Type Dependencies" {
  activation -> boot;
  pam -> etc;
  elogind -> pam;
-  guix -> shepherd;
+  guix -> dmd;
  guix -> activation;
  guix -> accounts;
-  boot -> system;
-  etc -> system;
-  profile -> system;
 }
@@ -1,6 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
-# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
+# Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
 #
 # This file is part of GNU Guix.
 #
@@ -23,22 +22,16 @@ ELFILES =					\
  emacs/guix-backend.el				\
  emacs/guix-base.el				\
  emacs/guix-build-log.el			\
-  emacs/guix-buffer.el				\
  emacs/guix-command.el				\
  emacs/guix-devel.el				\
  emacs/guix-emacs.el				\
-  emacs/guix-entry.el				\
  emacs/guix-external.el			\
  emacs/guix-geiser.el				\
  emacs/guix-guile.el				\
  emacs/guix-help-vars.el			\
  emacs/guix-history.el				\
-  emacs/guix-hydra.el				\
-  emacs/guix-hydra-build.el			\
-  emacs/guix-hydra-jobset.el			\
  emacs/guix-info.el				\
  emacs/guix-init.el				\
-  emacs/guix-license.el				\
  emacs/guix-list.el				\
  emacs/guix-messages.el			\
  emacs/guix-pcomplete.el			\
@@ -46,28 +39,23 @@ ELFILES =					\
  emacs/guix-prettify.el			\
  emacs/guix-profiles.el			\
  emacs/guix-read.el				\
-  emacs/guix-ui.el				\
-  emacs/guix-ui-package.el			\
-  emacs/guix-ui-generation.el			\
-  emacs/guix-ui-system-generation.el		\
-  emacs/guix-utils.el
+  emacs/guix-utils.el				\
+  emacs/guix.el

 if HAVE_EMACS

-dist_lisp_DATA = $(ELFILES)
-
-nodist_lisp_DATA = 		\
-  emacs/guix-config.el		\
+dist_lisp_DATA =				\
+  $(ELFILES)					\
  $(AUTOLOADS)

+nodist_lisp_DATA = emacs/guix-config.el
+
 $(AUTOLOADS): $(ELFILES)
-	$(AM_V_EMACS)$(EMACS) --batch --eval				\
+	$(EMACS) --batch --eval						\
 	  "(let ((backup-inhibited t)					\
 	         (generated-autoload-file				\
-	          (expand-file-name \"$(AUTOLOADS)\" \"$(builddir)\")))	\
+	          (expand-file-name \"$(AUTOLOADS)\" \"$(srcdir)\")))	\
 	     (update-directory-autoloads				\
 	      (expand-file-name \"emacs\" \"$(srcdir)\")))"

-CLEANFILES += $(AUTOLOADS)
-
 endif HAVE_EMACS
@@ -1,6 +1,6 @@
 ;;; guix-backend.el --- Making and using Guix REPL

-;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
+;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>

 ;; This file is part of GNU Guix.

@@ -36,13 +36,18 @@
 ;; running code in the REPL (see
 ;; <https://github.com/jaor/geiser/issues/28>).
 ;;
+;; If you need to use "guix.el" in another Emacs (i.e. when there is
+;; a runnig "guile --listen..." REPL somewhere), you can either change
+;; `guix-default-port' in that Emacs instance or set
+;; `guix-use-guile-server' to t.
+;;
 ;; Guix REPLs (unlike the usual Geiser REPLs) are not added to
 ;; `geiser-repl--repls' variable, and thus cannot be used for evaluating
 ;; while editing scm-files.  The only purpose of Guix REPLs is to be an
 ;; intermediate between "Guix/Guile level" and "Emacs interface level".
 ;; That being said you can still want to use a Guix REPL while hacking
-;; auxiliary scheme-files for "guix.el".  You can just use
-;; `geiser-connect-local' command with `guix-repl-current-socket' to
+;; auxiliary scheme-files for "guix.el".  You can just use "M-x
+;; connect-to-guile" (connect to "localhost" and `guix-default-port') to
 ;; have a usual Geiser REPL with all stuff defined by "guix.el" package.

 ;;; Code:
@@ -53,7 +58,6 @@
 (require 'guix-config)
 (require 'guix-external)
 (require 'guix-emacs)
-(require 'guix-profiles)

 (defvar guix-load-path guix-config-emacs-interface-directory
  "Directory with scheme files for \"guix.el\" package.")
@@ -94,24 +98,11 @@ REPL while some packages are being installed/removed in the main REPL."
  :type 'boolean
  :group 'guix-repl)

-(defcustom guix-repl-socket-file-name-function
-  #'guix-repl-socket-file-name
-  "Function used to define a socket file name used by Guix REPL.
-The function is called without arguments."
-  :type '(choice (function-item guix-repl-socket-file-name)
-                 (function :tag "Other function"))
+(defcustom guix-default-port 37246
+  "Default port used if `guix-use-guile-server' is non-nil."
+  :type 'integer
  :group 'guix-repl)

-(defcustom guix-emacs-activate-after-operation t
-  "Activate Emacs packages after installing.
-If nil, do not load autoloads of the Emacs packages after
-they are successfully installed."
-  :type 'boolean
-  :group 'guix-repl)
-
-(defvar guix-repl-current-socket nil
-  "Name of a socket file used by the current Guix REPL.")
-
 (defvar guix-repl-buffer nil
  "Main Geiser REPL buffer used for communicating with Guix.
 This REPL is used for processing package actions and for
@@ -129,7 +120,7 @@ This REPL is used for receiving information only if
  "Hook run before executing an operation in Guix REPL.")

 (defvar guix-after-repl-operation-hook
-  '(guix-repl-autoload-emacs-packages-maybe
+  '(guix-emacs-load-autoloads-maybe
    guix-repl-operation-success-message)
  "Hook run after executing successful operation in Guix REPL.")

@@ -144,43 +135,21 @@ This internal variable is used to define what actions should be
 executed after the current operation succeeds.
 See `guix-eval-in-repl' for details.")

-(defun guix-repl-autoload-emacs-packages-maybe ()
-  "Load autoloads for Emacs packages if needed.
-See `guix-emacs-activate-after-operation' for details."
-  (and guix-emacs-activate-after-operation
-       ;; FIXME Since a user can work with a non-current profile (using
-       ;; C-u before `guix-search-by-name' and other commands), emacs
-       ;; packages can be installed to another profile, and the
-       ;; following code will not work (i.e., the autoloads for this
-       ;; profile will not be loaded).
-       (guix-emacs-autoload-packages guix-current-profile)))
-
 (defun guix-repl-operation-success-message ()
  "Message telling about successful Guix operation."
  (message "Guix operation has been performed."))

-(defun guix-get-guile-program (&optional socket)
+(defun guix-get-guile-program (&optional internal)
  "Return a value suitable for `geiser-guile-binary'."
-  (if (null socket)
+  (if (or internal
+          (not guix-use-guile-server))
      guix-guile-program
    (append (if (listp guix-guile-program)
                guix-guile-program
              (list guix-guile-program))
-            (list (concat "--listen=" socket)))))
-
-(defun guix-repl-socket-file-name ()
-  "Return a name of a socket file used by Guix REPL."
-  (make-temp-name
-   (concat (file-name-as-directory temporary-file-directory)
-           "guix-repl-")))
-
-(defun guix-repl-delete-socket-maybe ()
-  "Delete `guix-repl-current-socket' file if it exists."
-  (and guix-repl-current-socket
-       (file-exists-p guix-repl-current-socket)
-       (delete-file guix-repl-current-socket)))
-
-(add-hook 'kill-emacs-hook 'guix-repl-delete-socket-maybe)
+            ;; Guile understands "--listen=..." but not "--listen ..."
+            (list (concat "--listen="
+                          (number-to-string guix-default-port))))))

 (defun guix-start-process-maybe (&optional start-msg end-msg)
  "Start Geiser REPL configured for Guix if needed.
@@ -207,21 +176,19 @@ display messages."
                 (get-buffer-process repl))
      (and start-msg (message start-msg))
      (setq guix-repl-operation-p nil)
-      (unless internal
-        ;; Guile leaves socket file after exit, so remove it if it
-        ;; exists (after the REPL restart).
-        (guix-repl-delete-socket-maybe)
-        (setq guix-repl-current-socket
-              (and guix-use-guile-server
-                   (or guix-repl-current-socket
-                       (funcall guix-repl-socket-file-name-function)))))
-      (let ((geiser-guile-binary (guix-get-guile-program
-                                  (unless internal
-                                    guix-repl-current-socket)))
-            (geiser-guile-init-file (unless internal guix-helper-file))
+      (let ((geiser-guile-binary (guix-get-guile-program internal))
+            (geiser-guile-init-file (or internal guix-helper-file))
            (repl (get-buffer-create
                   (guix-get-repl-buffer-name internal))))
-        (guix-start-repl repl (and internal guix-repl-current-socket))
+        (condition-case err
+            (guix-start-repl repl
+                             (and internal
+                                  (geiser-repl--read-address
+                                   "localhost" guix-default-port)))
+          (text-read-only
+           (error (concat "Couldn't start Guix REPL.  Perhaps the port %s is busy.\n"
+                          "See buffer '%s' for details")
+                  guix-default-port (buffer-name repl))))
        (set repl-var repl)
        (and end-msg (message end-msg))
        (unless internal
@@ -235,7 +202,7 @@ this address (it should be defined by
  ;; A mix of the code from `geiser-repl--start-repl' and
  ;; `geiser-repl--to-repl-buffer'.
  (let ((impl 'guile)
-        (geiser-guile-load-path (cons (expand-file-name guix-load-path)
+        (geiser-guile-load-path (cons guix-load-path
                                      geiser-guile-load-path))
        (geiser-repl-startup-time guix-repl-startup-time))
    (with-current-buffer buffer
@@ -1,624 +0,0 @@
-;;; guix-buffer.el --- Buffer interface for displaying data  -*- lexical-binding: t -*-
-
-;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
-
-;; This file is part of GNU Guix.
-
-;; GNU Guix is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Guix is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file provides a general 'buffer' interface for displaying an
-;; arbitrary data.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'guix-history)
-(require 'guix-utils)
-
-(defvar guix-buffer-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "l") 'guix-history-back)
-    (define-key map (kbd "r") 'guix-history-forward)
-    (define-key map (kbd "g") 'revert-buffer)
-    (define-key map (kbd "R") 'guix-buffer-redisplay)
-    map)
-  "Parent keymap for Guix buffer modes.")
-
-
-;;; Buffer item
-
-(cl-defstruct (guix-buffer-item
-               (:constructor nil)
-               (:constructor guix-buffer-make-item
-                             (entries buffer-type entry-type args))
-               (:copier      nil))
-  entries buffer-type entry-type args)
-
-(defvar-local guix-buffer-item nil
-  "Data (structure) for the current Guix buffer.
-The structure consists of the following elements:
-
- `entries': list of the currently displayed entries.
-
-  Each element of the list is an alist with an entry data of the
-  following form:
-
-    ((PARAM . VAL) ...)
-
-  PARAM is a name of the entry parameter.
-  VAL is a value of this parameter.
-
- `entry-type': type of the currently displayed entries.
-
- `buffer-type': type of the current buffer.
-
- `args': search arguments used to get the current entries.")
-(put 'guix-buffer-item 'permanent-local t)
-
-(defmacro guix-buffer-with-item (item &rest body)
-  "Evaluate BODY using buffer ITEM.
-The following local variables are available inside BODY:
-`%entries', `%buffer-type', `%entry-type', `%args'.
-See `guix-buffer-item' for details."
-  (declare (indent 1) (debug t))
-  (let ((item-var (make-symbol "item")))
-    `(let ((,item-var ,item))
-       (let ((%entries     (guix-buffer-item-entries     ,item-var))
-             (%buffer-type (guix-buffer-item-buffer-type ,item-var))
-             (%entry-type  (guix-buffer-item-entry-type  ,item-var))
-             (%args        (guix-buffer-item-args        ,item-var)))
-         ,@body))))
-
-(defmacro guix-buffer-with-current-item (&rest body)
-  "Evaluate BODY using `guix-buffer-item'.
-See `guix-buffer-with-item' for details."
-  (declare (indent 0) (debug t))
-  `(guix-buffer-with-item guix-buffer-item
-     ,@body))
-
-(defmacro guix-buffer-define-current-item-accessor (name)
-  "Define `guix-buffer-current-NAME' function to access NAME
-element of `guix-buffer-item' structure.
-NAME should be a symbol."
-  (let* ((name-str (symbol-name name))
-         (accessor (intern (concat "guix-buffer-item-" name-str)))
-         (fun-name (intern (concat "guix-buffer-current-" name-str)))
-         (doc      (format "\
-Return '%s' of the current Guix buffer.
-See `guix-buffer-item' for details."
-                           name-str)))
-    `(defun ,fun-name ()
-       ,doc
-       (and guix-buffer-item
-            (,accessor guix-buffer-item)))))
-
-(defmacro guix-buffer-define-current-item-accessors (&rest names)
-  "Define `guix-buffer-current-NAME' functions for NAMES.
-See `guix-buffer-define-current-item-accessor' for details."
-  `(progn
-     ,@(mapcar (lambda (name)
-                 `(guix-buffer-define-current-item-accessor ,name))
-               names)))
-
-(guix-buffer-define-current-item-accessors
- entries entry-type buffer-type args)
-
-(defmacro guix-buffer-define-current-args-accessor (n prefix name)
-  "Define `PREFIX-NAME' function to access Nth element of 'args'
-field of `guix-buffer-item' structure.
-PREFIX and NAME should be strings."
-  (let ((fun-name (intern (concat prefix "-" name)))
-        (doc      (format "\
-Return '%s' of the current Guix buffer.
-'%s' is the element number %d in 'args' of `guix-buffer-item'."
-                          name name n)))
-    `(defun ,fun-name ()
-       ,doc
-       (nth ,n (guix-buffer-current-args)))))
-
-(defmacro guix-buffer-define-current-args-accessors (prefix &rest names)
-  "Define `PREFIX-NAME' functions for NAMES.
-See `guix-buffer-define-current-args-accessor' for details."
-  `(progn
-     ,@(cl-loop for name in names
-                for i from 0
-                collect `(guix-buffer-define-current-args-accessor
-                          ,i ,prefix ,name))))
-
-
-;;; Wrappers for defined variables
-
-(defvar guix-buffer-data nil
-  "Alist with 'buffer' data.
-This alist is filled by `guix-buffer-define-interface' macro.")
-
-(defun guix-buffer-value (buffer-type entry-type symbol)
-  "Return SYMBOL's value for BUFFER-TYPE/ENTRY-TYPE from `guix-buffer-data'."
-  (symbol-value
-   (guix-assq-value guix-buffer-data buffer-type entry-type symbol)))
-
-(defun guix-buffer-get-entries (buffer-type entry-type args)
-  "Return ENTRY-TYPE entries.
-Call an appropriate 'get-entries' function from `guix-buffer'
-using ARGS as its arguments."
-  (apply (guix-buffer-value buffer-type entry-type 'get-entries)
-         args))
-
-(defun guix-buffer-mode-enable (buffer-type entry-type)
-  "Turn on major mode to display ENTRY-TYPE ENTRIES in BUFFER-TYPE buffer."
-  (funcall (guix-buffer-value buffer-type entry-type 'mode)))
-
-(defun guix-buffer-mode-initialize (buffer-type entry-type)
-  "Set up the current BUFFER-TYPE buffer to display ENTRY-TYPE entries."
-  (let ((fun (guix-buffer-value buffer-type entry-type 'mode-init)))
-    (when fun
-      (funcall fun))))
-
-(defun guix-buffer-insert-entries (entries buffer-type entry-type)
-  "Show ENTRY-TYPE ENTRIES in the current BUFFER-TYPE buffer."
-  (funcall (guix-buffer-value buffer-type entry-type 'insert-entries)
-           entries))
-
-(defun guix-buffer-show-entries-default (entries buffer-type entry-type)
-  "Show ENTRY-TYPE ENTRIES in the current BUFFER-TYPE buffer."
-  (let ((inhibit-read-only t))
-    (erase-buffer)
-    (guix-buffer-mode-enable buffer-type entry-type)
-    (guix-buffer-insert-entries entries buffer-type entry-type)
-    (goto-char (point-min))))
-
-(defun guix-buffer-show-entries (entries buffer-type entry-type)
-  "Show ENTRY-TYPE ENTRIES in the current BUFFER-TYPE buffer."
-  (funcall (guix-buffer-value buffer-type entry-type 'show-entries)
-           entries))
-
-(defun guix-buffer-message (entries buffer-type entry-type args)
-  "Display a message for BUFFER-ITEM after showing entries."
-  (let ((fun (guix-buffer-value buffer-type entry-type 'message)))
-    (when fun
-      (apply fun entries args))))
-
-(defun guix-buffer-name (buffer-type entry-type args)
-  "Return name of BUFFER-TYPE buffer for displaying ENTRY-TYPE entries."
-  (let ((str-or-fun (guix-buffer-value buffer-type entry-type
-                                       'buffer-name)))
-    (if (stringp str-or-fun)
-        str-or-fun
-      (apply str-or-fun args))))
-
-(defun guix-buffer-param-title (buffer-type entry-type param)
-  "Return PARAM title for BUFFER-TYPE/ENTRY-TYPE."
-  (or (guix-assq-value (guix-buffer-value buffer-type entry-type 'titles)
-                       param)
-      ;; Fallback to a title defined in 'info' interface.
-      (unless (eq buffer-type 'info)
-        (guix-assq-value (guix-buffer-value 'info entry-type 'titles)
-                         param))
-      (guix-symbol-title param)))
-
-(defun guix-buffer-history-size (buffer-type entry-type)
-  "Return history size for BUFFER-TYPE/ENTRY-TYPE."
-  (guix-buffer-value buffer-type entry-type 'history-size))
-
-(defun guix-buffer-revert-confirm? (buffer-type entry-type)
-  "Return 'revert-confirm' value for BUFFER-TYPE/ENTRY-TYPE."
-  (guix-buffer-value buffer-type entry-type 'revert-confirm))
-
-
-;;; Displaying entries
-
-(defun guix-buffer-display (buffer)
-  "Switch to a Guix BUFFER."
-  (pop-to-buffer buffer
-                 '((display-buffer-reuse-window
-                    display-buffer-same-window))))
-
-(defun guix-buffer-history-item (buffer-item)
-  "Make and return a history item for displaying BUFFER-ITEM."
-  (list #'guix-buffer-set buffer-item))
-
-(defun guix-buffer-set (buffer-item &optional history)
-  "Set up the current buffer for displaying BUFFER-ITEM.
-HISTORY should be one of the following:
-
-  `nil' - do not save BUFFER-ITEM in history,
-
-  `add' - add it to history,
-
-  `replace' - replace the current history item."
-  (guix-buffer-with-item buffer-item
-    (when %entries
-      ;; Set buffer item before showing entries, so that its value can
-      ;; be used by the code for displaying entries.
-      (setq guix-buffer-item buffer-item)
-      (guix-buffer-show-entries %entries %buffer-type %entry-type)
-      (when history
-        (funcall (cl-ecase history
-                   (add     #'guix-history-add)
-                   (replace #'guix-history-replace))
-                 (guix-buffer-history-item buffer-item))))
-    (guix-buffer-message %entries %buffer-type %entry-type %args)))
-
-(defun guix-buffer-display-entries-current
-    (entries buffer-type entry-type args &optional history)
-  "Show ENTRIES in the current Guix buffer.
-See `guix-buffer-item' for the meaning of BUFFER-TYPE, ENTRY-TYPE
-and ARGS, and `guix-buffer-set' for the meaning of HISTORY."
-  (let ((item (guix-buffer-make-item entries buffer-type
-                                     entry-type args)))
-    (guix-buffer-set item history)))
-
-(defun guix-buffer-get-display-entries-current
-    (buffer-type entry-type args &optional history)
-  "Search for entries and show them in the current Guix buffer.
-See `guix-buffer-display-entries-current' for details."
-  (guix-buffer-display-entries-current
-   (guix-buffer-get-entries buffer-type entry-type args)
-   buffer-type entry-type args history))
-
-(defun guix-buffer-display-entries
-    (entries buffer-type entry-type args &optional history)
-  "Show ENTRIES in a BUFFER-TYPE buffer.
-See `guix-buffer-display-entries-current' for details."
-  (let ((buffer (get-buffer-create
-                 (guix-buffer-name buffer-type entry-type args))))
-    (with-current-buffer buffer
-      (guix-buffer-display-entries-current
-       entries buffer-type entry-type args history))
-    (when entries
-      (guix-buffer-display buffer))))
-
-(defun guix-buffer-get-display-entries
-    (buffer-type entry-type args &optional history)
-  "Search for entries and show them in a BUFFER-TYPE buffer.
-See `guix-buffer-display-entries-current' for details."
-  (guix-buffer-display-entries
-   (guix-buffer-get-entries buffer-type entry-type args)
-   buffer-type entry-type args history))
-
-(defun guix-buffer-revert (_ignore-auto noconfirm)
-  "Update the data in the current Guix buffer.
-This function is suitable for `revert-buffer-function'.
-See `revert-buffer' for the meaning of NOCONFIRM."
-  (guix-buffer-with-current-item
-    (when (or noconfirm
-              (not (guix-buffer-revert-confirm? %buffer-type %entry-type))
-              (y-or-n-p "Update the current buffer? "))
-      (guix-buffer-get-display-entries-current
-       %buffer-type %entry-type %args 'replace))))
-
-(defvar guix-buffer-after-redisplay-hook nil
-  "Hook run by `guix-buffer-redisplay'.
-This hook is called before seting up a window position.")
-
-(defun guix-buffer-redisplay ()
-  "Redisplay the current Guix buffer.
-Restore the point and window positions after redisplaying.
-
-This function does not update the buffer data, use
-'\\[revert-buffer]' if you want the full update."
-  (interactive)
-  (let* ((old-point (point))
-         ;; For simplicity, ignore an unlikely case when multiple
-         ;; windows display the same buffer.
-         (window (car (get-buffer-window-list (current-buffer) nil t)))
-         (window-start (and window (window-start window))))
-    (guix-buffer-set guix-buffer-item)
-    (goto-char old-point)
-    (run-hooks 'guix-buffer-after-redisplay-hook)
-    (when window
-      (set-window-point window (point))
-      (set-window-start window window-start))))
-
-(defun guix-buffer-redisplay-goto-button ()
-  "Redisplay the current buffer and go to the next button, if needed."
-  (let ((guix-buffer-after-redisplay-hook
-         (cons (lambda ()
-                 (unless (button-at (point))
-                   (forward-button 1)))
-               guix-buffer-after-redisplay-hook)))
-    (guix-buffer-redisplay)))
-
-
-;;; Interface definers
-
-(defmacro guix-define-groups (type &rest args)
-  "Define `guix-TYPE' and `guix-TYPE-faces' custom groups.
-Remaining arguments (ARGS) should have a form [KEYWORD VALUE] ...
-
-Optional keywords:
-
-  - `:parent-group' - name of a parent custom group.
-
-  - `:parent-faces-group' - name of a parent custom faces group.
-
-  - `:group-doc' - docstring of a `guix-TYPE' group.
-
-  - `:faces-group-doc' - docstring of a `guix-TYPE-faces' group."
-  (declare (indent 1))
-  (let* ((type-str           (symbol-name type))
-         (prefix             (concat "guix-" type-str))
-         (group              (intern prefix))
-         (faces-group        (intern (concat prefix "-faces"))))
-    (guix-keyword-args-let args
-        ((parent-group       :parent-group 'guix)
-         (parent-faces-group :parent-faces-group 'guix-faces)
-         (group-doc          :group-doc
-                             (format "Settings for '%s' buffers."
-                                     type-str))
-         (faces-group-doc    :faces-group-doc
-                             (format "Faces for '%s' buffers."
-                                     type-str)))
-      `(progn
-         (defgroup ,group nil
-           ,group-doc
-           :group ',parent-group)
-
-         (defgroup ,faces-group nil
-           ,faces-group-doc
-           :group ',group
-           :group ',parent-faces-group)))))
-
-(defmacro guix-define-entry-type (entry-type &rest args)
-  "Define general code for ENTRY-TYPE.
-See `guix-define-groups'."
-  (declare (indent 1))
-  `(guix-define-groups ,entry-type
-     ,@args))
-
-(defmacro guix-define-buffer-type (buffer-type &rest args)
-  "Define general code for BUFFER-TYPE.
-See `guix-define-groups'."
-  (declare (indent 1))
-  `(guix-define-groups ,buffer-type
-     ,@args))
-
-(defmacro guix-buffer-define-interface (buffer-type entry-type &rest args)
-  "Define BUFFER-TYPE interface for displaying ENTRY-TYPE entries.
-Remaining arguments (ARGS) should have a form [KEYWORD VALUE] ...
-In the following description TYPE means ENTRY-TYPE-BUFFER-TYPE.
-
-Required keywords:
-
-  - `:buffer-name' - default value of the generated
-    `guix-TYPE-buffer-name' variable.
-
-  - `:get-entries-function' - default value of the generated
-    `guix-TYPE-get-function' variable.
-
-  - `:show-entries-function' - default value of the generated
-    `guix-TYPE-show-function' variable.
-
-  Alternatively, if `:show-entries-function' is not specified, a
-  default `guix-TYPE-show-entries' will be generated, and the
-  following keyword should be specified instead:
-
-  - `:insert-entries-function' - default value of the generated
-    `guix-TYPE-insert-function' variable.
-
-Optional keywords:
-
-  - `:message-function' - default value of the generated
-    `guix-TYPE-message-function' variable.
-
-  - `:titles' - default value of the generated
-    `guix-TYPE-titles' variable.
-
-  - `:history-size' - default value of the generated
-    `guix-TYPE-history-size' variable.
-
-  - `:revert-confirm?' - default value of the generated
-    `guix-TYPE-revert-confirm' variable.
-
-  - `:mode-name' - name (a string appeared in the mode-line) of
-     the generated `guix-TYPE-mode'.
-
-  - `:mode-init-function' - default value of the generated
-    `guix-TYPE-mode-initialize-function' variable.
-
-  - `:reduced?' - if non-nil, generate only group, faces group
-    and titles variable (if specified); all keywords become
-    optional."
-  (declare (indent 2))
-  (let* ((entry-type-str     (symbol-name entry-type))
-         (buffer-type-str    (symbol-name buffer-type))
-         (prefix             (concat "guix-" entry-type-str "-"
-                                     buffer-type-str))
-         (group              (intern prefix))
-         (faces-group        (intern (concat prefix "-faces")))
-         (get-entries-var    (intern (concat prefix "-get-function")))
-         (show-entries-var   (intern (concat prefix "-show-function")))
-         (show-entries-fun   (intern (concat prefix "-show-entries")))
-         (message-var        (intern (concat prefix "-message-function")))
-         (buffer-name-var    (intern (concat prefix "-buffer-name")))
-         (titles-var         (intern (concat prefix "-titles")))
-         (history-size-var   (intern (concat prefix "-history-size")))
-         (revert-confirm-var (intern (concat prefix "-revert-confirm"))))
-    (guix-keyword-args-let args
-        ((get-entries-val    :get-entries-function)
-         (show-entries-val   :show-entries-function)
-         (insert-entries-val :insert-entries-function)
-         (mode-name          :mode-name (capitalize prefix))
-         (mode-init-val      :mode-init-function)
-         (message-val        :message-function)
-         (buffer-name-val    :buffer-name)
-         (titles-val         :titles)
-         (history-size-val   :history-size 20)
-         (revert-confirm-val :revert-confirm? t)
-         (reduced?           :reduced?))
-      `(progn
-         (defgroup ,group nil
-           ,(format "Displaying '%s' entries in '%s' buffer."
-                    entry-type-str buffer-type-str)
-           :group ',(intern (concat "guix-" entry-type-str))
-           :group ',(intern (concat "guix-" buffer-type-str)))
-
-         (defgroup ,faces-group nil
-           ,(format "Faces for displaying '%s' entries in '%s' buffer."
-                    entry-type-str buffer-type-str)
-           :group ',group
-           :group ',(intern (concat "guix-" entry-type-str "-faces"))
-           :group ',(intern (concat "guix-" buffer-type-str "-faces")))
-
-         (defcustom ,titles-var ,titles-val
-           ,(format "Alist of titles of '%s' parameters."
-                    entry-type-str)
-           :type '(alist :key-type symbol :value-type string)
-           :group ',group)
-
-         ,(unless reduced?
-            `(progn
-               (defvar ,get-entries-var ,get-entries-val
-                 ,(format "\
-Function used to receive '%s' entries for '%s' buffer."
-                          entry-type-str buffer-type-str))
-
-               (defvar ,show-entries-var
-                 ,(or show-entries-val `',show-entries-fun)
-                 ,(format "\
-Function used to show '%s' entries in '%s' buffer."
-                          entry-type-str buffer-type-str))
-
-               (defvar ,message-var ,message-val
-                 ,(format "\
-Function used to display a message after showing '%s' entries.
-If nil, do not display messages."
-                          entry-type-str))
-
-               (defcustom ,buffer-name-var ,buffer-name-val
-                 ,(format "\
-Default name of '%s' buffer for displaying '%s' entries.
-May be a string or a function returning a string.  The function
-is called with the same arguments as `%S'."
-                          buffer-type-str entry-type-str get-entries-var)
-                 :type '(choice string function)
-                 :group ',group)
-
-               (defcustom ,history-size-var ,history-size-val
-                 ,(format "\
-Maximum number of items saved in history of `%S' buffer.
-If 0, the history is disabled."
-                          buffer-name-var)
-                 :type 'integer
-                 :group ',group)
-
-               (defcustom ,revert-confirm-var ,revert-confirm-val
-                 ,(format "\
-If non-nil, ask to confirm for reverting `%S' buffer."
-                          buffer-name-var)
-                 :type 'boolean
-                 :group ',group)
-
-               (guix-alist-put!
-                '((get-entries    . ,get-entries-var)
-                  (show-entries   . ,show-entries-var)
-                  (message        . ,message-var)
-                  (buffer-name    . ,buffer-name-var)
-                  (history-size   . ,history-size-var)
-                  (revert-confirm . ,revert-confirm-var))
-                'guix-buffer-data ',buffer-type ',entry-type)
-
-               ,(unless show-entries-val
-                  `(defun ,show-entries-fun (entries)
-                     ,(format "\
-Show '%s' ENTRIES in the current '%s' buffer."
-                              entry-type-str buffer-type-str)
-                     (guix-buffer-show-entries-default
-                      entries ',buffer-type ',entry-type)))
-
-               ,(when (or insert-entries-val
-                          (null show-entries-val))
-                  (let ((insert-entries-var
-                         (intern (concat prefix "-insert-function"))))
-                    `(progn
-                       (defvar ,insert-entries-var ,insert-entries-val
-                         ,(format "\
-Function used to print '%s' entries in '%s' buffer."
-                                  entry-type-str buffer-type-str))
-
-                       (guix-alist-put!
-                        ',insert-entries-var 'guix-buffer-data
-                        ',buffer-type ',entry-type
-                        'insert-entries))))
-
-               ,(when (or mode-name
-                          mode-init-val
-                          (null show-entries-val))
-                  (let* ((mode-str      (concat prefix "-mode"))
-                         (mode-map-str  (concat mode-str "-map"))
-                         (mode          (intern mode-str))
-                         (parent-mode   (intern
-                                         (concat "guix-" buffer-type-str
-                                                 "-mode")))
-                         (mode-var      (intern
-                                         (concat mode-str "-function")))
-                         (mode-init-var (intern
-                                         (concat mode-str
-                                                 "-initialize-function"))))
-                    `(progn
-                       (defvar ,mode-var ',mode
-                         ,(format "\
-Major mode for displaying '%s' entries in '%s' buffer."
-                                  entry-type-str buffer-type-str))
-
-                       (defvar ,mode-init-var ,mode-init-val
-                         ,(format "\
-Function used to set up '%s' buffer for displaying '%s' entries."
-                                  buffer-type-str entry-type-str))
-
-                       (define-derived-mode ,mode ,parent-mode ,mode-name
-                         ,(format "\
-Major mode for displaying '%s' entries in '%s' buffer.
-
-\\{%s}"
-                                  entry-type-str buffer-type-str mode-map-str)
-                         (setq-local revert-buffer-function
-                                     'guix-buffer-revert)
-                         (setq-local guix-history-size
-                                     (guix-buffer-history-size
-                                      ',buffer-type ',entry-type))
-                         (guix-buffer-mode-initialize
-                          ',buffer-type ',entry-type))
-
-                       (guix-alist-put!
-                        ',mode-var 'guix-buffer-data
-                        ',buffer-type ',entry-type 'mode)
-                       (guix-alist-put!
-                        ',mode-init-var 'guix-buffer-data
-                        ',buffer-type ',entry-type
-                        'mode-init))))))
-
-         (guix-alist-put!
-          ',titles-var 'guix-buffer-data
-          ',buffer-type ',entry-type 'titles)))))
-
-
-(defvar guix-buffer-font-lock-keywords
-  (eval-when-compile
-    `((,(rx "(" (group (or "guix-buffer-with-item"
-                           "guix-buffer-with-current-item"
-                           "guix-buffer-define-interface"
-                           "guix-define-groups"
-                           "guix-define-entry-type"
-                           "guix-define-buffer-type"))
-            symbol-end)
-       . 1))))
-
-(font-lock-add-keywords 'emacs-lisp-mode guix-buffer-font-lock-keywords)
-
-(provide 'guix-buffer)
-
-;;; guix-buffer.el ends here
@@ -24,8 +24,6 @@

 ;;; Code:

-(require 'guix-utils)
-
 (defgroup guix-build-log nil
  "Settings for `guix-build-log-mode'."
  :group 'guix)
@@ -104,13 +102,10 @@
  "Face for the number of seconds for a phase."
  :group 'guix-build-log-faces)

-(defcustom guix-build-log-minor-mode-activate t
-  "If non-nil, then `guix-build-log-minor-mode' is automatically
-activated in `shell-mode' buffers."
-  :type 'boolean
-  :group 'guix-build-log)
-
-(defcustom guix-build-log-mode-hook '()
+(defcustom guix-build-log-mode-hook
+  ;; Not using `compilation-minor-mode' because it rebinds some standard
+  ;; keys, including M-n/M-p.
+  '(compilation-shell-minor-mode view-mode)
  "Hook run after `guix-build-log-mode' is entered."
  :type 'hook
  :group 'guix-build-log)
@@ -183,8 +178,9 @@ STATE is a symbol denoting how a build phase was ended.  It should be
     (3 'guix-build-log-phase-seconds prepend)))
  "A list of `font-lock-keywords' for `guix-build-log-mode'.")

-(defvar guix-build-log-common-map
+(defvar guix-build-log-mode-map
  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map special-mode-map)
    (define-key map (kbd "M-n") 'guix-build-log-next-phase)
    (define-key map (kbd "M-p") 'guix-build-log-previous-phase)
    (define-key map (kbd "TAB") 'guix-build-log-phase-toggle)
@@ -192,26 +188,8 @@ STATE is a symbol denoting how a build phase was ended.  It should be
    (define-key map (kbd "<backtab>") 'guix-build-log-phase-toggle-all)
    (define-key map [(shift tab)] 'guix-build-log-phase-toggle-all)
    map)
-  "Parent keymap for 'build-log' buffers.
-For `guix-build-log-mode' this map is used as is.
-For `guix-build-log-minor-mode' this map is prefixed with 'C-c'.")
-
-(defvar guix-build-log-mode-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent
-     map (make-composed-keymap (list guix-build-log-common-map)
-                               special-mode-map))
-    (define-key map (kbd "c") 'compilation-shell-minor-mode)
-    (define-key map (kbd "v") 'view-mode)
-    map)
  "Keymap for `guix-build-log-mode' buffers.")

-(defvar guix-build-log-minor-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c") guix-build-log-common-map)
-    map)
-  "Keymap for `guix-build-log-minor-mode' buffers.")
-
 (defun guix-build-log-phase-start (&optional with-header?)
  "Return the start point of the current build phase.
 If WITH-HEADER? is non-nil, do not skip 'starting phase ...' header.
@@ -341,12 +319,9 @@ When Guix Build Log minor mode is enabled, it highlights build
 log in the current buffer.  This mode can be enabled
 programmatically using hooks:

-  (add-hook 'shell-mode-hook 'guix-build-log-minor-mode)
-
-\\{guix-build-log-minor-mode-map}"
+  (add-hook 'shell-mode-hook 'guix-build-log-minor-mode)"
  :init-value nil
  :lighter " Guix-Build-Log"
-  :keymap guix-build-log-minor-mode-map
  :group 'guix-build-log
  (if guix-build-log-minor-mode
      (font-lock-add-keywords nil guix-build-log-font-lock-keywords)
@@ -354,28 +329,6 @@ programmatically using hooks:
  (when font-lock-mode
    (font-lock-fontify-buffer)))

-;;;###autoload
-(defun guix-build-log-minor-mode-activate-maybe ()
-  "Activate `guix-build-log-minor-mode' depending on
-`guix-build-log-minor-mode-activate' variable."
-  (when guix-build-log-minor-mode-activate
-    (guix-build-log-minor-mode)))
-
-(defun guix-build-log-find-file (file-or-url)
-  "Open FILE-OR-URL in `guix-build-log-mode'."
-  (guix-find-file-or-url file-or-url)
-  (guix-build-log-mode))
-
-;;;###autoload
-(add-hook 'shell-mode-hook 'guix-build-log-minor-mode-activate-maybe)
-
-;;;###autoload
-(add-to-list 'auto-mode-alist
-             ;; Regexp for log files (usually placed in /var/log/guix/...)
-             (cons (rx "/guix/drvs/" (= 2 alnum) "/" (= 30 alnum)
-                       "-" (+ (any alnum "-+.")) ".drv" string-end)
-                   'guix-build-log-mode))
-
 (provide 'guix-build-log)

 ;;; guix-build-log.el ends here
@@ -1,6 +1,6 @@
 ;;; guix-command.el --- Popup interface for guix commands  -*- lexical-binding: t -*-

-;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
+;; Copyright © 2015 Alex Kost <alezost@gmail.com>

 ;; This file is part of GNU Guix.

@@ -65,7 +65,6 @@
 (require 'guix-help-vars)
 (require 'guix-read)
 (require 'guix-base)
-(require 'guix-build-log)
 (require 'guix-guile)
 (require 'guix-external)

@@ -132,8 +131,7 @@ to be modified."

 (guix-command-define-argument-improver
    guix-command-improve-action-argument
-  '(("container"   :char ?C)
-    ("graph"       :char ?G)
+  '(("graph"       :char ?G)
    ("environment" :char ?E)
    ("publish"     :char ?u)
    ("pull"        :char ?P)
@@ -175,9 +173,7 @@ to be modified."
 (defvar guix-command-improve-common-build-argument
  '(("--no-substitutes"  :char ?s)
    ("--no-build-hook"   :char ?h)
-    ("--max-silent-time" :char ?x)
-    ("--rounds"          :char ?R :fun read-number)
-    ("--with-input"      :char ?W)))
+    ("--max-silent-time" :char ?x)))

 (defun guix-command-improve-common-build-argument (argument)
  (guix-command-modify-argument-from-alist
@@ -193,18 +189,13 @@ to be modified."
 (guix-command-define-argument-improver
    guix-command-improve-build-argument
  '(("--no-grafts"   :char ?g)
-    ("--file"        :fun guix-read-file-name)
    ("--root"        :fun guix-read-file-name)
    ("--sources"     :char ?S :fun guix-read-source-type :switch? nil)
    ("--with-source" :fun guix-read-file-name)))

 (guix-command-define-argument-improver
    guix-command-improve-environment-argument
-  '(("--ad-hoc"
-     :name "--ad-hoc " :fun guix-read-package-names-string
-     :switch? nil :option? t)
-    ("--expose" :char ?E)
-    ("--share" :char ?S)
+  '(("--exec" :fun read-shell-command)
    ("--load" :fun guix-read-file-name)))

 (guix-command-define-argument-improver
@@ -243,7 +234,6 @@ to be modified."
     :switch? nil :option? t)
    ("--install-from-file" :fun guix-read-file-name)
    ("--manifest"       :fun guix-read-file-name)
-    ("--profile"        :fun guix-read-file-name)
    ("--do-not-upgrade" :char ?U)
    ("--roll-back"      :char ?R)
    ("--show"           :char ?w :fun guix-read-package-name)))
@@ -251,7 +241,6 @@ to be modified."
 (guix-command-define-argument-improver
    guix-command-improve-refresh-argument
  '(("--select"     :fun guix-read-refresh-subset)
-    ("--type"       :fun guix-read-refresh-updater-names-string)
    ("--key-server" :char ?S)))

 (guix-command-define-argument-improver
@@ -375,16 +364,11 @@ to be modified."
                     :name "-- " :char ?= :option? t args)))
    (let ((command (car commands)))
      (cond
-       ((member command
-                '("archive" "build" "challenge" "edit"
-                  "graph" "lint" "refresh"))
+       ((member command '("archive" "build" "graph" "edit"
+                          "environment" "lint" "refresh"))
        (argument :doc "Packages" :fun 'guix-read-package-names-string))
-       ((equal commands '("container" "exec"))
-        (argument :doc "PID Command [Args...]"))
       ((string= command "download")
        (argument :doc "URL"))
-       ((string= command "environment")
-        (argument :doc "Command [Args...]" :fun 'read-shell-command))
       ((string= command "gc")
        (argument :doc "Paths" :fun 'guix-read-file-name))
       ((member command '("hash" "system"))
@@ -398,22 +382,10 @@ to be modified."
             (string= command "import"))
        (argument :doc "Package name"))))))

-(defvar guix-command-additional-arguments
-  `((("environment")
-     ,(guix-command-make-argument
-       :name "++packages " :char ?p :option? t
-       :doc "build inputs of the specified packages"
-       :fun 'guix-read-package-names-string)))
-  "Alist of guix commands and additional arguments for them.
-These are 'fake' arguments that are not presented in 'guix' shell
-commands.")
-
 (defun guix-command-additional-arguments (&optional commands)
  "Return additional arguments for COMMANDS."
  (let ((rest-arg (guix-command-rest-argument commands)))
-    (append (guix-assoc-value guix-command-additional-arguments
-                              commands)
-            (and rest-arg (list rest-arg)))))
+    (and rest-arg (list rest-arg))))

 ;; Ideally only `guix-command-arguments' function should exist with the
 ;; contents of `guix-command-all-arguments', but we need to make a
@@ -491,113 +463,28 @@ commands.")
  "Return actions from ARGUMENTS."
  (cl-remove-if-not #'guix-command-argument-action? arguments))

-
-;;; Post processing popup arguments
-
-(defvar guix-command-post-processors
-  '(("environment"
-     guix-command-post-process-environment-packages
-     guix-command-post-process-environment-ad-hoc
-     guix-command-post-process-rest-multiple-leave)
-    ("hash"
-     guix-command-post-process-rest-single)
-    ("package"
-     guix-command-post-process-package-args)
-    ("system"
-     guix-command-post-process-rest-single))
-  "Alist of guix commands and functions for post-processing
-a list of arguments returned from popup interface.
-Each function is called on the returned arguments in turn.")
-
-(defvar guix-command-rest-arg-regexp
-  (rx string-start "-- " (group (+ any)))
-  "Regexp to match a string with the 'rest' arguments.")
-
-(defun guix-command-replace-args (args predicate modifier)
-  "Replace arguments matching PREDICATE from ARGS.
-Call MODIFIER on each argument matching PREDICATE and append the
-returned list of strings to the end of ARGS.  Remove the original
-arguments."
-  (let* ((rest nil)
+(defun guix-command-post-process-args (args)
+  "Adjust appropriately command line ARGS returned from popup command."
+  ;; XXX We need to split "--install foo bar" and similar strings into
+  ;; lists of strings.  But some commands (e.g., 'guix hash') accept a
+  ;; file name as the 'rest' argument, and as file names may contain
+  ;; spaces, splitting by spaces will break such names.  For example, the
+  ;; following argument: "-- /tmp/file with spaces" will be transformed
+  ;; into the following list: ("--" "/tmp/file" "with" "spaces") instead
+  ;; of the wished ("--" "/tmp/file with spaces").
+  (let* (rest
+         (rx (rx string-start
+                 (or "-- " "--install " "--remove ")))
         (args (mapcar (lambda (arg)
-                         (if (funcall predicate arg)
-                             (progn
-                               (push (funcall modifier arg) rest)
-                               nil)
+                         (if (string-match-p rx arg)
+                             (progn (push (split-string arg) rest)
+                                    nil)
                           arg))
                       args)))
    (if rest
        (apply #'append (delq nil args) rest)
      args)))

-(cl-defun guix-command-post-process-matching-args (args regexp
-                                                   &key group split?)
-  "Modify arguments from ARGS matching REGEXP by moving them to
-the end of ARGS list.  If SPLIT? is non-nil, split matching
-arguments into multiple subarguments."
-  (guix-command-replace-args
-   args
-   (lambda (arg)
-     (string-match regexp arg))
-   (lambda (arg)
-     (let ((val (match-string (or group 0) arg))
-           (fun (if split? #'split-string #'list)))
-       (funcall fun val)))))
-
-(defun guix-command-post-process-rest-single (args)
-  "Modify ARGS by moving '-- ARG' argument to the end of ARGS list."
-  (guix-command-post-process-matching-args
-   args guix-command-rest-arg-regexp
-   :group 1))
-
-(defun guix-command-post-process-rest-multiple (args)
-  "Modify ARGS by splitting '-- ARG ...' into multiple subarguments
-and moving them to the end of ARGS list.
-Remove '-- ' string."
-  (guix-command-post-process-matching-args
-   args guix-command-rest-arg-regexp
-   :group 1
-   :split? t))
-
-(defun guix-command-post-process-rest-multiple-leave (args)
-  "Modify ARGS by splitting '-- ARG ...' into multiple subarguments
-and moving them to the end of ARGS list.
-Leave '--' string as a separate argument."
-  (guix-command-post-process-matching-args
-   args guix-command-rest-arg-regexp
-   :split? t))
-
-(defun guix-command-post-process-package-args (args)
-  "Adjust popup ARGS for 'guix package' command."
-  (guix-command-post-process-matching-args
-   args (rx string-start (or "--install " "--remove ") (+ any))
-   :split? t))
-
-(defun guix-command-post-process-environment-packages (args)
-  "Adjust popup ARGS for specified packages of 'guix environment'
-command."
-  (guix-command-post-process-matching-args
-   args (rx string-start "++packages " (group (+ any)))
-   :group 1
-   :split? t))
-
-(defun guix-command-post-process-environment-ad-hoc (args)
-  "Adjust popup ARGS for '--ad-hoc' argument of 'guix environment'
-command."
-  (guix-command-post-process-matching-args
-   args (rx string-start "--ad-hoc " (+ any))
-   :split? t))
-
-(defun guix-command-post-process-args (commands args)
-  "Adjust popup ARGS for guix COMMANDS."
-  (let* ((command (car commands))
-         (processors
-          (append (guix-assoc-value guix-command-post-processors commands)
-                  (guix-assoc-value guix-command-post-processors command))))
-    (guix-modify args
-                 (or processors
-                     (list #'guix-command-post-process-rest-multiple)))))
-

 ;;; 'Execute' actions

@@ -621,7 +508,7 @@ command."
      (("size")
       ,(guix-command-make-argument
         :name "view" :char ?v :doc "View map"))
-      (("system" "shepherd-graph") ,graph-arg)
+      (("system" "dmd-graph") ,graph-arg)
      (("system" "extension-graph") ,graph-arg)))
  "Alist of guix commands and additional 'execute' action arguments.")

@@ -647,7 +534,7 @@ command."
     ("view" . guix-run-view-graph))
    (("size")
     ("view" . guix-run-view-size-map))
-    (("system" "shepherd-graph")
+    (("system" "dmd-graph")
     ("view" . guix-run-view-graph))
    (("system" "extension-graph")
     ("view" . guix-run-view-graph)))
@@ -692,11 +579,12 @@ Perform pull-specific actions after operation, see
 open the log file(s)."
  (let* ((args (if (member "--log-file" args)
                   args
-                 (cl-list* (car args) "--log-file" (cdr args))))
+                 (apply #'list (car args) "--log-file" (cdr args))))
         (output (guix-command-output args))
         (files  (split-string output "\n" t)))
    (dolist (file files)
-      (guix-build-log-find-file file))))
+      (guix-find-file-or-url file)
+      (guix-build-log-mode))))

 (defun guix-run-view-graph (args)
  "Run 'guix ARGS ...' graph command, make the image and open it."
@@ -717,9 +605,10 @@ open the log file(s)."
         (map-file (or wished-map-file (guix-png-file-name)))
         (args (if wished-map-file
                   args
-                 (cl-list* (car args)
-                           (concat "--map-file=" map-file)
-                           (cdr args)))))
+                 (apply #'list
+                        (car args)
+                        (concat "--map-file=" map-file)
+                        (cdr args)))))
    (guix-command-output args)
    (guix-find-file map-file)))

@@ -751,8 +640,7 @@ EXECUTOR function is called with the current command line arguments."
       ,doc
       (interactive (,arguments-fun))
       (,executor (append ',commands
-                          (guix-command-post-process-args
-                           ',commands args))))))
+                          (guix-command-post-process-args args))))))

 (defun guix-command-generate-popup-actions (actions &optional commands)
  "Generate 'popup' commands from ACTIONS arguments for guix COMMANDS."
@@ -198,7 +198,6 @@ to find 'modify-phases' keywords."
    "mbegin"
    "mlet"
    "mlet*"
-    "modify-services"
    "munless"
    "mwhen"
    "run-with-state"
@@ -289,7 +288,6 @@ Each rule should have a form (SYMBOL VALUE).  See `put' for details."
  (mlet 2)
  (mlet* 2)
  (modify-phases 1)
-  (modify-services 1)
  (munless 1)
  (mwhen 1)
  (operating-system 0)
@@ -364,9 +362,6 @@ bindings:
  (when guix-devel-activate-mode
    (guix-devel-mode)))

-;;;###autoload
-(add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe)
-

 (defvar guix-devel-emacs-font-lock-keywords
  (eval-when-compile
@@ -1,6 +1,6 @@
 ;;; guix-emacs.el --- Emacs packages installed with Guix

-;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
+;; Copyright © 2014 Alex Kost <alezost@gmail.com>

 ;; This file is part of GNU Guix.

@@ -24,42 +24,28 @@

 ;;; Code:

+(require 'guix-profiles)
 (require 'cl-lib)
-(unless (require 'guix-profiles nil t)
-  (defvar guix-user-profile (expand-file-name "~/.guix-profile")))

-(defcustom guix-package-enable-at-startup t
-  "If non-nil, activate Emacs packages installed in a user profile.
-Set this variable to nil before requiring `guix-emacs' file to
-avoid loading autoloads of Emacs packages installed in
-`guix-user-profile'."
+(defcustom guix-emacs-activate-after-operation t
+  "Activate Emacs packages after installing.
+If nil, do not load autoloads of the Emacs packages after
+they are successfully installed."
  :type 'boolean
  :group 'guix)

 (defvar guix-emacs-autoloads nil
  "List of the last loaded Emacs autoloads.")

-(defvar guix-emacs-autoloads-regexp
-  (rx (group (* any) "-autoloads")
-      ".el" (zero-or-one "c") string-end)
-  "Regexp to match Emacs 'autoloads' file.")
-
 (defun guix-emacs-directory (&optional profile)
  "Return directory with Emacs packages installed in PROFILE.
 If PROFILE is nil, use `guix-user-profile'."
  (expand-file-name "share/emacs/site-lisp"
                    (or profile guix-user-profile)))

-(defun guix-emacs-find-autoloads (directory)
-  "Return a list of Emacs 'autoloads' files in DIRECTORY.
-The files in the list do not have extensions (.el, .elc)."
-  (cl-remove-duplicates
-   (delq nil
-        (mapcar (lambda (file)
-                  (when (string-match guix-emacs-autoloads-regexp file)
-                    (match-string 1 file)))
-                (directory-files directory 'full-name nil 'no-sort)))
-   :test #'string=))
+(defun guix-emacs-find-autoloads-in-directory (directory)
+  "Return list of Emacs 'autoloads' files in DIRECTORY."
+  (directory-files directory 'full-name "-autoloads\\.el\\'" 'no-sort))

 (defun guix-emacs-subdirs (directory)
  "Return list of DIRECTORY subdirectories."
@@ -69,54 +55,48 @@ The files in the list do not have extensions (.el, .elc)."
                      (not (file-directory-p file))))
                (directory-files directory 'full-name nil 'no-sort)))

-(defun guix-emacs-directories (&optional profile)
-  "Return the list of directories under PROFILE that contain Emacs packages.
-This includes both `share/emacs/site-lisp/guix.d/PACKAGE'
-sub-directories and `share/emacs/site-lisp' itself.
-
+(defun guix-emacs-find-autoloads (&optional profile)
+  "Return list of autoloads of Emacs packages installed in PROFILE.
 If PROFILE is nil, use `guix-user-profile'.
-Return nil, if Emacs packages are not installed in PROFILE."
-  (let ((root-dir (guix-emacs-directory (or profile guix-user-profile))))
-    (when (file-directory-p root-dir)
-      (let* ((pkgs-dir  (expand-file-name "guix.d" root-dir))
-             (pkgs-dirs (when (file-directory-p pkgs-dir)
-                          (guix-emacs-subdirs pkgs-dir))))
-        (cons root-dir pkgs-dirs)))))
+Return nil if there are no emacs packages installed in PROFILE."
+  (let ((elisp-root-dir (guix-emacs-directory profile)))
+    (if (file-directory-p elisp-root-dir)
+        (let ((elisp-pkgs-dir (expand-file-name "guix.d" elisp-root-dir))
+              (root-autoloads (guix-emacs-find-autoloads-in-directory
+                               elisp-root-dir)))
+          (if (file-directory-p elisp-pkgs-dir)
+              (let ((pkgs-autoloads
+                     (cl-mapcan #'guix-emacs-find-autoloads-in-directory
+                                (guix-emacs-subdirs elisp-pkgs-dir))))
+                (append root-autoloads pkgs-autoloads))
+            root-autoloads))
+      (message "Directory '%s' does not exist." elisp-root-dir)
+      nil)))

 ;;;###autoload
-(defun guix-emacs-autoload-packages (&rest profiles)
-  "Autoload Emacs packages installed in PROFILES.
-If PROFILES are not specified, use a default user and system
-profiles.
+(defun guix-emacs-load-autoloads (&optional all)
+  "Load autoloads for Emacs packages installed in a user profile.
+Add autoloads directories to `load-path'.
+If ALL is nil, activate only those packages that were installed
+after the last activation, otherwise activate all Emacs packages
+installed in `guix-user-profile'."
+  (interactive "P")
+  (let* ((autoloads (guix-emacs-find-autoloads))
+         (files (if all
+                    autoloads
+                  (cl-nset-difference autoloads guix-emacs-autoloads
+                                      :test #'string=))))
+    (dolist (file files)
+      (cl-pushnew (file-name-directory file) load-path
+                  :test #'string=)
+      (load file 'noerror))
+    (setq guix-emacs-autoloads autoloads)))

-'Autoload' means add directories with Emacs packages to
-`load-path' and load 'autoloads' files matching
-`guix-emacs-autoloads-regexp'."
-  (interactive (list (if (fboundp 'guix-profile-prompt)
-                         (funcall 'guix-profile-prompt)
-                       guix-user-profile)))
-  (let ((profiles (or profiles
-                      (list "/run/current-system/profile"
-                            guix-user-profile))))
-    (dolist (profile profiles)
-      (let ((dirs (guix-emacs-directories profile)))
-        (when dirs
-          (let* ((autoloads     (cl-mapcan #'guix-emacs-find-autoloads
-                                           dirs))
-                 (new-autoloads (cl-nset-difference autoloads
-                                                    guix-emacs-autoloads
-                                                    :test #'string=)))
-            (dolist (dir dirs)
-              (cl-pushnew (directory-file-name dir)
-                          load-path
-                          :test #'string=))
-            (dolist (file new-autoloads)
-              (load file 'noerror))
-            (setq guix-emacs-autoloads
-                  (append new-autoloads guix-emacs-autoloads))))))))
-
-(when guix-package-enable-at-startup
-  (guix-emacs-autoload-packages))
+(defun guix-emacs-load-autoloads-maybe ()
+  "Load autoloads for Emacs packages if needed.
+See `guix-emacs-activate-after-operation' for details."
+  (and guix-emacs-activate-after-operation
+       (guix-emacs-load-autoloads)))

 (provide 'guix-emacs)

@@ -1,59 +0,0 @@
-;;; guix-entry.el --- 'Entry' type  -*- lexical-binding: t -*-
-
-;; Copyright © 2015 Alex Kost <alezost@gmail.com>
-
-;; This file is part of GNU Guix.
-
-;; GNU Guix is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Guix is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file provides an API for 'entry' type which is just an alist of
-;; KEY/VALUE pairs (KEY should be a symbol) with the required 'id' KEY.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'guix-utils)
-
-(defalias 'guix-entry-value #'guix-assq-value)
-
-(defun guix-entry-id (entry)
-  "Return ENTRY ID."
-  (guix-entry-value entry 'id))
-
-(defun guix-entry-by-id (id entries)
-  "Return an entry from ENTRIES by its ID."
-  (cl-find-if (lambda (entry)
-                (equal (guix-entry-id entry) id))
-              entries))
-
-(defun guix-entries-by-ids (ids entries)
-  "Return entries with IDS (a list of identifiers) from ENTRIES."
-  (cl-remove-if-not (lambda (entry)
-                      (member (guix-entry-id entry) ids))
-                    entries))
-
-(defun guix-replace-entry (id new-entry entries)
-  "Replace an entry with ID from ENTRIES by NEW-ENTRY.
-Return a list of entries with the replaced entry."
-  (cl-substitute-if new-entry
-                    (lambda (entry)
-                      (equal id (guix-entry-id entry)))
-                    entries
-                    :count 1))
-
-(provide 'guix-entry)
-
-;;; guix-entry.el ends here
@@ -23,7 +23,6 @@

 ;;; Code:

-(require 'cl-lib)
 (require 'guix-config)

 (defgroup guix-external nil
@@ -68,9 +67,10 @@ If ARGS is nil, use `guix-dot-default-arguments'."
  (or guix-dot-program
      (error (concat "Couldn't find 'dot'.\n"
                     "Set guix-dot-program to a proper value")))
-  (cl-list* guix-dot-program
-            (concat "-o" output-file)
-            (or args guix-dot-default-arguments)))
+  (apply #'list
+         guix-dot-program
+         (concat "-o" output-file)
+         (or args guix-dot-default-arguments)))

 (defun guix-dot-file-name ()
  "Call `guix-dot-file-name-function'."
@@ -46,23 +46,11 @@ Return a list of strings with result values of evaluation."
 (defun guix-geiser-eval-read (str &optional repl)
  "Evaluate STR with guile expression using Geiser REPL.
 Return elisp expression of the first result value of evaluation."
-  ;; The goal is to convert a string with scheme expression into elisp
-  ;; expression.
-  (let ((result (car (guix-geiser-eval str repl))))
-    (cond
-     ((or (string= result "#f")
-          (string= result "#<unspecified>"))
-      nil)
-     ((string= result "#t")
-      t)
-     (t
-      (read (replace-regexp-in-string
-             "[ (]\\(#f\\)" "nil"
-             (replace-regexp-in-string
-              "[ (]\\(#t\\)" "t"
-              result
-              nil nil 1)
-             nil nil 1))))))
+  ;; Parsing scheme code with elisp `read' is probably not the best idea.
+  (read (replace-regexp-in-string
+         "#f\\|#<unspecified>" "nil"
+         (replace-regexp-in-string
+          "#t" "t" (car (guix-geiser-eval str repl))))))

 (defun guix-repl-send (cmd &optional save-history)
  "Send CMD input string to the current REPL buffer.
@@ -1,362 +0,0 @@
-;;; guix-hydra-build.el --- Interface for Hydra builds  -*- lexical-binding: t -*-
-
-;; Copyright © 2015 Alex Kost <alezost@gmail.com>
-
-;; This file is part of GNU Guix.
-
-;; GNU Guix is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Guix is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file provides an interface for displaying Hydra builds in
-;; 'list' and 'info' buffers.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'guix-buffer)
-(require 'guix-list)
-(require 'guix-info)
-(require 'guix-hydra)
-(require 'guix-build-log)
-(require 'guix-utils)
-
-(guix-hydra-define-entry-type hydra-build
-  :search-types '((latest . guix-hydra-build-latest-api-url)
-                  (queue  . guix-hydra-build-queue-api-url))
-  :filters '(guix-hydra-build-filter-status)
-  :filter-names '((nixname . name)
-                  (buildstatus . build-status)
-                  (timestamp . time))
-  :filter-boolean-params '(finished busy))
-
-(defun guix-hydra-build-get-display (search-type &rest args)
-  "Search for Hydra builds and show results."
-  (apply #'guix-list-get-display-entries
-         'hydra-build search-type args))
-
-(cl-defun guix-hydra-build-latest-prompt-args (&key project jobset
-                                                    job system)
-  "Prompt for and return a list of 'latest builds' arguments."
-  (let* ((number      (read-number "Number of latest builds: "))
-         (project     (if current-prefix-arg
-                          (guix-hydra-read-project nil project)
-                        project))
-         (jobset      (if current-prefix-arg
-                          (guix-hydra-read-jobset nil jobset)
-                        jobset))
-         (job-or-name (if current-prefix-arg
-                          (guix-hydra-read-job nil job)
-                        job))
-         (job         (and job-or-name
-                           (string-match-p guix-hydra-job-regexp
-                                           job-or-name)
-                           job-or-name))
-         (system      (if (and (not job)
-                               (or current-prefix-arg
-                                   (and job-or-name (not system))))
-                          (if job-or-name
-                              (guix-while-null
-                                (guix-hydra-read-system
-                                 (concat job-or-name ".") system))
-                            (guix-hydra-read-system nil system))
-                        system))
-         (job         (or job
-                          (and job-or-name
-                               (concat job-or-name "." system)))))
-    (list number
-          :project project
-          :jobset  jobset
-          :job     job
-          :system  system)))
-
-(defun guix-hydra-build-view-log (id)
-  "View build log of a hydra build ID."
-  (guix-build-log-find-file (guix-hydra-build-log-url id)))
-
-
-;;; Defining URLs
-
-(defun guix-hydra-build-url (id)
-  "Return Hydra URL of a build ID."
-  (guix-hydra-url "build/" (number-to-string id)))
-
-(defun guix-hydra-build-log-url (id)
-  "Return Hydra URL of the log file of a build ID."
-  (concat (guix-hydra-build-url id) "/log/raw"))
-
-(cl-defun guix-hydra-build-latest-api-url
-    (number &key project jobset job system)
-  "Return Hydra API URL to receive latest NUMBER of builds."
-  (guix-hydra-api-url "latestbuilds"
-    `(("nr" . ,number)
-      ("project" . ,project)
-      ("jobset" . ,jobset)
-      ("job" . ,job)
-      ("system" . ,system))))
-
-(defun guix-hydra-build-queue-api-url (number)
-  "Return Hydra API URL to receive the NUMBER of queued builds."
-  (guix-hydra-api-url "queue"
-    `(("nr" . ,number))))
-
-
-;;; Filters for processing raw entries
-
-(defun guix-hydra-build-filter-status (entry)
-  "Add 'status' parameter to 'hydra-build' ENTRY."
-  (let ((status (if (guix-entry-value entry 'finished)
-                    (guix-hydra-build-status-number->name
-                     (guix-entry-value entry 'build-status))
-                  (if (guix-entry-value entry 'busy)
-                      'running
-                    'scheduled))))
-    (cons `(status . ,status)
-          entry)))
-
-
-;;; Build status
-
-(defface guix-hydra-build-status-running
-  '((t :inherit bold))
-  "Face used if hydra build is not finished."
-  :group 'guix-hydra-build-faces)
-
-(defface guix-hydra-build-status-scheduled
-  '((t))
-  "Face used if hydra build is scheduled."
-  :group 'guix-hydra-build-faces)
-
-(defface guix-hydra-build-status-succeeded
-  '((t :inherit success))
-  "Face used if hydra build succeeded."
-  :group 'guix-hydra-build-faces)
-
-(defface guix-hydra-build-status-cancelled
-  '((t :inherit warning))
-  "Face used if hydra build was cancelled."
-  :group 'guix-hydra-build-faces)
-
-(defface guix-hydra-build-status-failed
-  '((t :inherit error))
-  "Face used if hydra build failed."
-  :group 'guix-hydra-build-faces)
-
-(defvar guix-hydra-build-status-alist
-  '((0 . succeeded)
-    (1 . failed-build)
-    (2 . failed-dependency)
-    (3 . failed-other)
-    (4 . cancelled))
-  "Alist of hydra build status numbers and status names.
-Status numbers are returned by Hydra API, names (symbols) are
-used internally by the elisp code of this package.")
-
-(defun guix-hydra-build-status-number->name (number)
-  "Convert build status number to a name.
-See `guix-hydra-build-status-alist'."
-  (guix-assq-value guix-hydra-build-status-alist number))
-
-(defun guix-hydra-build-status-string (status)
-  "Return a human readable string for build STATUS."
-  (cl-case status
-    (scheduled
-     (guix-get-string "Scheduled" 'guix-hydra-build-status-scheduled))
-    (running
-     (guix-get-string "Running" 'guix-hydra-build-status-running))
-    (succeeded
-     (guix-get-string "Succeeded" 'guix-hydra-build-status-succeeded))
-    (cancelled
-     (guix-get-string "Cancelled" 'guix-hydra-build-status-cancelled))
-    (failed-build
-     (guix-hydra-build-status-fail-string))
-    (failed-dependency
-     (guix-hydra-build-status-fail-string "dependency"))
-    (failed-other
-     (guix-hydra-build-status-fail-string "other"))))
-
-(defun guix-hydra-build-status-fail-string (&optional reason)
-  "Return a string for a failed build."
-  (let ((base (guix-get-string "Failed" 'guix-hydra-build-status-failed)))
-    (if reason
-        (concat base " (" reason ")")
-      base)))
-
-(defun guix-hydra-build-finished? (entry)
-  "Return non-nil, if hydra build was finished."
-  (guix-entry-value entry 'finished))
-
-(defun guix-hydra-build-running? (entry)
-  "Return non-nil, if hydra build is running."
-  (eq (guix-entry-value entry 'status)
-      'running))
-
-(defun guix-hydra-build-scheduled? (entry)
-  "Return non-nil, if hydra build is scheduled."
-  (eq (guix-entry-value entry 'status)
-      'scheduled))
-
-(defun guix-hydra-build-succeeded? (entry)
-  "Return non-nil, if hydra build succeeded."
-  (eq (guix-entry-value entry 'status)
-      'succeeded))
-
-(defun guix-hydra-build-cancelled? (entry)
-  "Return non-nil, if hydra build was cancelled."
-  (eq (guix-entry-value entry 'status)
-      'cancelled))
-
-(defun guix-hydra-build-failed? (entry)
-  "Return non-nil, if hydra build failed."
-  (memq (guix-entry-value entry 'status)
-        '(failed-build failed-dependency failed-other)))
-
-
-;;; Hydra build 'info'
-
-(guix-hydra-info-define-interface hydra-build
-  :mode-name "Hydra-Build-Info"
-  :buffer-name "*Guix Hydra Build Info*"
-  :format '((name ignore (simple guix-info-heading))
-            ignore
-            guix-hydra-build-info-insert-url
-            (time     format (time))
-            (status   format guix-hydra-build-info-insert-status)
-            (project  format (format guix-hydra-build-project))
-            (jobset   format (format guix-hydra-build-jobset))
-            (job      format (format guix-hydra-build-job))
-            (system   format (format guix-hydra-build-system))
-            (priority format (format))))
-
-(defface guix-hydra-build-info-project
-  '((t :inherit link))
-  "Face for project names."
-  :group 'guix-hydra-build-info-faces)
-
-(defface guix-hydra-build-info-jobset
-  '((t :inherit link))
-  "Face for jobsets."
-  :group 'guix-hydra-build-info-faces)
-
-(defface guix-hydra-build-info-job
-  '((t :inherit link))
-  "Face for jobs."
-  :group 'guix-hydra-build-info-faces)
-
-(defface guix-hydra-build-info-system
-  '((t :inherit link))
-  "Face for system names."
-  :group 'guix-hydra-build-info-faces)
-
-(defmacro guix-hydra-build-define-button (name)
-  "Define `guix-hydra-build-NAME' button."
-  (let* ((name-str    (symbol-name name))
-         (button-name (intern (concat "guix-hydra-build-" name-str)))
-         (face-name   (intern (concat "guix-hydra-build-info-" name-str)))
-         (keyword     (intern (concat ":" name-str))))
-    `(define-button-type ',button-name
-       :supertype 'guix
-       'face ',face-name
-       'help-echo ,(format "\
-Show latest builds for this %s (with prefix, prompt for all parameters)"
-                           name-str)
-       'action (lambda (btn)
-                 (let ((args (guix-hydra-build-latest-prompt-args
-                              ,keyword (button-label btn))))
-                   (apply #'guix-hydra-build-get-display
-                          'latest args))))))
-
-(guix-hydra-build-define-button project)
-(guix-hydra-build-define-button jobset)
-(guix-hydra-build-define-button job)
-(guix-hydra-build-define-button system)
-
-(defun guix-hydra-build-info-insert-url (entry)
-  "Insert Hydra URL for the build ENTRY."
-  (guix-insert-button (guix-hydra-build-url (guix-entry-id entry))
-                      'guix-url)
-  (when (guix-hydra-build-finished? entry)
-    (guix-info-insert-indent)
-    (guix-info-insert-action-button
-     "Build log"
-     (lambda (btn)
-       (guix-hydra-build-view-log (button-get btn 'id)))
-     "View build log"
-     'id (guix-entry-id entry))))
-
-(defun guix-hydra-build-info-insert-status (status &optional _)
-  "Insert a string with build STATUS."
-  (insert (guix-hydra-build-status-string status)))
-
-
-;;; Hydra build 'list'
-
-(guix-hydra-list-define-interface hydra-build
-  :mode-name "Hydra-Build-List"
-  :buffer-name "*Guix Hydra Build List*"
-  :format '((name nil 30 t)
-            (system nil 16 t)
-            (status guix-hydra-build-list-get-status 20 t)
-            (project nil 10 t)
-            (jobset nil 17 t)
-            (time guix-list-get-time 20 t)))
-
-(let ((map guix-hydra-build-list-mode-map))
-  (define-key map (kbd "B") 'guix-hydra-build-list-latest-builds)
-  (define-key map (kbd "L") 'guix-hydra-build-list-view-log))
-
-(defun guix-hydra-build-list-get-status (status &optional _)
-  "Return a string for build STATUS."
-  (guix-hydra-build-status-string status))
-
-(defun guix-hydra-build-list-latest-builds (number &rest args)
-  "Display latest NUMBER of Hydra builds of the current job.
-Interactively, prompt for NUMBER.  With prefix argument, prompt
-for all ARGS."
-  (interactive
-   (let ((entry (guix-list-current-entry)))
-     (guix-hydra-build-latest-prompt-args
-      :project (guix-entry-value entry 'project)
-      :jobset  (guix-entry-value entry 'name)
-      :job     (guix-entry-value entry 'job)
-      :system  (guix-entry-value entry 'system))))
-  (apply #'guix-hydra-latest-builds number args))
-
-(defun guix-hydra-build-list-view-log ()
-  "View build log of the current Hydra build."
-  (interactive)
-  (guix-hydra-build-view-log (guix-list-current-id)))
-
-
-;;; Interactive commands
-
-;;;###autoload
-(defun guix-hydra-latest-builds (number &rest args)
-  "Display latest NUMBER of Hydra builds.
-ARGS are the same arguments as for `guix-hydra-build-latest-api-url'.
-Interactively, prompt for NUMBER.  With prefix argument, prompt
-for all ARGS."
-  (interactive (guix-hydra-build-latest-prompt-args))
-  (apply #'guix-hydra-build-get-display
-         'latest number args))
-
-;;;###autoload
-(defun guix-hydra-queued-builds (number)
-  "Display the NUMBER of queued Hydra builds."
-  (interactive "NNumber of queued builds: ")
-  (guix-hydra-build-get-display 'queue number))
-
-(provide 'guix-hydra-build)
-
-;;; guix-hydra-build.el ends here
@@ -1,162 +0,0 @@
-;;; guix-hydra-jobset.el --- Interface for Hydra jobsets  -*- lexical-binding: t -*-
-
-;; Copyright © 2015 Alex Kost <alezost@gmail.com>
-
-;; This file is part of GNU Guix.
-
-;; GNU Guix is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Guix is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file provides an interface for displaying Hydra jobsets in
-;; 'list' and 'info' buffers.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'guix-buffer)
-(require 'guix-list)
-(require 'guix-info)
-(require 'guix-hydra)
-(require 'guix-hydra-build)
-(require 'guix-utils)
-
-(guix-hydra-define-entry-type hydra-jobset
-  :search-types '((project . guix-hydra-jobset-api-url))
-  :filters '(guix-hydra-jobset-filter-id)
-  :filter-names '((nrscheduled . scheduled)
-                  (nrsucceeded . succeeded)
-                  (nrfailed . failed)
-                  (nrtotal . total)))
-
-(defun guix-hydra-jobset-get-display (search-type &rest args)
-  "Search for Hydra builds and show results."
-  (apply #'guix-list-get-display-entries
-         'hydra-jobset search-type args))
-
-
-;;; Defining URLs
-
-(defun guix-hydra-jobset-url (project jobset)
-  "Return Hydra URL of a PROJECT's JOBSET."
-  (guix-hydra-url "jobset/" project "/" jobset))
-
-(defun guix-hydra-jobset-api-url (project)
-  "Return Hydra API URL for jobsets by PROJECT."
-  (guix-hydra-api-url "jobsets"
-    `(("project" . ,project))))
-
-
-;;; Filters for processing raw entries
-
-(defun guix-hydra-jobset-filter-id (entry)
-  "Add 'ID' parameter to 'hydra-jobset' ENTRY."
-  (cons `(id . ,(guix-entry-value entry 'name))
-        entry))
-
-
-;;; Hydra jobset 'info'
-
-(guix-hydra-info-define-interface hydra-jobset
-  :mode-name "Hydra-Jobset-Info"
-  :buffer-name "*Guix Hydra Jobset Info*"
-  :format '((name ignore (simple guix-info-heading))
-            ignore
-            guix-hydra-jobset-info-insert-url
-            (project   format guix-hydra-jobset-info-insert-project)
-            (scheduled format (format guix-hydra-jobset-info-scheduled))
-            (succeeded format (format guix-hydra-jobset-info-succeeded))
-            (failed    format (format guix-hydra-jobset-info-failed))
-            (total     format (format guix-hydra-jobset-info-total))))
-
-(defface guix-hydra-jobset-info-scheduled
-  '((t))
-  "Face used for the number of scheduled builds."
-  :group 'guix-hydra-jobset-info-faces)
-
-(defface guix-hydra-jobset-info-succeeded
-  '((t :inherit guix-hydra-build-status-succeeded))
-  "Face used for the number of succeeded builds."
-  :group 'guix-hydra-jobset-info-faces)
-
-(defface guix-hydra-jobset-info-failed
-  '((t :inherit guix-hydra-build-status-failed))
-  "Face used for the number of failed builds."
-  :group 'guix-hydra-jobset-info-faces)
-
-(defface guix-hydra-jobset-info-total
-  '((t))
-  "Face used for the total number of builds."
-  :group 'guix-hydra-jobset-info-faces)
-
-(defun guix-hydra-jobset-info-insert-project (project entry)
-  "Insert PROJECT button for the jobset ENTRY."
-  (let ((jobset (guix-entry-value entry 'name)))
-    (guix-insert-button
-     project 'guix-hydra-build-project
-     'action (lambda (btn)
-               (let ((args (guix-hydra-build-latest-prompt-args
-                            :project (button-get btn 'project)
-                            :jobset  (button-get btn 'jobset))))
-                 (apply #'guix-hydra-build-get-display
-                        'latest args)))
-     'project project
-     'jobset jobset)))
-
-(defun guix-hydra-jobset-info-insert-url (entry)
-  "Insert Hydra URL for the jobset ENTRY."
-  (guix-insert-button (guix-hydra-jobset-url
-                       (guix-entry-value entry 'project)
-                       (guix-entry-value entry 'name))
-                      'guix-url))
-
-
-;;; Hydra jobset 'list'
-
-(guix-hydra-list-define-interface hydra-jobset
-  :mode-name "Hydra-Jobset-List"
-  :buffer-name "*Guix Hydra Jobset List*"
-  :format '((name nil 25 t)
-            (project nil 10 t)
-            (scheduled nil 12 t)
-            (succeeded nil 12 t)
-            (failed nil 9 t)
-            (total nil 10 t)))
-
-(let ((map guix-hydra-jobset-list-mode-map))
-  (define-key map (kbd "B") 'guix-hydra-jobset-list-latest-builds))
-
-(defun guix-hydra-jobset-list-latest-builds (number &rest args)
-  "Display latest NUMBER of Hydra builds of the current jobset.
-Interactively, prompt for NUMBER.  With prefix argument, prompt
-for all ARGS."
-  (interactive
-   (let ((entry (guix-list-current-entry)))
-     (guix-hydra-build-latest-prompt-args
-      :project (guix-entry-value entry 'project)
-      :jobset  (guix-entry-value entry 'name))))
-  (apply #'guix-hydra-latest-builds number args))
-
-
-;;; Interactive commands
-
-;;;###autoload
-(defun guix-hydra-jobsets (project)
-  "Display jobsets of PROJECT."
-  (interactive (list (guix-hydra-read-project)))
-  (guix-hydra-jobset-get-display 'project project))
-
-(provide 'guix-hydra-jobset)
-
-;;; guix-hydra-jobset.el ends here
@@ -1,367 +0,0 @@
-;;; guix-hydra.el --- Common code for interacting with Hydra  -*- lexical-binding: t -*-
-
-;; Copyright © 2015 Alex Kost <alezost@gmail.com>
-
-;; This file is part of GNU Guix.
-
-;; GNU Guix is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Guix is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file provides some general code for 'list'/'info' interfaces for
-;; Hydra (Guix build farm).
-
-;;; Code:
-
-(require 'json)
-(require 'guix-buffer)
-(require 'guix-entry)
-(require 'guix-utils)
-(require 'guix-help-vars)
-
-(guix-define-groups hydra)
-
-(defvar guix-hydra-job-regexp
-  (concat ".*\\." (regexp-opt guix-help-system-types) "\\'")
-  "Regexp matching a full name of Hydra job (including system).")
-
-(defun guix-hydra-job-name-specification (name version)
-  "Return Hydra's job name specification by NAME and VERSION."
-  (concat name "-" version))
-
-(defun guix-hydra-message (entries search-type &rest _)
-  "Display a message after showing Hydra ENTRIES."
-  ;; XXX Add more messages maybe.
-  (when (null entries)
-    (if (eq search-type 'fake)
-        (message "The update is impossible due to lack of Hydra API.")
-      (message "Hydra has returned no results."))))
-
-(defun guix-hydra-list-describe (ids)
-  "Describe 'hydra' entries with IDS (list of identifiers)."
-  (guix-buffer-display-entries
-   (guix-entries-by-ids ids (guix-buffer-current-entries))
-   'info (guix-buffer-current-entry-type)
-   ;; Hydra does not provide an API to receive builds/jobsets by
-   ;; IDs/names, so we use a 'fake' search type.
-   '(fake)
-   'add))
-
-
-;;; Readers
-
-(defvar guix-hydra-projects
-  '("gnu" "guix")
-  "List of available Hydra projects.")
-
-(guix-define-readers
- :completions-var guix-hydra-projects
- :single-reader guix-hydra-read-project
- :single-prompt "Project: ")
-
-(guix-define-readers
- :single-reader guix-hydra-read-jobset
- :single-prompt "Jobset: ")
-
-(guix-define-readers
- :single-reader guix-hydra-read-job
- :single-prompt "Job: ")
-
-(guix-define-readers
- :completions-var guix-help-system-types
- :single-reader guix-hydra-read-system
- :single-prompt "System: ")
-
-
-;;; Defining URLs
-
-(defvar guix-hydra-url "http://hydra.gnu.org"
-  "URL of the Hydra build farm.")
-
-(defun guix-hydra-url (&rest url-parts)
-  "Return Hydra URL."
-  (apply #'concat guix-hydra-url "/" url-parts))
-
-(defun guix-hydra-api-url (type args)
-  "Return URL for receiving data using Hydra API.
-TYPE is the name of an allowed method.
-ARGS is alist of (KEY . VALUE) pairs.
-Skip ARG, if VALUE is nil or an empty string."
-  (declare (indent 1))
-  (let* ((fields (mapcar
-                  (lambda (arg)
-                    (pcase arg
-                      (`(,key . ,value)
-                       (unless (or (null value)
-                                   (equal "" value))
-                         (concat (guix-hexify key) "="
-                                 (guix-hexify value))))
-                      (_ (error "Wrong argument '%s'" arg))))
-                  args))
-         (fields (mapconcat #'identity (delq nil fields) "&")))
-    (guix-hydra-url "api/" type "?" fields)))
-
-
-;;; Receiving data from Hydra
-
-(defun guix-hydra-receive-data (url)
-  "Return output received from URL and processed with `json-read'."
-  (with-temp-buffer
-    (url-insert-file-contents url)
-    (goto-char (point-min))
-    (let ((json-key-type 'symbol)
-          (json-array-type 'list)
-          (json-object-type 'alist))
-      (json-read))))
-
-(defun guix-hydra-get-entries (entry-type search-type &rest args)
-  "Receive ENTRY-TYPE entries from Hydra.
-SEARCH-TYPE is one of the types defined by `guix-hydra-define-interface'."
-  (unless (eq search-type 'fake)
-    (let* ((url         (apply #'guix-hydra-search-url
-                               entry-type search-type args))
-           (raw-entries (guix-hydra-receive-data url))
-           (entries     (guix-hydra-filter-entries
-                         raw-entries
-                         (guix-hydra-filters entry-type))))
-      entries)))
-
-
-;;; Filters for processing raw entries
-
-(defun guix-hydra-filter-entries (entries filters)
-  "Filter ENTRIES using FILTERS.
-Call `guix-modify' on each entry from ENTRIES."
-  (mapcar (lambda (entry)
-            (guix-modify entry filters))
-          entries))
-
-(defun guix-hydra-filter-names (entry name-alist)
-  "Replace names of ENTRY parameters using NAME-ALIST.
-Each element of NAME-ALIST is (OLD-NAME . NEW-NAME) pair."
-  (mapcar (lambda (param)
-            (pcase param
-              (`(,name . ,val)
-               (let ((new-name (guix-assq-value name-alist name)))
-                 (if new-name
-                     (cons new-name val)
-                   param)))))
-          entry))
-
-(defun guix-hydra-filter-boolean (entry params)
-  "Convert number PARAMS (0/1) of ENTRY to boolean values (nil/t)."
-  (mapcar (lambda (param)
-            (pcase param
-              (`(,name . ,val)
-               (if (memq name params)
-                   (cons name (guix-number->bool val))
-                 param))))
-          entry))
-
-
-;;; Wrappers for defined variables
-
-(defvar guix-hydra-entry-type-data nil
-  "Alist with hydra entry type data.
-This alist is filled by `guix-hydra-define-entry-type' macro.")
-
-(defun guix-hydra-entry-type-value (entry-type symbol)
-  "Return SYMBOL's value for ENTRY-TYPE from `guix-hydra'."
-  (symbol-value (guix-assq-value guix-hydra-entry-type-data
-                                 entry-type symbol)))
-
-(defun guix-hydra-search-url (entry-type search-type &rest args)
-  "Return URL to receive ENTRY-TYPE entries from Hydra."
-  (apply (guix-assq-value (guix-hydra-entry-type-value
-                           entry-type 'search-types)
-                          search-type)
-         args))
-
-(defun guix-hydra-filters (entry-type)
-  "Return a list of filters for ENTRY-TYPE."
-  (guix-hydra-entry-type-value entry-type 'filters))
-
-
-;;; Interface definers
-
-(defmacro guix-hydra-define-entry-type (entry-type &rest args)
-  "Define general code for ENTRY-TYPE.
-Remaining arguments (ARGS) should have a form [KEYWORD VALUE] ...
-
-Required keywords:
-
-  - `:search-types' - default value of the generated
-    `guix-ENTRY-TYPE-search-types' variable.
-
-Optional keywords:
-
-  - `:filters' - default value of the generated
-    `guix-ENTRY-TYPE-filters' variable.
-
-  - `:filter-names' - if specified, a generated
-    `guix-ENTRY-TYPE-filter-names' function for filtering these
-    names will be added to `guix-ENTRY-TYPE-filters' variable.
-
-  - `:filter-boolean-params' - if specified, a generated
-    `guix-ENTRY-TYPE-filter-boolean' function for filtering these
-    names will be added to `guix-ENTRY-TYPE-filters' variable.
-
-The rest keyword arguments are passed to
-`guix-define-entry-type' macro."
-  (declare (indent 1))
-  (let* ((entry-type-str     (symbol-name entry-type))
-         (prefix             (concat "guix-" entry-type-str))
-         (search-types-var   (intern (concat prefix "-search-types")))
-         (filters-var        (intern (concat prefix "-filters")))
-         (get-fun            (intern (concat prefix "-get-entries"))))
-    (guix-keyword-args-let args
-        ((search-types-val   :search-types)
-         (filters-val        :filters)
-         (filter-names-val   :filter-names)
-         (filter-bool-val    :filter-boolean-params))
-      `(progn
-         (defvar ,search-types-var ,search-types-val
-           ,(format "\
-Alist of search types and according URL functions.
-Functions are used to define URL to receive '%s' entries."
-                    entry-type-str))
-
-         (defvar ,filters-var ,filters-val
-           ,(format "\
-List of filters for '%s' parameters.
-Each filter is a function that should take an entry as a single
-argument, and should also return an entry."
-                    entry-type-str))
-
-         ,(when filter-bool-val
-            (let ((filter-bool-var (intern (concat prefix
-                                                   "-filter-boolean-params")))
-                  (filter-bool-fun (intern (concat prefix
-                                                   "-filter-boolean"))))
-              `(progn
-                 (defvar ,filter-bool-var ,filter-bool-val
-                   ,(format "\
-List of '%s' parameters that should be transformed to boolean values."
-                            entry-type-str))
-
-                 (defun ,filter-bool-fun (entry)
-                   ,(format "\
-Run `guix-hydra-filter-boolean' with `%S' variable."
-                            filter-bool-var)
-                   (guix-hydra-filter-boolean entry ,filter-bool-var))
-
-                 (setq ,filters-var
-                       (cons ',filter-bool-fun ,filters-var)))))
-
-         ;; Do not move this clause up!: name filtering should be
-         ;; performed before any other filtering, so this filter should
-         ;; be consed after the boolean filter.
-         ,(when filter-names-val
-            (let* ((filter-names-var (intern (concat prefix
-                                                     "-filter-names")))
-                   (filter-names-fun filter-names-var))
-              `(progn
-                 (defvar ,filter-names-var ,filter-names-val
-                   ,(format "\
-Alist of '%s' parameter names returned by Hydra API and names
-used internally by the elisp code of this package."
-                            entry-type-str))
-
-                 (defun ,filter-names-fun (entry)
-                   ,(format "\
-Run `guix-hydra-filter-names' with `%S' variable."
-                            filter-names-var)
-                   (guix-hydra-filter-names entry ,filter-names-var))
-
-                 (setq ,filters-var
-                       (cons ',filter-names-fun ,filters-var)))))
-
-         (defun ,get-fun (search-type &rest args)
-           ,(format "\
-Receive '%s' entries.
-See `guix-hydra-get-entries' for details."
-                    entry-type-str)
-           (apply #'guix-hydra-get-entries
-                  ',entry-type search-type args))
-
-         (guix-alist-put!
-          '((search-types . ,search-types-var)
-            (filters      . ,filters-var))
-          'guix-hydra-entry-type-data ',entry-type)
-
-         (guix-define-entry-type ,entry-type
-           :parent-group guix-hydra
-           :parent-faces-group guix-hydra-faces
-           ,@%foreign-args)))))
-
-(defmacro guix-hydra-define-interface (buffer-type entry-type &rest args)
-  "Define BUFFER-TYPE interface for displaying ENTRY-TYPE entries.
-
-This macro should be called after calling
-`guix-hydra-define-entry-type' with the same ENTRY-TYPE.
-
-ARGS are passed to `guix-BUFFER-TYPE-define-interface' macro."
-  (declare (indent 2))
-  (let* ((entry-type-str  (symbol-name entry-type))
-         (buffer-type-str (symbol-name buffer-type))
-         (get-fun         (intern (concat "guix-" entry-type-str
-                                          "-get-entries")))
-         (definer         (intern (concat "guix-" buffer-type-str
-                                          "-define-interface"))))
-    `(,definer ,entry-type
-       :get-entries-function ',get-fun
-       :message-function 'guix-hydra-message
-       ,@args)))
-
-(defmacro guix-hydra-info-define-interface (entry-type &rest args)
-  "Define 'info' interface for displaying ENTRY-TYPE entries.
-See `guix-hydra-define-interface'."
-  (declare (indent 1))
-  `(guix-hydra-define-interface info ,entry-type
-     ,@args))
-
-(defmacro guix-hydra-list-define-interface (entry-type &rest args)
-  "Define 'list' interface for displaying ENTRY-TYPE entries.
-Remaining arguments (ARGS) should have a form [KEYWORD VALUE] ...
-
-Optional keywords:
-
-  - `:describe-function' - default value of the generated
-    `guix-ENTRY-TYPE-list-describe-function' variable (if not
-    specified, use `guix-hydra-list-describe').
-
-The rest keyword arguments are passed to
-`guix-hydra-define-interface' macro."
-  (declare (indent 1))
-  (guix-keyword-args-let args
-      ((describe-val :describe-function))
-    `(guix-hydra-define-interface list ,entry-type
-       :describe-function ,(or describe-val ''guix-hydra-list-describe)
-       ,@args)))
-
-
-(defvar guix-hydra-font-lock-keywords
-  (eval-when-compile
-    `((,(rx "(" (group (or "guix-hydra-define-entry-type"
-                           "guix-hydra-define-interface"
-                           "guix-hydra-info-define-interface"
-                           "guix-hydra-list-define-interface"))
-            symbol-end)
-       . 1))))
-
-(font-lock-add-keywords 'emacs-lisp-mode guix-hydra-font-lock-keywords)
-
-(provide 'guix-hydra)
-
-;;; guix-hydra.el ends here
@@ -1,3 +1,19 @@
 (require 'guix-autoloads)
-(message "(require 'guix-init) is obsolete, use (require 'guix-autoloads) instead.")
+(require 'guix-emacs)
+
+(defcustom guix-package-enable-at-startup t
+  "If non-nil, activate Emacs packages installed in a user profile.
+Set this variable to nil before requiring `guix-init' file to
+avoid loading autoloads of Emacs packages installed in
+`guix-user-profile'."
+  :type 'boolean
+  :group 'guix)
+
+(add-to-list 'load-path (guix-emacs-directory))
+
+(when guix-package-enable-at-startup
+  (guix-emacs-load-autoloads 'all))
+
+(add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe)
+
 (provide 'guix-init)
@@ -1,130 +0,0 @@
-;;; guix-license.el --- Licenses
-
-;; Copyright © 2016 Alex Kost <alezost@gmail.com>
-
-;; This file is part of GNU Guix.
-
-;; GNU Guix is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Guix is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file provides the code to work with licenses of Guix packages.
-
-;;; Code:
-
-(require 'guix-buffer)
-(require 'guix-list)
-(require 'guix-info)
-(require 'guix-read)
-(require 'guix-backend)
-(require 'guix-guile)
-
-(guix-define-entry-type license)
-
-(defun guix-lookup-license-url (license)
-  "Return URL of a LICENSE."
-  (or (guix-eval-read (guix-make-guile-expression
-                       'lookup-license-uri license))
-      (error "Hm, I don't know URL of '%s' license" license)))
-
-(defun guix-license-get-entries (search-type &rest args)
-  "Receive 'license' entries.
-SEARCH-TYPE may be one of the following symbols: `all', `id', `name'."
-  (guix-eval-read
-   (apply #'guix-make-guile-expression
-          'license-entries search-type args)))
-
-(defun guix-license-get-display (search-type &rest args)
-  "Search for licenses and show results."
-  (apply #'guix-list-get-display-entries
-         'license search-type args))
-
-
-;;; License 'info'
-
-(guix-info-define-interface license
-  :buffer-name "*Guix License Info*"
-  :get-entries-function 'guix-license-get-entries
-  :format '((name ignore (simple guix-info-heading))
-            ignore
-            guix-license-insert-packages-button
-            (url ignore (simple guix-url))
-            guix-license-insert-comment)
-  :titles '((url . "URL")))
-
-(declare-function guix-packages-by-license "guix-ui-package")
-
-(defun guix-license-insert-packages-button (entry)
-  "Insert button to display packages by license ENTRY."
-  (guix-info-insert-action-button
-   "Packages"
-   (lambda (btn)
-     (guix-packages-by-license (button-get btn 'license)))
-   "Show packages with this license"
-   'license (guix-entry-value entry 'name)))
-
-(defun guix-license-insert-comment (entry)
-  "Insert 'comment' of a license ENTRY."
-  (let ((comment (guix-entry-value entry 'comment)))
-    (if (and comment
-             (string-match-p "^http" comment))
-        (guix-info-insert-value-simple comment 'guix-url)
-      (guix-info-insert-title-simple
-       (guix-info-param-title 'license 'comment))
-      (guix-info-insert-value-indent comment))))
-
-
-;;; License 'list'
-
-(guix-list-define-interface license
-  :buffer-name "*Guix Licenses*"
-  :get-entries-function 'guix-license-get-entries
-  :describe-function 'guix-license-list-describe
-  :format '((name nil 40 t)
-            (url guix-list-get-url 50 t))
-  :titles '((name . "License"))
-  :sort-key '(name))
-
-(let ((map guix-license-list-mode-map))
-  (define-key map (kbd "RET") 'guix-license-list-show-packages))
-
-(defun guix-license-list-describe (ids)
-  "Describe licenses with IDS (list of identifiers)."
-  (guix-buffer-display-entries
-   (guix-entries-by-ids ids (guix-buffer-current-entries))
-   'info 'license (cl-list* 'id ids) 'add))
-
-(defun guix-license-list-show-packages ()
-  "Display packages with the license at point."
-  (interactive)
-  (guix-packages-by-license (guix-list-current-id)))
-
-
-;;; Interactive commands
-
-;;;###autoload
-(defun guix-browse-license-url (license)
-  "Browse URL of a LICENSE."
-  (interactive (list (guix-read-license-name)))
-  (browse-url (guix-lookup-license-url license)))
-
-;;;###autoload
-(defun guix-licenses ()
-  "Display licenses of the Guix packages."
-  (interactive)
-  (guix-license-get-display 'all))
-
-(provide 'guix-license)
-
-;;; guix-license.el ends here
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -58,11 +58,11 @@
 (guix licenses)
 (guix utils)
 (guix ui)
+ (guix scripts graph)
 (guix scripts lint)
 (guix scripts package)
 (guix scripts pull)
- (gnu packages)
- (gnu system))
+ (gnu packages))

 (define-syntax-rule (first-or-false lst)
  (and (not (null? lst))
@@ -86,13 +86,13 @@
 (define (full-name->name+version spec)
  "Given package specification SPEC with or without output,
 return two values: name and version.  For example, for SPEC
-\"foo@0.9.1b:lib\", return \"foo\" and \"0.9.1b\"."
+\"foo-0.9.1b:lib\", return \"foo\" and \"0.9.1b\"."
  (let-values (((name version output)
                (package-specification->name+version+output spec)))
    (values name version)))

 (define (name+version->full-name name version)
-  (string-append name "@" version))
+  (string-append name "-" version))

 (define* (make-package-specification name #:optional version output)
  (let ((full-name (if version
@@ -138,26 +138,28 @@ return two values: name and version.  For example, for SPEC
 (define (manifest-entries->package-specifications entries)
  (map manifest-entry->package-specification entries))

-(define (profile-package-specifications profile)
-  "Return a list of package specifications for PROFILE."
-  (let ((manifest (profile-manifest profile)))
+(define (generation-package-specifications profile number)
+  "Return a list of package specifications for generation NUMBER."
+  (let ((manifest (profile-manifest
+                   (generation-file-name profile number))))
    (manifest-entries->package-specifications
     (manifest-entries manifest))))

-(define (profile->specifications+paths profile)
-  "Return a list of package specifications and paths for PROFILE.
+(define (generation-package-specifications+paths profile number)
+  "Return a list of package specifications and paths for generation NUMBER.
 Each element of the list is a list of the package specification and its path."
-  (let ((manifest (profile-manifest profile)))
+  (let ((manifest (profile-manifest
+                   (generation-file-name profile number))))
    (map (lambda (entry)
           (list (manifest-entry->package-specification entry)
                 (manifest-entry-item entry)))
         (manifest-entries manifest))))

-(define (profile-difference profile1 profile2)
-  "Return a list of package specifications for outputs installed in PROFILE1
-and not installed in PROFILE2."
-  (let ((specs1 (profile-package-specifications profile1))
-        (specs2 (profile-package-specifications profile2)))
+(define (generation-difference profile number1 number2)
+  "Return a list of package specifications for outputs installed in generation
+NUMBER1 and not installed in generation NUMBER2."
+  (let ((specs1 (generation-package-specifications profile number1))
+        (specs2 (generation-package-specifications profile number2)))
    (lset-difference string=? specs1 specs2)))

 (define (manifest-entries->hash-table entries)
@@ -263,8 +265,7 @@ Example:
  "Return a list of full names of the packages from package INPUTS."
  (filter-map (match-lambda
               ((_ (? package? package))
-                (make-package-specification (package-name package)
-                                            (package-version package)))
+                (package-full-name package))
               ((_ (? package? package) output)
                (make-package-specification (package-name package)
                                            (package-version package)
@@ -307,7 +308,6 @@ Example:
    (description       . ,package-description-string)
    (home-url          . ,package-home-page)
    (outputs           . ,package-outputs)
-    (systems           . ,package-supported-systems)
    (non-unique        . ,(negate package-unique?))
    (inputs            . ,(lambda (pkg)
                            (package-inputs-names
@@ -404,12 +404,6 @@ MATCH-PARAMS is a list of parameters that REGEXP can match."
  (let ((re (make-regexp regexp regexp/icase)))
    (matching-packages (cut package-match? <> re))))

-(define (packages-by-license license)
-  "Return a list of packages with LICENSE."
-  (matching-packages
-   (lambda (package)
-     (memq license (list-maybe (package-license package))))))
-
 (define (all-available-packages)
  "Return a list of all available packages."
  (matching-packages (const #t)))
@@ -670,27 +664,24 @@ ENTRIES is a list of installed manifest entries."
         (manifest-output-proc  (apply-to-first manifest-output-patterns))
         (regexp-proc           (lambda (_ regexp params . __)
                                  (packages-by-regexp regexp params)))
-         (license-proc          (lambda (_ license-name)
-                                  (packages-by-license
-                                   (lookup-license license-name))))
         (all-proc              (lambda _ (all-available-packages)))
         (newest-proc           (lambda _ (newest-available-packages))))
    `((package
       (id               . ,(apply-to-rest ids->package-patterns))
       (name             . ,(apply-to-rest specifications->package-patterns))
       (installed        . ,manifest-package-proc)
+       (generation       . ,manifest-package-proc)
       (obsolete         . ,(apply-to-first obsolete-package-patterns))
       (regexp           . ,regexp-proc)
-       (license          . ,license-proc)
       (all-available    . ,all-proc)
       (newest-available . ,newest-proc))
      (output
       (id               . ,(apply-to-rest ids->output-patterns))
       (name             . ,(apply-to-rest specifications->output-patterns))
       (installed        . ,manifest-output-proc)
+       (generation       . ,manifest-output-proc)
       (obsolete         . ,(apply-to-first obsolete-output-patterns))
       (regexp           . ,regexp-proc)
-       (license          . ,license-proc)
       (all-available    . ,all-proc)
       (newest-available . ,newest-proc)))))

@@ -703,13 +694,16 @@ ENTRIES is a list of installed manifest entries."
                              search-type search-vals)
  "Return information about packages or package outputs.
 See 'entry-sexps' for details."
-  (let* ((manifest (profile-manifest profile))
+  (let* ((profile (if (eq? search-type 'generation)
+                      (generation-file-name profile (car search-vals))
+                      profile))
+         (manifest (profile-manifest profile))
         (patterns (if (and (eq? entry-type 'output)
-                            (eq? search-type 'profile-diff))
+                            (eq? search-type 'generation-diff))
                       (match search-vals
-                         ((p1 p2)
+                         ((g1 g2)
                          (map specification->output-pattern
-                               (profile-difference p1 p2)))
+                               (generation-difference profile g1 g2)))
                         (_ '()))
                       (apply (patterns-maker entry-type search-type)
                              manifest search-vals)))
@@ -771,38 +765,6 @@ See 'entry-sexps' for details."
                                    params)))
    (map ->sexp generations)))

-(define system-generation-boot-parameters
-  (memoize
-   (lambda (profile generation)
-     "Return boot parameters for PROFILE's system GENERATION."
-     (let* ((gen-file   (generation-file-name profile generation))
-            (param-file (string-append gen-file "/parameters")))
-       (call-with-input-file param-file read-boot-parameters)))))
-
-(define (system-generation-param-alist profile)
-  "Return an alist of system generation parameters and procedures for
-PROFILE."
-  (append (generation-param-alist profile)
-          `((label       . ,(lambda (gen)
-                              (boot-parameters-label
-                               (system-generation-boot-parameters
-                                profile gen))))
-            (root-device . ,(lambda (gen)
-                              (boot-parameters-root-device
-                               (system-generation-boot-parameters
-                                profile gen))))
-            (kernel      . ,(lambda (gen)
-                              (boot-parameters-kernel
-                               (system-generation-boot-parameters
-                                profile gen)))))))
-
-(define (system-generation-sexps profile params search-type search-vals)
-  "Return an alist with information about system generations."
-  (let ((generations (find-generations profile search-type search-vals))
-        (->sexp (object-transformer (system-generation-param-alist profile)
-                                    params)))
-    (map ->sexp generations)))
-

 ;;; Getting package/output/generation entries (alists).

@@ -847,9 +809,6 @@ parameter/value pairs."
    ((generation)
     (generation-sexps profile params
                       search-type search-vals))
-    ((system-generation)
-     (system-generation-sexps profile params
-                              search-type search-vals))
    (else (entry-type-error entry-type))))


@@ -857,7 +816,9 @@ parameter/value pairs."

 (define* (package->manifest-entry* package #:optional output)
  (and package
-       (package->manifest-entry package output)))
+       (begin
+         (check-package-freshness package)
+         (package->manifest-entry package output))))

 (define* (make-install-manifest-entries id #:optional output)
  (package->manifest-entry* (package-by-id id) output))
@@ -944,7 +905,7 @@ OUTPUTS is a list of package outputs (may be an empty list)."
                                    "~a packages in profile~%"
                                    count)
                             count)
-                     (display-search-paths entries (list profile)))))))))))
+                     (display-search-paths entries profile))))))))))

 (define (delete-generations* profile generations)
  "Delete GENERATIONS from PROFILE.
@@ -954,11 +915,10 @@ GENERATIONS is a list of generation numbers."

 (define (package-location-string id-or-name)
  "Return a location string of a package with ID-OR-NAME."
-  (and=> (or (package-by-id id-or-name)
-             (match (packages-by-name id-or-name)
-               (()              #f)
-               ((package _ ...) package)))
-         (compose location->string package-location)))
+  (and-let* ((package  (or (package-by-id id-or-name)
+                           (first (packages-by-name id-or-name))))
+             (location (package-location package)))
+    (location->string location)))

 (define (package-source-derivation->store-path derivation)
  "Return a store path of the package source DERIVATION."
@@ -1029,13 +989,7 @@ Return #t if the shell command was executed successfully."

 (define (graph-type-names)
  "Return a list of names of available graph node types."
-  (map (@ (guix graph) node-type-name)
-       (@ (guix scripts graph) %node-types)))
-
-(define (refresh-updater-names)
-  "Return a list of names of available refresh updater types."
-  (map (@ (guix upstream) upstream-updater-name)
-       (@ (guix scripts refresh) %updaters)))
+  (map node-type-name %node-types))

 (define (lint-checker-names)
  "Return a list of names of available lint checkers."
@@ -1053,55 +1007,3 @@ Return #t if the shell command was executed successfully."
 ;; See the comment to 'guix-package-names' function in "guix-popup.el".
 (define (package-names-lists)
  (map list (package-names)))
-
-
-;;; Licenses
-
-(define %licenses
-  (delay
-    (filter license?
-            (module-map (lambda (_ var)
-                          (variable-ref var))
-                        (resolve-interface '(guix licenses))))))
-
-(define (licenses)
-  (force %licenses))
-
-(define (license-names)
-  "Return a list of names of available licenses."
-  (map license-name (licenses)))
-
-(define lookup-license
-  (memoize
-   (lambda (name)
-     "Return a license by its name."
-     (find (lambda (l)
-             (string=? name (license-name l)))
-           (licenses)))))
-
-(define (lookup-license-uri name)
-  "Return a license URI by its name."
-  (and=> (lookup-license name)
-         license-uri))
-
-(define %license-param-alist
-  `((id      . ,license-name)
-    (name    . ,license-name)
-    (url     . ,license-uri)
-    (comment . ,license-comment)))
-
-(define license->sexp
-  (object-transformer %license-param-alist))
-
-(define (find-licenses search-type . search-values)
-  "Return a list of licenses depending on SEARCH-TYPE and SEARCH-VALUES."
-  (case search-type
-    ((id name)
-     (let ((names search-values))
-       (filter-map lookup-license names)))
-    ((all)
-     (licenses))))
-
-(define (license-entries search-type . search-values)
-  (map license->sexp
-       (apply find-licenses search-type search-values)))
@@ -31,15 +31,12 @@
 (defvar guix-messages
  `((package
     (id
-      ,(lambda (_ entries ids)
-         (guix-message-packages-by-id entries 'package ids)))
+      (0 "Packages not found.")
+      (1 "")
+      (many "%d packages." count))
     (name
      ,(lambda (_ entries names)
         (guix-message-packages-by-name entries 'package names)))
-     (license
-      ,(lambda (_ entries licenses)
-         (apply #'guix-message-packages-by-license
-                entries 'package licenses)))
     (regexp
      (0 "No packages matching '%s'." val)
      (1 "A single package matching '%s'." val)
@@ -59,19 +56,23 @@
     (obsolete
      (0 "No obsolete packages in profile '%s'." profile)
      (1 "A single obsolete package in profile '%s'." profile)
-      (many "%d obsolete packages in profile '%s'." count profile)))
+      (many "%d obsolete packages in profile '%s'." count profile))
+     (generation
+      (0 "No packages installed in generation %d of profile '%s'."
+         val profile)
+      (1 "A single package installed in generation %d of profile '%s'."
+         val profile)
+      (many "%d packages installed in generation %d of profile '%s'."
+            count val profile)))

    (output
     (id
-      ,(lambda (_ entries ids)
-         (guix-message-packages-by-id entries 'output ids)))
+      (0 "Package outputs not found.")
+      (1 "")
+      (many "%d package outputs." count))
     (name
      ,(lambda (_ entries names)
         (guix-message-packages-by-name entries 'output names)))
-     (license
-      ,(lambda (_ entries licenses)
-         (apply #'guix-message-packages-by-license
-                entries 'output licenses)))
     (regexp
      (0 "No package outputs matching '%s'." val)
      (1 "A single package output matching '%s'." val)
@@ -92,7 +93,14 @@
      (0 "No obsolete package outputs in profile '%s'." profile)
      (1 "A single obsolete package output in profile '%s'." profile)
      (many "%d obsolete package outputs in profile '%s'." count profile))
-     (profile-diff
+     (generation
+      (0 "No package outputs installed in generation %d of profile '%s'."
+         val profile)
+      (1 "A single package output installed in generation %d of profile '%s'."
+         val profile)
+      (many "%d package outputs installed in generation %d of profile '%s'."
+            count val profile))
+     (generation-diff
      guix-message-outputs-by-diff))

    (generation
@@ -139,22 +147,6 @@
               (guix-message-string-entry-type
                entry-type 'plural)))))

-(defun guix-message-packages-by-id (entries entry-type ids)
-  "Display a message for packages or outputs searched by IDS."
-  (let* ((count (length entries))
-         (str-beg (guix-message-string-entries count entry-type))
-         (str-end (if (> count 1)
-                      (concat "with the following IDs: "
-                              (mapconcat #'guix-get-string ids ", "))
-                    (concat "with ID " (guix-get-string (car ids))))))
-    (if (zerop count)
-        (message "%s %s.
-Most likely, Guix REPL was restarted, so IDs are not actual
-anymore, because they live only during the REPL process.
-Try \"M-x guix-search-by-name\"."
-                 str-beg str-end)
-      (message "%s %s." str-beg str-end))))
-
 (defun guix-message-packages-by-name (entries entry-type names)
  "Display a message for packages or outputs searched by NAMES."
  (let* ((count (length entries))
@@ -167,13 +159,6 @@ Try \"M-x guix-search-by-name\"."
                            (guix-message-string-name (car names))))))
    (message "%s %s." str-beg str-end)))

-(defun guix-message-packages-by-license (entries entry-type license)
-  "Display a message for packages or outputs searched by LICENSE."
-  (let* ((count (length entries))
-         (str-beg (guix-message-string-entries count entry-type))
-         (str-end (format "with license '%s'" license)))
-    (message "%s %s." str-beg str-end)))
-
 (defun guix-message-generations-by-time (profile entries times)
  "Display a message for generations searched by TIMES."
  (let* ((count (length entries))
@@ -184,27 +169,25 @@ Try \"M-x guix-search-by-name\"."
                     "matching time period '%s' - '%s'.")
             str-beg profile time-beg time-end)))

-(defun guix-message-outputs-by-diff (_ entries profiles)
-  "Display a message for outputs searched by PROFILES difference."
+(defun guix-message-outputs-by-diff (profile entries generations)
+  "Display a message for outputs searched by GENERATIONS difference."
  (let* ((count (length entries))
         (str-beg (guix-message-string-entries count 'output))
-         (profile1 (car  profiles))
-         (profile2 (cadr profiles)))
+         (gen1 (car  generations))
+         (gen2 (cadr generations)))
    (cl-multiple-value-bind (new old str-action)
-        (if (string-lessp profile2 profile1)
-            (list profile1 profile2 "added to")
-          (list profile2 profile1 "removed from"))
-      (message "%s %s profile '%s' comparing with profile '%s'."
-               str-beg str-action new old))))
+        (if (> gen1 gen2)
+            (list gen1 gen2 "added to")
+          (list gen2 gen1 "removed from"))
+      (message (concat "%s %s generation %d comparing with "
+                       "generation %d of profile '%s'.")
+               str-beg str-action new old profile))))

 (defun guix-result-message (profile entries entry-type
                            search-type search-vals)
  "Display an appropriate message after displaying ENTRIES."
  (let* ((type-spec (guix-assq-value guix-messages
-                                     (if (eq entry-type 'system-generation)
-                                         'generation
-                                       entry-type)
-                                     search-type))
+                                     entry-type search-type))
         (fun-or-count-spec (car type-spec)))
    (if (functionp fun-or-count-spec)
        (funcall fun-or-count-spec profile entries search-vals)
@@ -128,13 +128,6 @@ subcommands, actions, etc. for this guix COMMAND."
   guix-help-parse-regexp-group
   "graph" "--list-types"))

-(guix-memoized-defun guix-pcomplete-refresh-updaters ()
-  "Return a list of all available refresh updater types."
-  (guix-pcomplete-run-guix-and-search
-   guix-help-parse-list-regexp
-   guix-help-parse-regexp-group
-   "refresh" "--list-updaters"))
-

 ;;; Completing

@@ -216,8 +209,8 @@ group - the argument.")
  "Complete argument for guix COMMAND."
  (cond
   ((member command
-            '("archive" "build" "challenge" "edit" "environment"
-              "graph" "lint" "refresh" "size"))
+            '("archive" "build" "graph" "edit" "environment"
+              "lint" "refresh" "size"))
    (while t
      (pcomplete-here (guix-pcomplete-all-packages))))
   (t (pcomplete-here* (pcomplete-entries)))))
@@ -262,8 +255,7 @@ INPUT is the current partially completed string."
        (complete (guix-pcomplete-all-packages)))
       ((option? "-p" "--profile")
        (complete* (pcomplete-dirs)))
-       ((or (option? "-f" "--install-from-file")
-            (option? "-m" "--manifest"))
+       ((option? "-m" "--manifest")
        (complete* (pcomplete-entries)))))

     ((and (command? "archive" "build" "size")
@@ -271,9 +263,7 @@ INPUT is the current partially completed string."
      (complete* guix-help-system-types))

     ((and (command? "build")
-           (or (option? "-f" "--file")
-               (option? "-r" "--root")
-               (string= "--with-source" option)))
+           (option? "-r" "--root"))
      (complete* (pcomplete-entries)))

     ((and (command? "graph")
@@ -297,13 +287,9 @@ INPUT is the current partially completed string."
           (option? "-u" "--user"))
      (complete* (pcmpl-unix-user-names)))

-     ((command? "refresh")
-      (cond
-       ((option? "-s" "--select")
-        (complete* guix-help-refresh-subsets))
-       ((option? "-t" "--type")
-        (guix-pcomplete-complete-comma-args
-         (guix-pcomplete-refresh-updaters)))))
+     ((and (command? "refresh")
+           (option? "-s" "--select"))
+      (complete* guix-help-refresh-subsets))

     ((and (command? "size")
           (option? "-m" "--map-file"))
@@ -1,7 +1,6 @@
 ;;; guix-profiles.el --- Guix profiles

-;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
-;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
+;; Copyright © 2014 Alex Kost <alezost@gmail.com>

 ;; This file is part of GNU Guix.

@@ -26,10 +25,6 @@
  (expand-file-name "~/.guix-profile")
  "User profile.")

-(defvar guix-system-profile
-  (concat guix-config-state-directory "/profiles/system")
-  "System profile.")
-
 (defvar guix-default-profile
  (concat guix-config-state-directory
          "/profiles/per-user/"
@@ -40,14 +35,6 @@
 (defvar guix-current-profile guix-default-profile
  "Current profile.")

-(defvar guix-system-profile-regexp
-  (concat "\\`" (regexp-quote guix-system-profile))
-  "Regexp matching system profiles.")
-
-(defun guix-system-profile? (profile)
-  "Return non-nil, if PROFILE is a system one."
-  (string-match-p guix-system-profile-regexp profile))
-
 (defun guix-profile-prompt (&optional default)
  "Prompt for profile and return it.
 Use DEFAULT as a start directory.  If it is nil, use
@@ -1,6 +1,6 @@
 ;;; guix-read.el --- Minibuffer readers

-;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
+;; Copyright © 2015 Alex Kost <alezost@gmail.com>

 ;; This file is part of GNU Guix.

@@ -26,44 +26,95 @@

 (require 'guix-help-vars)
 (require 'guix-utils)
-(require 'guix-backend)
-(require 'guix-guile)
+(require 'guix-base)

-
-;;; Receivable lists of packages, lint checkers, etc.
+(defun guix-read-file-name (prompt &optional dir default-filename
+                                   mustmatch initial predicate)
+  "Read file name.
+This function is similar to `read-file-name' except it also
+expands the file name."
+  (expand-file-name (read-file-name prompt dir default-filename
+                                    mustmatch initial predicate)))

-(guix-memoized-defun guix-graph-type-names ()
-  "Return a list of names of available graph node types."
-  (guix-eval-read (guix-make-guile-expression 'graph-type-names)))
+(defmacro guix-define-reader (name read-fun completions prompt)
+  "Define NAME function to read from minibuffer.
+READ-FUN may be `completing-read', `completing-read-multiple' or
+another function with the same arguments."
+  `(defun ,name (&optional prompt initial-contents)
+     (,read-fun ,(if prompt
+                     `(or prompt ,prompt)
+                   'prompt)
+                ,completions nil nil initial-contents)))

-(guix-memoized-defun guix-refresh-updater-names ()
-  "Return a list of names of available refresh updater types."
-  (guix-eval-read (guix-make-guile-expression 'refresh-updater-names)))
+(defmacro guix-define-readers (&rest args)
+  "Define reader functions.

-(guix-memoized-defun guix-lint-checker-names ()
-  "Return a list of names of available lint checkers."
-  (guix-eval-read (guix-make-guile-expression 'lint-checker-names)))
+ARGS should have a form [KEYWORD VALUE] ...  The following
+keywords are available:

-(guix-memoized-defun guix-package-names ()
-  "Return a list of names of available packages."
-  (sort
-   ;; Work around <https://github.com/jaor/geiser/issues/64>:
-   ;; list of strings is parsed much slower than list of lists,
-   ;; so we use 'package-names-lists' instead of 'package-names'.
+  - `completions-var' - variable used to get completions.

-   ;; (guix-eval-read (guix-make-guile-expression 'package-names))
+  - `completions-getter' - function used to get completions.

-   (mapcar #'car
-           (guix-eval-read (guix-make-guile-expression
-                            'package-names-lists)))
-   #'string<))
+  - `single-reader', `single-prompt' - name of a function to read
+    a single value, and a prompt for it.

-(guix-memoized-defun guix-license-names ()
-  "Return a list of names of available licenses."
-  (guix-eval-read (guix-make-guile-expression 'license-names)))
+  - `multiple-reader', `multiple-prompt' - name of a function to
+    read multiple values, and a prompt for it.

-
-;;; Readers
+  - `multiple-separator' - if specified, another
+    `<multiple-reader-name>-string' function returning a string
+    of multiple values separated the specified separator will be
+    defined."
+  (let (completions-var
+        completions-getter
+        single-reader
+        single-prompt
+        multiple-reader
+        multiple-prompt
+        multiple-separator)
+
+    ;; Process the keyword args.
+    (while (keywordp (car args))
+      (pcase (pop args)
+        (`:completions-var    (setq completions-var    (pop args)))
+        (`:completions-getter (setq completions-getter (pop args)))
+        (`:single-reader      (setq single-reader      (pop args)))
+        (`:single-prompt      (setq single-prompt      (pop args)))
+        (`:multiple-reader    (setq multiple-reader    (pop args)))
+        (`:multiple-prompt    (setq multiple-prompt    (pop args)))
+        (`:multiple-separator (setq multiple-separator (pop args)))
+	(_ (pop args))))
+
+    (let ((completions
+           (cond ((and completions-var completions-getter)
+                  `(or ,completions-var
+                       (setq ,completions-var
+                             (funcall ',completions-getter))))
+                 (completions-var
+                  completions-var)
+                 (completions-getter
+                  `(funcall ',completions-getter)))))
+      `(progn
+         ,(when (and completions-var
+                     (not (boundp completions-var)))
+            `(defvar ,completions-var nil))
+
+         ,(when single-reader
+            `(guix-define-reader ,single-reader completing-read
+                                 ,completions ,single-prompt))
+
+         ,(when multiple-reader
+            `(guix-define-reader ,multiple-reader completing-read-multiple
+                                 ,completions ,multiple-prompt))
+
+         ,(when (and multiple-reader multiple-separator)
+            (let ((name (intern (concat (symbol-name multiple-reader)
+                                        "-string"))))
+              `(defun ,name (&optional prompt initial-contents)
+                 (guix-concat-strings
+                  (,multiple-reader prompt initial-contents)
+                  ,multiple-separator))))))))

 (guix-define-readers
 :completions-var guix-help-system-types
@@ -85,12 +136,6 @@
 :single-reader guix-read-refresh-subset
 :single-prompt "Refresh subset: ")

-(guix-define-readers
- :completions-getter guix-refresh-updater-names
- :multiple-reader guix-read-refresh-updater-names
- :multiple-prompt "Refresh updater,s: "
- :multiple-separator ",")
-
 (guix-define-readers
 :completions-var guix-help-key-policies
 :single-reader guix-read-key-policy
@@ -126,11 +171,6 @@
 :multiple-prompt "Package,s: "
 :multiple-separator " ")

-(guix-define-readers
- :completions-getter guix-license-names
- :single-reader guix-read-license-name
- :single-prompt "License: ")
-
 (provide 'guix-read)

 ;;; guix-read.el ends here
@@ -1,456 +0,0 @@
-;;; guix-ui-generation.el --- Interface for displaying generations  -*- lexical-binding: t -*-
-
-;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
-
-;; This file is part of GNU Guix.
-
-;; GNU Guix is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Guix is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file provides an interface for displaying profile generations in
-;; 'list' and 'info' buffers, and commands for working with them.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'guix-buffer)
-(require 'guix-list)
-(require 'guix-info)
-(require 'guix-ui)
-(require 'guix-ui-package)
-(require 'guix-base)
-(require 'guix-backend)
-(require 'guix-guile)
-(require 'guix-entry)
-(require 'guix-utils)
-(require 'guix-profiles)
-
-(guix-ui-define-entry-type generation)
-
-(defun guix-generation-get-display (profile search-type &rest search-values)
-  "Search for generations and show results.
-
-If PROFILE is nil, use `guix-current-profile'.
-
-See `guix-ui-get-entries' for the meaning of SEARCH-TYPE and
-SEARCH-VALUES."
-  (apply #'guix-list-get-display-entries
-         'generation
-         (or profile guix-current-profile)
-         search-type search-values))
-
-(defun guix-delete-generations (profile generations
-                                &optional operation-buffer)
-  "Delete GENERATIONS from PROFILE.
-Each element from GENERATIONS is a generation number."
-  (when (or (not guix-operation-confirm)
-            (y-or-n-p
-             (let ((count (length generations)))
-               (if (> count 1)
-                   (format "Delete %d generations from profile '%s'? "
-                           count profile)
-                 (format "Delete generation %d from profile '%s'? "
-                         (car generations) profile)))))
-    (guix-eval-in-repl
-     (guix-make-guile-expression
-      'delete-generations* profile generations)
-     operation-buffer)))
-
-(defun guix-switch-to-generation (profile generation
-                                  &optional operation-buffer)
-  "Switch PROFILE to GENERATION."
-  (when (or (not guix-operation-confirm)
-            (y-or-n-p (format "Switch profile '%s' to generation %d? "
-                              profile generation)))
-    (guix-eval-in-repl
-     (guix-make-guile-expression
-      'switch-to-generation* profile generation)
-     operation-buffer)))
-
-(defun guix-system-generation? ()
-  "Return non-nil, if current generation is a system one."
-  (eq (guix-buffer-current-entry-type)
-      'system-generation))
-
-(defun guix-generation-current-packages-profile (&optional generation)
-  "Return a directory where packages are installed for the
-current profile's GENERATION."
-  (guix-packages-profile (guix-ui-current-profile)
-                         generation
-                         (guix-system-generation?)))
-
-
-;;; Generation 'info'
-
-(guix-ui-info-define-interface generation
-  :buffer-name "*Guix Generation Info*"
-  :format '((number format guix-generation-info-insert-number)
-            (prev-number format (format))
-            (current format guix-generation-info-insert-current)
-            (path simple (indent guix-file))
-            (time format (time)))
-  :titles '((path . "File name")
-            (prev-number . "Previous number")))
-
-(defface guix-generation-info-number
-  '((t :inherit font-lock-keyword-face))
-  "Face used for a number of a generation."
-  :group 'guix-generation-info-faces)
-
-(defface guix-generation-info-current
-  '((t :inherit guix-package-info-installed-outputs))
-  "Face used if a generation is the current one."
-  :group 'guix-generation-info-faces)
-
-(defface guix-generation-info-not-current
-  '((t nil))
-  "Face used if a generation is not the current one."
-  :group 'guix-generation-info-faces)
-
-(defun guix-generation-info-insert-number (number &optional _)
-  "Insert generation NUMBER and action buttons."
-  (guix-info-insert-value-format number 'guix-generation-info-number)
-  (guix-info-insert-indent)
-  (guix-info-insert-action-button
-   "Packages"
-   (lambda (btn)
-     (guix-buffer-get-display-entries
-      'list guix-package-list-type
-      (list (guix-generation-current-packages-profile
-             (button-get btn 'number))
-            'installed)
-      'add))
-   "Show installed packages for this generation"
-   'number number)
-  (guix-info-insert-indent)
-  (guix-info-insert-action-button
-   "Delete"
-   (lambda (btn)
-     (guix-delete-generations (guix-ui-current-profile)
-                              (list (button-get btn 'number))
-                              (current-buffer)))
-   "Delete this generation"
-   'number number))
-
-(defun guix-generation-info-insert-current (val entry)
-  "Insert boolean value VAL showing whether this generation is current."
-  (if val
-      (guix-info-insert-value-format "Yes" 'guix-generation-info-current)
-    (guix-info-insert-value-format "No" 'guix-generation-info-not-current)
-    (guix-info-insert-indent)
-    (guix-info-insert-action-button
-     "Switch"
-     (lambda (btn)
-       (guix-switch-to-generation (guix-ui-current-profile)
-                                  (button-get btn 'number)
-                                  (current-buffer)))
-     "Switch to this generation (make it the current one)"
-     'number (guix-entry-value entry 'number))))
-
-
-;;; Generation 'list'
-
-(guix-ui-list-define-interface generation
-  :buffer-name "*Guix Generation List*"
-  :format '((number nil 5 guix-list-sort-numerically-0 :right-align t)
-            (current guix-generation-list-get-current 10 t)
-            (time guix-list-get-time 20 t)
-            (path guix-list-get-file-name 30 t))
-  :titles '((number . "N."))
-  :sort-key '(number . t)
-  :marks '((delete . ?D)))
-
-(let ((map guix-generation-list-mode-map))
-  (define-key map (kbd "RET") 'guix-generation-list-show-packages)
-  (define-key map (kbd "+")   'guix-generation-list-show-added-packages)
-  (define-key map (kbd "-")   'guix-generation-list-show-removed-packages)
-  (define-key map (kbd "=")   'guix-generation-list-diff)
-  (define-key map (kbd "D")   'guix-generation-list-diff)
-  (define-key map (kbd "e")   'guix-generation-list-ediff)
-  (define-key map (kbd "x")   'guix-generation-list-execute)
-  (define-key map (kbd "s")   'guix-generation-list-switch)
-  (define-key map (kbd "c")   'guix-generation-list-switch)
-  (define-key map (kbd "d")   'guix-generation-list-mark-delete))
-
-(defun guix-generation-list-get-current (val &optional _)
-  "Return string from VAL showing whether this generation is current.
-VAL is a boolean value."
-  (if val "(current)" ""))
-
-(defun guix-generation-list-switch ()
-  "Switch current profile to the generation at point."
-  (interactive)
-  (let* ((entry   (guix-list-current-entry))
-         (current (guix-entry-value entry 'current))
-         (number  (guix-entry-value entry 'number)))
-    (if current
-        (user-error "This generation is already the current one")
-      (guix-switch-to-generation (guix-ui-current-profile)
-                                 number (current-buffer)))))
-
-(defun guix-generation-list-show-packages ()
-  "List installed packages for the generation at point."
-  (interactive)
-  (guix-package-get-display
-   (guix-generation-current-packages-profile (guix-list-current-id))
-   'installed))
-
-(defun guix-generation-list-generations-to-compare ()
-  "Return a sorted list of 2 marked generations for comparing."
-  (let ((numbers (guix-list-get-marked-id-list 'general)))
-    (if (/= (length numbers) 2)
-        (user-error "2 generations should be marked for comparing")
-      (sort numbers #'<))))
-
-(defun guix-generation-list-profiles-to-compare ()
-  "Return a sorted list of 2 marked generation profiles for comparing."
-  (mapcar #'guix-generation-current-packages-profile
-          (guix-generation-list-generations-to-compare)))
-
-(defun guix-generation-list-show-added-packages ()
-  "List package outputs added to the latest marked generation.
-If 2 generations are marked with \\[guix-list-mark], display
-outputs installed in the latest marked generation that were not
-installed in the other one."
-  (interactive)
-  (guix-buffer-get-display-entries
-   'list 'output
-   (cl-list* (guix-ui-current-profile)
-             'profile-diff
-             (reverse (guix-generation-list-profiles-to-compare)))
-   'add))
-
-(defun guix-generation-list-show-removed-packages ()
-  "List package outputs removed from the latest marked generation.
-If 2 generations are marked with \\[guix-list-mark], display
-outputs not installed in the latest marked generation that were
-installed in the other one."
-  (interactive)
-  (guix-buffer-get-display-entries
-   'list 'output
-   (cl-list* (guix-ui-current-profile)
-             'profile-diff
-             (guix-generation-list-profiles-to-compare))
-   'add))
-
-(defun guix-generation-list-compare (diff-fun gen-fun)
-  "Run GEN-FUN on the 2 marked generations and run DIFF-FUN on the results."
-  (cl-multiple-value-bind (gen1 gen2)
-      (guix-generation-list-generations-to-compare)
-    (funcall diff-fun
-             (funcall gen-fun gen1)
-             (funcall gen-fun gen2))))
-
-(defun guix-generation-list-ediff-manifests ()
-  "Run Ediff on manifests of the 2 marked generations."
-  (interactive)
-  (guix-generation-list-compare
-   #'ediff-files
-   #'guix-profile-generation-manifest-file))
-
-(defun guix-generation-list-diff-manifests ()
-  "Run Diff on manifests of the 2 marked generations."
-  (interactive)
-  (guix-generation-list-compare
-   #'guix-diff
-   #'guix-profile-generation-manifest-file))
-
-(defun guix-generation-list-ediff-packages ()
-  "Run Ediff on package outputs installed in the 2 marked generations."
-  (interactive)
-  (guix-generation-list-compare
-   #'ediff-buffers
-   #'guix-profile-generation-packages-buffer))
-
-(defun guix-generation-list-diff-packages ()
-  "Run Diff on package outputs installed in the 2 marked generations."
-  (interactive)
-  (guix-generation-list-compare
-   #'guix-diff
-   #'guix-profile-generation-packages-buffer))
-
-(defun guix-generation-list-ediff (arg)
-  "Run Ediff on package outputs installed in the 2 marked generations.
-With ARG, run Ediff on manifests of the marked generations."
-  (interactive "P")
-  (if arg
-      (guix-generation-list-ediff-manifests)
-    (guix-generation-list-ediff-packages)))
-
-(defun guix-generation-list-diff (arg)
-  "Run Diff on package outputs installed in the 2 marked generations.
-With ARG, run Diff on manifests of the marked generations."
-  (interactive "P")
-  (if arg
-      (guix-generation-list-diff-manifests)
-    (guix-generation-list-diff-packages)))
-
-(defun guix-generation-list-mark-delete (&optional arg)
-  "Mark the current generation for deletion and move to the next line.
-With ARG, mark all generations for deletion."
-  (interactive "P")
-  (if arg
-      (guix-list-mark-all 'delete)
-    (guix-list--mark 'delete t)))
-
-(defun guix-generation-list-execute ()
-  "Delete marked generations."
-  (interactive)
-  (let ((marked (guix-list-get-marked-id-list 'delete)))
-    (or marked
-        (user-error "No generations marked for deletion"))
-    (guix-delete-generations (guix-ui-current-profile)
-                             marked (current-buffer))))
-
-
-;;; Inserting packages to compare generations
-
-(defcustom guix-generation-packages-buffer-name-function
-  #'guix-generation-packages-buffer-name-default
-  "Function used to define name of a buffer with generation packages.
-This function is called with 2 arguments: PROFILE (string) and
-GENERATION (number)."
-  :type '(choice (function-item guix-generation-packages-buffer-name-default)
-                 (function-item guix-generation-packages-buffer-name-long)
-                 (function :tag "Other function"))
-  :group 'guix-generation)
-
-(defcustom guix-generation-packages-update-buffer t
-  "If non-nil, always update list of packages during comparing generations.
-If nil, generation packages are received only once.  So when you
-compare generation 1 and generation 2, the packages for both
-generations will be received.  Then if you compare generation 1
-and generation 3, only the packages for generation 3 will be
-received.  Thus if you use comparing of different generations a
-lot, you may set this variable to nil to improve the
-performance."
-  :type 'boolean
-  :group 'guix-generation)
-
-(defvar guix-generation-output-name-width 30
-  "Width of an output name \"column\".
-This variable is used in auxiliary buffers for comparing generations.")
-
-(defun guix-generation-packages (profile)
-  "Return a list of sorted packages installed in PROFILE.
-Each element of the list is a list of the package specification
-and its store path."
-  (let ((names+paths (guix-eval-read
-                      (guix-make-guile-expression
-                       'profile->specifications+paths profile))))
-    (sort names+paths
-          (lambda (a b)
-            (string< (car a) (car b))))))
-
-(defun guix-generation-packages-buffer-name-default (profile generation)
-  "Return name of a buffer for displaying GENERATION's package outputs.
-Use base name of PROFILE file name."
-  (let ((profile-name (file-name-base (directory-file-name profile))))
-    (format "*Guix %s: generation %s*"
-            profile-name generation)))
-
-(defun guix-generation-packages-buffer-name-long (profile generation)
-  "Return name of a buffer for displaying GENERATION's package outputs.
-Use the full PROFILE file name."
-  (format "*Guix generation %s (%s)*"
-          generation profile))
-
-(defun guix-generation-packages-buffer-name (profile generation)
-  "Return name of a buffer for displaying GENERATION's package outputs."
-  (funcall guix-generation-packages-buffer-name-function
-           profile generation))
-
-(defun guix-generation-insert-package (name path)
-  "Insert package output NAME and store PATH at point."
-  (insert name)
-  (indent-to guix-generation-output-name-width 2)
-  (insert path "\n"))
-
-(defun guix-generation-insert-packages (buffer profile)
-  "Insert package outputs installed in PROFILE in BUFFER."
-  (with-current-buffer buffer
-    (setq buffer-read-only nil
-          indent-tabs-mode nil)
-    (erase-buffer)
-    (mapc (lambda (name+path)
-            (guix-generation-insert-package
-             (car name+path) (cadr name+path)))
-          (guix-generation-packages profile))))
-
-(defun guix-generation-packages-buffer (profile generation &optional system?)
-  "Return buffer with package outputs installed in PROFILE's GENERATION.
-Create the buffer if needed."
-  (let ((buf-name (guix-generation-packages-buffer-name
-                   profile generation)))
-    (or (and (null guix-generation-packages-update-buffer)
-             (get-buffer buf-name))
-        (let ((buf (get-buffer-create buf-name)))
-          (guix-generation-insert-packages
-           buf
-           (guix-packages-profile profile generation system?))
-          buf))))
-
-(defun guix-profile-generation-manifest-file (generation)
-  "Return the file name of a GENERATION's manifest.
-GENERATION is a generation number of the current profile."
-  (guix-manifest-file (guix-ui-current-profile)
-                      generation
-                      (guix-system-generation?)))
-
-(defun guix-profile-generation-packages-buffer (generation)
-  "Insert GENERATION's package outputs in a buffer and return it.
-GENERATION is a generation number of the current profile."
-  (guix-generation-packages-buffer (guix-ui-current-profile)
-                                   generation
-                                   (guix-system-generation?)))
-
-
-;;; Interactive commands
-
-;;;###autoload
-(defun guix-generations (&optional profile)
-  "Display information about all generations.
-If PROFILE is nil, use `guix-current-profile'.
-Interactively with prefix, prompt for PROFILE."
-  (interactive (list (guix-ui-read-profile)))
-  (guix-generation-get-display profile 'all))
-
-;;;###autoload
-(defun guix-last-generations (number &optional profile)
-  "Display information about last NUMBER generations.
-If PROFILE is nil, use `guix-current-profile'.
-Interactively with prefix, prompt for PROFILE."
-  (interactive
-   (list (read-number "The number of last generations: ")
-         (guix-ui-read-profile)))
-  (guix-generation-get-display profile 'last number))
-
-;;;###autoload
-(defun guix-generations-by-time (from to &optional profile)
-  "Display information about generations created between FROM and TO.
-FROM and TO should be time values.
-If PROFILE is nil, use `guix-current-profile'.
-Interactively with prefix, prompt for PROFILE."
-  (interactive
-   (list (guix-read-date "Find generations (from): ")
-         (guix-read-date "Find generations (to): ")
-         (guix-ui-read-profile)))
-  (guix-generation-get-display profile 'time
-                               (float-time from)
-                               (float-time to)))
-
-(provide 'guix-ui-generation)
-
-;;; guix-ui-generation.el ends here
@@ -1,105 +0,0 @@
-;;; guix-ui-system-generation.el --- Interface for displaying system generations  -*- lexical-binding: t -*-
-
-;; Copyright © 2016 Alex Kost <alezost@gmail.com>
-
-;; This file is part of GNU Guix.
-
-;; GNU Guix is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Guix is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file provides an interface for displaying system generations
-;; in 'list' and 'info' buffers, and commands for working with them.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'guix-list)
-(require 'guix-ui)
-(require 'guix-ui-generation)
-(require 'guix-profiles)
-
-(guix-ui-define-entry-type system-generation)
-
-(defun guix-system-generation-get-display (search-type &rest search-values)
-  "Search for system generations and show results.
-See `guix-ui-get-entries' for the meaning of SEARCH-TYPE and
-SEARCH-VALUES."
-  (apply #'guix-list-get-display-entries
-         'system-generation
-         guix-system-profile
-         search-type search-values))
-
-
-;;; System generation 'info'
-
-(guix-ui-info-define-interface system-generation
-  :buffer-name "*Guix Generation Info*"
-  :format '((number format guix-generation-info-insert-number)
-            (label format (format))
-            (prev-number format (format))
-            (current format guix-generation-info-insert-current)
-            (path format (format guix-file))
-            (time format (time))
-            (root-device format (format))
-            (kernel format (format guix-file)))
-  :titles guix-generation-info-titles)
-
-
-;;; System generation 'list'
-
-;; FIXME It is better to make `guix-generation-list-shared-map' with
-;; common keys for both usual and system generations.
-(defvar guix-system-generation-list-mode-map
-  (copy-keymap guix-generation-list-mode-map)
-  "Keymap for `guix-system-generation-list-mode' buffers.")
-
-(guix-ui-list-define-interface system-generation
-  :buffer-name "*Guix Generation List*"
-  :format '((number nil 5 guix-list-sort-numerically-0 :right-align t)
-            (current guix-generation-list-get-current 10 t)
-            (label nil 40 t)
-            (time guix-list-get-time 20 t)
-            (path guix-list-get-file-name 30 t))
-  :titles guix-generation-list-titles
-  :sort-key '(number . t)
-  :marks '((delete . ?D)))
-
-
-;;; Interactive commands
-
-;;;###autoload
-(defun guix-system-generations ()
-  "Display information about system generations."
-  (interactive)
-  (guix-system-generation-get-display 'all))
-
-;;;###autoload
-(defun guix-last-system-generations (number)
-  "Display information about last NUMBER of system generations."
-  (interactive "nThe number of last generations: ")
-  (guix-system-generation-get-display 'last number))
-
-;;;###autoload
-(defun guix-system-generations-by-time (from to)
-  "Display information about system generations created between FROM and TO."
-  (interactive
-   (list (guix-read-date "Find generations (from): ")
-         (guix-read-date "Find generations (to): ")))
-  (guix-system-generation-get-display
-   'time (float-time from) (float-time to)))
-
-(provide 'guix-ui-system-generation)
-
-;;; guix-ui-system-generation.el ends here
@@ -1,334 +0,0 @@
-;;; guix-ui.el --- Common code for Guix package management interface  -*- lexical-binding: t -*-
-
-;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
-
-;; This file is part of GNU Guix.
-
-;; GNU Guix is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Guix is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file provides some general code for 'list'/'info' interfaces for
-;; packages and generations.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'guix-backend)
-(require 'guix-buffer)
-(require 'guix-guile)
-(require 'guix-utils)
-(require 'guix-messages)
-(require 'guix-profiles)
-
-(guix-define-groups ui
-  :group-doc "\
-Settings for 'ui' (Guix package management) buffers.
-This group includes settings for displaying packages, outputs and
-generations in 'list' and 'info' buffers.")
-
-(defvar guix-ui-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "M") 'guix-apply-manifest)
-    (define-key map (kbd "C-c C-z") 'guix-switch-to-repl)
-    map)
-  "Parent keymap for Guix package/generation buffers.")
-
-(guix-buffer-define-current-args-accessors
- "guix-ui-current" "profile" "search-type" "search-values")
-
-(defun guix-ui-read-profile ()
-  "Return `guix-current-profile' or prompt for it.
-This function is intended for using in `interactive' forms."
-  (if current-prefix-arg
-      (guix-profile-prompt)
-    guix-current-profile))
-
-(defun guix-ui-get-entries (profile entry-type search-type search-values
-                                    &optional params)
-  "Receive ENTRY-TYPE entries for PROFILE.
-Call an appropriate scheme procedure and return a list of entries.
-
-ENTRY-TYPE should be one of the following symbols: `package',
-`output' or `generation'.
-
-SEARCH-TYPE may be one of the following symbols:
-
- If ENTRY-TYPE is `package' or `output': `id', `name', `regexp',
-  `all-available', `newest-available', `installed', `obsolete',
-  `generation'.
-
- If ENTRY-TYPE is `generation': `id', `last', `all', `time'.
-
-PARAMS is a list of parameters for receiving.  If nil, get data
-with all available parameters."
-  (guix-eval-read
-   (guix-make-guile-expression
-    'entries
-    profile params entry-type search-type search-values)))
-
-(defun guix-ui-list-describe (ids)
-  "Describe 'ui' entries with IDS (list of identifiers)."
-  (guix-buffer-get-display-entries
-   'info (guix-buffer-current-entry-type)
-   (cl-list* (guix-ui-current-profile) 'id ids)
-   'add))
-
-
-;;; Buffers and auto updating
-
-(defcustom guix-ui-update-after-operation 'current
-  "Define what kind of data to update after executing an operation.
-
-After successful executing an operation in the Guix REPL (for
-example after installing a package), the data in Guix buffers
-will or will not be automatically updated depending on a value of
-this variable.
-
-If nil, update nothing (do not revert any buffer).
-If `current', update the buffer from which an operation was performed.
-If `all', update all Guix buffers (not recommended)."
-  :type '(choice (const :tag "Do nothing" nil)
-                 (const :tag "Update operation buffer" current)
-                 (const :tag "Update all Guix buffers" all))
-  :group 'guix-ui)
-
-(defcustom guix-ui-buffer-name-function
-  #'guix-ui-buffer-name-default
-  "Function used to define a name of a Guix buffer.
-The function is called with 2 arguments: BASE-NAME and PROFILE."
-  :type '(choice (function-item guix-ui-buffer-name-default)
-                 (function-item guix-ui-buffer-name-simple)
-                 (function :tag "Other function"))
-  :group 'guix-ui)
-
-(defun guix-ui-buffer-name-simple (base-name &rest _)
-  "Return BASE-NAME."
-  base-name)
-
-;; TODO separate '*...*' logic from the real profile appending.  Also add
-;; another function to return '*Guix ...: /full/path/to/profile*' name.
-(defun guix-ui-buffer-name-default (base-name profile)
-  "Return buffer name by appending BASE-NAME and PROFILE's base file name."
-  (let ((profile-name (file-name-base (directory-file-name profile)))
-        (re (rx string-start
-                (group (? "*"))
-                (group (*? any))
-                (group (? "*"))
-                string-end)))
-    (or (string-match re base-name)
-        (error "Unexpected error in defining guix buffer name"))
-    (let ((first*    (match-string 1 base-name))
-          (name-body (match-string 2 base-name))
-          (last*     (match-string 3 base-name)))
-      ;; Handle the case when buffer name is wrapped by '*'.
-      (if (and (string= "*" first*)
-               (string= "*" last*))
-          (concat "*" name-body ": " profile-name "*")
-        (concat base-name ": " profile-name)))))
-
-(defun guix-ui-buffer-name (base-name profile)
-  "Return Guix buffer name based on BASE-NAME and profile.
-See `guix-ui-buffer-name-function' for details."
-  (funcall guix-ui-buffer-name-function
-           base-name profile))
-
-(defun guix-ui-buffer? (&optional buffer modes)
-  "Return non-nil if BUFFER mode is derived from any of the MODES.
-If BUFFER is nil, check current buffer.
-If MODES is nil, use `guix-list-mode' and `guix-info-mode'."
-  (with-current-buffer (or buffer (current-buffer))
-    (apply #'derived-mode-p
-           (or modes '(guix-list-mode guix-info-mode)))))
-
-(defun guix-ui-buffers (&optional modes)
-  "Return a list of all buffers with major modes derived from MODES.
-If MODES is nil, return list of all Guix 'list' and 'info' buffers."
-  (cl-remove-if-not (lambda (buf)
-                      (guix-ui-buffer? buf modes))
-                    (buffer-list)))
-
-(defun guix-ui-update-buffer (buffer)
-  "Update data in a 'list' or 'info' BUFFER."
-  (with-current-buffer buffer
-    (guix-buffer-revert nil t)))
-
-(defun guix-ui-update-buffers-after-operation ()
-  "Update buffers after Guix operation if needed.
-See `guix-ui-update-after-operation' for details."
-  (let ((to-update
-         (and guix-operation-buffer
-              (cl-case guix-ui-update-after-operation
-                (current (and (buffer-live-p guix-operation-buffer)
-                              (guix-ui-buffer? guix-operation-buffer)
-                              (list guix-operation-buffer)))
-                (all     (guix-ui-buffers))))))
-    (setq guix-operation-buffer nil)
-    (mapc #'guix-ui-update-buffer to-update)))
-
-(add-hook 'guix-after-repl-operation-hook
-          'guix-ui-update-buffers-after-operation)
-
-
-;;; Interface definers
-
-(defmacro guix-ui-define-entry-type (entry-type &rest args)
-  "Define general code for ENTRY-TYPE.
-Remaining arguments (ARGS) should have a form [KEYWORD VALUE] ...
-
-The rest keyword arguments are passed to
-`guix-define-entry-type' macro."
-  (declare (indent 1))
-  `(guix-define-entry-type ,entry-type
-     :parent-group guix-ui
-     :parent-faces-group guix-ui-faces
-     ,@args))
-
-(defmacro guix-ui-define-interface (buffer-type entry-type &rest args)
-  "Define BUFFER-TYPE interface for displaying ENTRY-TYPE entries.
-Remaining arguments (ARGS) should have a form [KEYWORD VALUE] ...
-In the following description TYPE means ENTRY-TYPE-BUFFER-TYPE.
-
-Required keywords:
-
-  - `:buffer-name' - base part of a buffer name.  It is used in a
-    generated `guix-TYPE-buffer-name' function; see
-    `guix-ui-buffer-name' for details.
-
-Optional keywords:
-
-  - `:required' - default value of the generated
-    `guix-TYPE-required-params' variable.
-
-The rest keyword arguments are passed to
-`guix-BUFFER-TYPE-define-interface' macro.
-
-Along with the mentioned definitions, this macro also defines:
-
-  - `guix-TYPE-mode-map' - keymap based on `guix-ui-map' and
-    `guix-BUFFER-TYPE-mode-map'.
-
-  - `guix-TYPE-get-entries' - a wrapper around `guix-ui-get-entries'.
-
-  - `guix-TYPE-message' - a wrapper around `guix-result-message'."
-  (declare (indent 2))
-  (let* ((entry-type-str  (symbol-name entry-type))
-         (buffer-type-str (symbol-name buffer-type))
-         (prefix          (concat "guix-" entry-type-str "-"
-                                  buffer-type-str))
-         (mode-str        (concat prefix "-mode"))
-         (mode-map        (intern (concat mode-str "-map")))
-         (parent-map      (intern (format "guix-%s-mode-map"
-                                          buffer-type-str)))
-         (required-var    (intern (concat prefix "-required-params")))
-         (buffer-name-fun (intern (concat prefix "-buffer-name")))
-         (get-fun         (intern (concat prefix "-get-entries")))
-         (message-fun     (intern (concat prefix "-message")))
-         (displayed-fun   (intern (format "guix-%s-displayed-params"
-                                          buffer-type-str)))
-         (definer         (intern (format "guix-%s-define-interface"
-                                          buffer-type-str))))
-    (guix-keyword-args-let args
-        ((buffer-name-val :buffer-name)
-         (required-val    :required ''(id)))
-      `(progn
-         (defvar ,mode-map
-           (let ((map (make-sparse-keymap)))
-             (set-keymap-parent
-              map (make-composed-keymap ,parent-map guix-ui-map))
-             map)
-           ,(format "Keymap for `%s' buffers." mode-str))
-
-         (defvar ,required-var ,required-val
-           ,(format "\
-List of the required '%s' parameters.
-These parameters are received by `%S'
-along with the displayed parameters.
-
-Do not remove `id' from this list as it is required for
-identifying an entry."
-                    entry-type-str get-fun))
-
-         (defun ,buffer-name-fun (profile &rest _)
-           ,(format "\
-Return a name of '%s' buffer for displaying '%s' entries.
-See `guix-ui-buffer-name' for details."
-                    buffer-type-str entry-type-str)
-           (guix-ui-buffer-name ,buffer-name-val profile))
-
-         (defun ,get-fun (profile search-type &rest search-values)
-           ,(format "\
-Receive '%s' entries for displaying them in '%s' buffer.
-See `guix-ui-get-entries' for details."
-                    entry-type-str buffer-type-str)
-           (guix-ui-get-entries
-            profile ',entry-type search-type search-values
-            (cl-union ,required-var
-                      (,displayed-fun ',entry-type))))
-
-         (defun ,message-fun (entries profile search-type
-                                      &rest search-values)
-           ,(format "\
-Display a message after showing '%s' entries."
-                    entry-type-str)
-           (guix-result-message
-            profile entries ',entry-type search-type search-values))
-
-         (,definer ,entry-type
-           :get-entries-function ',get-fun
-           :message-function ',message-fun
-           :buffer-name ',buffer-name-fun
-           ,@%foreign-args)))))
-
-(defmacro guix-ui-info-define-interface (entry-type &rest args)
-  "Define 'info' interface for displaying ENTRY-TYPE entries.
-See `guix-ui-define-interface'."
-  (declare (indent 1))
-  `(guix-ui-define-interface info ,entry-type
-     ,@args))
-
-(defmacro guix-ui-list-define-interface (entry-type &rest args)
-  "Define 'list' interface for displaying ENTRY-TYPE entries.
-Remaining arguments (ARGS) should have a form [KEYWORD VALUE] ...
-
-Optional keywords:
-
-  - `:describe-function' - default value of the generated
-    `guix-ENTRY-TYPE-list-describe-function' variable (if not
-    specified, use `guix-ui-list-describe').
-
-The rest keyword arguments are passed to
-`guix-ui-define-interface' macro."
-  (declare (indent 1))
-  (guix-keyword-args-let args
-      ((describe-val :describe-function))
-    `(guix-ui-define-interface list ,entry-type
-       :describe-function ,(or describe-val ''guix-ui-list-describe)
-       ,@args)))
-
-
-(defvar guix-ui-font-lock-keywords
-  (eval-when-compile
-    `((,(rx "(" (group (or "guix-ui-define-entry-type"
-                           "guix-ui-define-interface"
-                           "guix-ui-info-define-interface"
-                           "guix-ui-list-define-interface"))
-            symbol-end)
-       . 1))))
-
-(font-lock-add-keywords 'emacs-lisp-mode guix-ui-font-lock-keywords)
-
-(provide 'guix-ui)
-
-;;; guix-ui.el ends here
@@ -64,17 +64,6 @@ Use `guix-time-format'."
  "Return one-line string from a multi-line STR."
  (replace-regexp-in-string "\n" " " str))

-(defmacro guix-with-indent (indent &rest body)
-  "Evaluate BODY and indent inserted text by INDENT number of spaces."
-  (declare (indent 1) (debug t))
-  (let ((region-beg-var (make-symbol "region-beg"))
-        (indent-var     (make-symbol "indent")))
-    `(let ((,region-beg-var (point))
-           (,indent-var     ,indent))
-       ,@body
-       (unless (zerop ,indent-var)
-         (indent-rigidly ,region-beg-var (point) ,indent-var)))))
-
 (defun guix-format-insert (val &optional face format)
  "Convert VAL into a string and insert it at point.
 If FACE is non-nil, propertize VAL with FACE.
@@ -104,28 +93,6 @@ See `insert-text-button' for the meaning of PROPERTIES."
           :type (or type 'button)
           properties)))

-(defun guix-buttonize (value button-type separator &rest properties)
-  "Make BUTTON-TYPE button(s) from VALUE.
-Return a string with button(s).
-
-VALUE should be a string or a list of strings.  If it is a list
-of strings, buttons are separated with SEPARATOR string.
-
-PROPERTIES are passed to `guix-insert-button'."
-  (with-temp-buffer
-    (let ((labels (if (listp value) value (list value))))
-      (guix-mapinsert (lambda (label)
-                        (apply #'guix-insert-button
-                               label button-type properties))
-                      labels
-                      separator))
-    (buffer-substring (point-min) (point-max))))
-
-(defun guix-button-type? (symbol)
-  "Return non-nil, if SYMBOL is a button type."
-  (and symbol
-       (get symbol 'button-category-symbol)))
-
 (defun guix-split-insert (val &optional face col separator)
  "Convert VAL into a string, split it and insert at point.

@@ -144,11 +111,14 @@ Separate inserted lines with SEPARATOR."

 (defun guix-split-string (str &optional col)
  "Split string STR by lines and return list of result strings.
-If COL is non-nil, fill STR to this column."
-  (let ((str (if col
-                 (guix-get-filled-string str col)
-               str)))
-    (split-string str "\n *" t)))
+If COL is non-nil and STR is a one-line string longer than COL,
+split it into several short lines."
+  (let ((strings (split-string str "\n *")))
+    (if (and col
+             (null (cdr strings))       ; if not multi-line
+             (> (length str) col))
+        (split-string (guix-get-filled-string str col) "\n")
+      strings)))

 (defun guix-get-filled-string (str col)
  "Return string by filling STR to column COL."
@@ -174,15 +144,6 @@ add both to the end and to the beginning."
          (t
           (concat separator str separator)))))

-(defun guix-hexify (value)
-  "Convert VALUE to string and hexify it."
-  (url-hexify-string (guix-get-string value)))
-
-(defun guix-number->bool (number)
-  "Convert NUMBER to boolean value.
-Return nil, if NUMBER is 0; return t otherwise."
-  (not (zerop number)))
-
 (defun guix-shell-quote-argument (argument)
  "Quote shell command ARGUMENT.
 This function is similar to `shell-quote-argument', but less strict."
@@ -193,15 +154,6 @@ This function is similar to `shell-quote-argument', but less strict."
     (replace-regexp-in-string
      (rx (not (any alnum "-=,./\n"))) "\\\\\\&" argument))))

-(defun guix-symbol-title (symbol)
-  "Return SYMBOL's name, a string.
-This is like `symbol-name', but fancier."
-  (if (eq symbol 'id)
-      "ID"
-    (let ((str (replace-regexp-in-string "-" " " (symbol-name symbol))))
-      (concat (capitalize (substring str 0 1))
-              (substring str 1)))))
-
 (defun guix-command-symbol (&optional args)
  "Return symbol by concatenating 'guix' and ARGS (strings)."
  (intern (guix-concat-strings (cons "guix" args) "-")))
@@ -223,15 +175,6 @@ If NO-MESSAGE? is non-nil, do not display a message about it."
 See also `guix-copy-as-kill'."
  (guix-copy-as-kill (guix-command-string args) no-message?))

-(defun guix-completing-read (prompt table &optional predicate
-                             require-match initial-input
-                             hist def inherit-input-method)
-  "Same as `completing-read' but return nil instead of an empty string."
-  (let ((res (completing-read prompt table predicate
-                              require-match initial-input
-                              hist def inherit-input-method)))
-    (unless (string= "" res) res)))
-
 (defun guix-completing-read-multiple (prompt table &optional predicate
                                      require-match initial-input
                                      hist def inherit-input-method)
@@ -250,14 +193,6 @@ Return time value."
  (require 'org)
  (org-read-date nil t nil prompt))

-(defun guix-read-file-name (prompt &optional dir default-filename
-                                   mustmatch initial predicate)
-  "Read file name.
-This function is similar to `read-file-name' except it also
-expands the file name."
-  (expand-file-name (read-file-name prompt dir default-filename
-                                    mustmatch initial predicate)))
-
 (defcustom guix-find-file-function #'find-file
  "Function used to find a file.
 The function is called by `guix-find-file' with a file name as a
@@ -291,77 +226,8 @@ single argument."
     (while (re-search-forward ,regexp nil t)
       ,@body)))

-(defmacro guix-while-null (&rest body)
-  "Evaluate BODY until its result becomes non-nil."
-  (declare (indent 0) (debug t))
-  (let ((result-var (make-symbol "result")))
-    `(let (,result-var)
-       (while (null ,result-var)
-         (setq ,result-var ,@body))
-       ,result-var)))
-
-(defun guix-modify (object modifiers)
-  "Apply MODIFIERS to OBJECT.
-OBJECT is passed as an argument to the first function from
-MODIFIERS list, the returned result is passed to the second
-function from the list and so on.  Return result of the last
-modifier call."
-  (if (null modifiers)
-      object
-    (guix-modify (funcall (car modifiers) object)
-                 (cdr modifiers))))
-
-(defmacro guix-keyword-args-let (args varlist &rest body)
-  "Parse ARGS, bind variables from VARLIST and eval BODY.
-
-Find keyword values in ARGS, bind them to variables according to
-VARLIST, then evaluate BODY.
-
-ARGS is a keyword/value property list.
-
-Each element of VARLIST has a form:
-
-  (SYMBOL KEYWORD [DEFAULT-VALUE])
-
-SYMBOL is a varible name.  KEYWORD is a symbol that will be
-searched in ARGS for an according value.  If the value of KEYWORD
-does not exist, bind SYMBOL to DEFAULT-VALUE or nil.
-
-The rest arguments (that present in ARGS but not in VARLIST) will
-be bound to `%foreign-args' variable.
-
-Example:
-
-  (guix-keyword-args-let '(:two 8 :great ! :guix is)
-      ((one :one 1)
-       (two :two 2)
-       (foo :smth))
-    (list one two foo %foreign-args))
-
-  => (1 8 nil (:guix is :great !))"
-  (declare (indent 2))
-  (let ((args-var (make-symbol "args")))
-    `(let (,@(mapcar (lambda (spec)
-                       (pcase-let ((`(,name ,_ ,val) spec))
-                         (list name val)))
-                     varlist)
-           (,args-var ,args)
-           %foreign-args)
-       (while ,args-var
-         (pcase ,args-var
-           (`(,key ,val . ,rest-args)
-            (cl-case key
-              ,@(mapcar (lambda (spec)
-                          (pcase-let ((`(,name ,key ,_) spec))
-                            `(,key (setq ,name val))))
-                        varlist)
-              (t (setq %foreign-args
-                       (cl-list* key val %foreign-args))))
-            (setq ,args-var rest-args))))
-       ,@body)))
-

-;;; Alist procedures
+;;; Alist accessors

 (defmacro guix-define-alist-accessor (name assoc-fun)
  "Define NAME function to access alist values using ASSOC-FUN."
@@ -379,48 +245,6 @@ accessed with KEYS."
 (guix-define-alist-accessor guix-assq-value assq)
 (guix-define-alist-accessor guix-assoc-value assoc)

-(defun guix-alist-put (value alist &rest keys)
-  "Put (add or replace if exists) VALUE to ALIST using KEYS.
-Return the new alist.
-
-ALIST is alist of alists of alists ... which can be consecutively
-accessed with KEYS.
-
-Example:
-
-  (guix-alist-put
-   'foo
-   '((one (a . 1) (b . 2))
-     (two (m . 7) (n . 8)))
-   'one 'b)
-
-  => ((one (a . 1) (b . foo))
-      (two (m . 7) (n . 8)))"
-  (or keys (error "Keys should be specified"))
-  (guix-alist-put-1 value alist keys))
-
-(defun guix-alist-put-1 (value alist keys)
-  "Subroutine of `guix-alist-put'."
-  (cond
-   ((null keys)
-    value)
-   ((null alist)
-    (list (cons (car keys)
-                (guix-alist-put-1 value nil (cdr keys)))))
-   ((eq (car keys) (caar alist))
-    (cons (cons (car keys)
-                (guix-alist-put-1 value (cdar alist) (cdr keys)))
-          (cdr alist)))
-   (t
-    (cons (car alist)
-          (guix-alist-put-1 value (cdr alist) keys)))))
-
-(defun guix-alist-put! (value variable &rest keys)
-  "Modify alist VARIABLE (symbol) by putting VALUE using KEYS.
-See `guix-alist-put' for details."
-  (set variable
-       (apply #'guix-alist-put value (symbol-value variable) keys)))
-

 ;;; Diff

@@ -431,77 +255,6 @@ See `guix-alist-put' for details."
  "Same as `diff', but use `guix-diff-switches' as default."
  (diff old new (or switches guix-diff-switches) no-async))

-
-;;; Completing readers definers
-
-(defmacro guix-define-reader (name read-fun completions prompt)
-  "Define NAME function to read from minibuffer.
-READ-FUN may be `completing-read', `completing-read-multiple' or
-another function with the same arguments."
-  `(defun ,name (&optional prompt initial-contents)
-     (,read-fun ,(if prompt
-                     `(or prompt ,prompt)
-                   'prompt)
-                ,completions nil nil initial-contents)))
-
-(defmacro guix-define-readers (&rest args)
-  "Define reader functions.
-
-ARGS should have a form [KEYWORD VALUE] ...  The following
-keywords are available:
-
-  - `completions-var' - variable used to get completions.
-
-  - `completions-getter' - function used to get completions.
-
-  - `single-reader', `single-prompt' - name of a function to read
-    a single value, and a prompt for it.
-
-  - `multiple-reader', `multiple-prompt' - name of a function to
-    read multiple values, and a prompt for it.
-
-  - `multiple-separator' - if specified, another
-    `<multiple-reader-name>-string' function returning a string
-    of multiple values separated the specified separator will be
-    defined."
-  (guix-keyword-args-let args
-      ((completions-var    :completions-var)
-       (completions-getter :completions-getter)
-       (single-reader      :single-reader)
-       (single-prompt      :single-prompt)
-       (multiple-reader    :multiple-reader)
-       (multiple-prompt    :multiple-prompt)
-       (multiple-separator :multiple-separator))
-    (let ((completions
-           (cond ((and completions-var completions-getter)
-                  `(or ,completions-var
-                       (setq ,completions-var
-                             (funcall ',completions-getter))))
-                 (completions-var
-                  completions-var)
-                 (completions-getter
-                  `(funcall ',completions-getter)))))
-      `(progn
-         ,(when (and completions-var
-                     (not (boundp completions-var)))
-            `(defvar ,completions-var nil))
-
-         ,(when single-reader
-            `(guix-define-reader ,single-reader guix-completing-read
-                                 ,completions ,single-prompt))
-
-         ,(when multiple-reader
-            `(guix-define-reader ,multiple-reader completing-read-multiple
-                                 ,completions ,multiple-prompt))
-
-         ,(when (and multiple-reader multiple-separator)
-            (let ((name (intern (concat (symbol-name multiple-reader)
-                                        "-string"))))
-              `(defun ,name (&optional prompt initial-contents)
-                 (guix-concat-strings
-                  (,multiple-reader prompt initial-contents)
-                  ,multiple-separator))))))))
-

 ;;; Memoizing

@@ -539,18 +292,9 @@ See `defun' for the meaning of arguments."
     ,(or docstring
          (format "Memoized version of `%S'." definition))))

-
-(defvar guix-utils-font-lock-keywords
+(defvar guix-memoized-font-lock-keywords
  (eval-when-compile
-    `((,(rx "(" (group (or "guix-define-reader"
-                           "guix-define-readers"
-                           "guix-keyword-args-let"
-                           "guix-while-null"
-                           "guix-while-search"
-                           "guix-with-indent"))
-            symbol-end)
-       . 1)
-      (,(rx "("
+    `((,(rx "("
            (group "guix-memoized-" (or "defun" "defalias"))
            symbol-end
            (zero-or-more blank)
@@ -559,7 +303,7 @@ See `defun' for the meaning of arguments."
       (1 font-lock-keyword-face)
       (2 font-lock-function-name-face nil t)))))

-(font-lock-add-keywords 'emacs-lisp-mode guix-utils-font-lock-keywords)
+(font-lock-add-keywords 'emacs-lisp-mode guix-memoized-font-lock-keywords)

 (provide 'guix-utils)

@@ -0,0 +1,213 @@
+;;; guix.el --- Interface for GNU Guix package manager
+
+;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
+
+;; Package-Requires: ((geiser "0.3"))
+;; Keywords: tools
+
+;; This file is part of GNU Guix.
+
+;; GNU Guix is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Guix is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This package provides an interface for searching, listing and getting
+;; information about Guix packages and generations; and for
+;; installing/upgrading/removing packages.
+
+;;; Code:
+
+(require 'guix-base)
+(require 'guix-list)
+(require 'guix-info)
+(require 'guix-utils)
+(require 'guix-read)
+
+(defgroup guix nil
+  "Interface for Guix package manager."
+  :prefix "guix-"
+  :group 'external)
+
+(defgroup guix-faces nil
+  "Guix faces."
+  :group 'guix
+  :group 'faces)
+
+(defcustom guix-list-single-package nil
+  "If non-nil, list a package even if it is the only matching result.
+If nil, show a single package in the info buffer."
+  :type 'boolean
+  :group 'guix)
+
+(defvar guix-search-params '(name synopsis description)
+  "Default list of package parameters for searching by regexp.")
+
+(defvar guix-search-history nil
+  "A history of minibuffer prompts.")
+
+(defun guix-get-show-packages (profile search-type &rest search-vals)
+  "Search for packages and show results.
+
+If PROFILE is nil, use `guix-current-profile'.
+
+See `guix-get-entries' for the meaning of SEARCH-TYPE and
+SEARCH-VALS.
+
+Results are displayed in the list buffer, unless a single package
+is found and `guix-list-single-package' is nil."
+  (or profile (setq profile guix-current-profile))
+  (let ((packages (guix-get-entries profile guix-package-list-type
+                                    search-type search-vals
+                                    (guix-get-params-for-receiving
+                                     'list guix-package-list-type))))
+    (if (or guix-list-single-package
+            (cdr packages))
+        (guix-set-buffer profile packages 'list guix-package-list-type
+                         search-type search-vals)
+      (let ((packages (guix-get-entries profile guix-package-info-type
+                                        search-type search-vals
+                                        (guix-get-params-for-receiving
+                                         'info guix-package-info-type))))
+        (guix-set-buffer profile packages 'info guix-package-info-type
+                         search-type search-vals)))))
+
+(defun guix-get-show-generations (profile search-type &rest search-vals)
+  "Search for generations and show results.
+
+If PROFILE is nil, use `guix-current-profile'.
+
+See `guix-get-entries' for the meaning of SEARCH-TYPE and
+SEARCH-VALS."
+  (apply #'guix-get-show-entries
+         (or profile guix-current-profile)
+         'list 'generation search-type search-vals))
+
+;;;###autoload
+(defun guix-search-by-name (name &optional profile)
+  "Search for Guix packages by NAME.
+NAME is a string with name specification.  It may optionally contain
+a version number.  Examples: \"guile\", \"guile-2.0.11\".
+
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (read-string "Package name: " nil 'guix-search-history)
+         (and current-prefix-arg
+              (guix-profile-prompt))))
+  (guix-get-show-packages profile 'name name))
+
+;;;###autoload
+(defun guix-search-by-regexp (regexp &optional params profile)
+  "Search for Guix packages by REGEXP.
+PARAMS are package parameters that should be searched.
+If PARAMS are not specified, use `guix-search-params'.
+
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (read-regexp "Regexp: " nil 'guix-search-history)
+         nil
+         (and current-prefix-arg
+              (guix-profile-prompt))))
+  (guix-get-show-packages profile 'regexp regexp
+                          (or params guix-search-params)))
+
+;;;###autoload
+(defun guix-installed-packages (&optional profile)
+  "Display information about installed Guix packages.
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (and current-prefix-arg
+              (guix-profile-prompt))))
+  (guix-get-show-packages profile 'installed))
+
+;;;###autoload
+(defun guix-obsolete-packages (&optional profile)
+  "Display information about obsolete Guix packages.
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (and current-prefix-arg
+              (guix-profile-prompt))))
+  (guix-get-show-packages profile 'obsolete))
+
+;;;###autoload
+(defun guix-all-available-packages (&optional profile)
+  "Display information about all available Guix packages.
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (and current-prefix-arg
+              (guix-profile-prompt))))
+  (guix-get-show-packages profile 'all-available))
+
+;;;###autoload
+(defun guix-newest-available-packages (&optional profile)
+  "Display information about the newest available Guix packages.
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (and current-prefix-arg
+              (guix-profile-prompt))))
+  (guix-get-show-packages profile 'newest-available))
+
+;;;###autoload
+(defun guix-generations (&optional profile)
+  "Display information about all generations.
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (and current-prefix-arg
+              (guix-profile-prompt))))
+  (guix-get-show-generations profile 'all))
+
+;;;###autoload
+(defun guix-last-generations (number &optional profile)
+  "Display information about last NUMBER generations.
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (read-number "The number of last generations: ")
+         (and current-prefix-arg
+              (guix-profile-prompt))))
+  (guix-get-show-generations profile 'last number))
+
+;;;###autoload
+(defun guix-generations-by-time (from to &optional profile)
+  "Display information about generations created between FROM and TO.
+FROM and TO should be time values.
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (guix-read-date "Find generations (from): ")
+         (guix-read-date "Find generations (to): ")
+         (and current-prefix-arg
+              (guix-profile-prompt))))
+  (guix-get-show-generations profile 'time
+                             (float-time from)
+                             (float-time to)))
+
+;;;###autoload
+(defun guix-edit (id-or-name)
+  "Edit (go to location of) package with ID-OR-NAME."
+  (interactive (list (guix-read-package-name)))
+  (let ((loc (guix-package-location id-or-name)))
+    (if loc
+        (guix-find-location loc)
+      (message "Couldn't find package location."))))
+
+(provide 'guix)
+
+;;; guix.el ends here
@@ -1,12 +0,0 @@
-# This is a "job" for the Upstart init system to launch 'guix-daemon'.
-# Drop it in /etc/init to have 'guix-daemon' automatically started.
-
-description "Build daemon for GNU Guix"
-
-start on runlevel [2345]
-
-stop on runlevel [016]
-
-task
-
-exec @bindir@/guix-daemon --build-users-group=guixbuild
@@ -1,8 +1,7 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
-# Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
-# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
-# Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
+# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
+# Copyright © 2013, 2014, 2015 Mark H Weaver <mhw@netris.org>
 #
 # This file is part of GNU Guix.
 #
@@ -26,6 +25,7 @@ GNU_SYSTEM_MODULES =				\
  gnu.scm					\
  gnu/artwork.scm				\
  gnu/packages.scm				\
+  gnu/packages/aarddict.scm			\
  gnu/packages/abduco.scm			\
  gnu/packages/abiword.scm			\
  gnu/packages/acct.scm				\
@@ -34,7 +34,6 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/adns.scm				\
  gnu/packages/algebra.scm			\
  gnu/packages/aidc.scm				\
-  gnu/packages/animation.scm			\
  gnu/packages/apl.scm				\
  gnu/packages/apr.scm				\
  gnu/packages/asciidoc.scm			\
@@ -42,7 +41,6 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/attr.scm				\
  gnu/packages/audacity.scm			\
  gnu/packages/audio.scm			\
-  gnu/packages/augeas.scm			\
  gnu/packages/autogen.scm			\
  gnu/packages/autotools.scm			\
  gnu/packages/avahi.scm			\
@@ -77,21 +75,18 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/cryptsetup.scm			\
  gnu/packages/cups.scm				\
  gnu/packages/curl.scm				\
+  gnu/packages/cursynth.scm			\
  gnu/packages/cyrus-sasl.scm			\
  gnu/packages/databases.scm			\
  gnu/packages/datamash.scm			\
-  gnu/packages/datastructures.scm		\
-  gnu/packages/dav.scm				\
  gnu/packages/dc.scm				\
  gnu/packages/debug.scm			\
  gnu/packages/dejagnu.scm			\
-  gnu/packages/dico.scm				\
  gnu/packages/dictionaries.scm			\
  gnu/packages/disk.scm				\
  gnu/packages/djvu.scm				\
  gnu/packages/dns.scm				\
  gnu/packages/docbook.scm			\
-  gnu/packages/docker.scm			\
  gnu/packages/doxygen.scm			\
  gnu/packages/dunst.scm			\
  gnu/packages/dvtm.scm				\
@@ -126,6 +121,7 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/gcc.scm				\
  gnu/packages/gd.scm				\
  gnu/packages/gdb.scm				\
+  gnu/packages/gdbm.scm				\
  gnu/packages/geeqie.scm			\
  gnu/packages/gettext.scm			\
  gnu/packages/ghostscript.scm			\
@@ -164,21 +160,17 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/image.scm			\
  gnu/packages/imagemagick.scm			\
  gnu/packages/indent.scm			\
-  gnu/packages/inklingreader.scm		\
  gnu/packages/inkscape.scm			\
-  gnu/packages/irc.scm  			\
+  gnu/packages/irssi.scm			\
  gnu/packages/iso-codes.scm			\
  gnu/packages/java.scm				\
  gnu/packages/jemalloc.scm			\
  gnu/packages/jrnl.scm				\
  gnu/packages/julia.scm			\
-  gnu/packages/kde.scm              \
+  gnu/packages/kde.scm				\
  gnu/packages/kde-frameworks.scm		\
  gnu/packages/key-mon.scm			\
-  gnu/packages/kodi.scm				\
  gnu/packages/language.scm			\
-  gnu/packages/ldc.scm				\
-  gnu/packages/lego.scm				\
  gnu/packages/less.scm				\
  gnu/packages/lesstif.scm			\
  gnu/packages/libcanberra.scm			\
@@ -216,7 +208,6 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/mail.scm				\
  gnu/packages/make-bootstrap.scm		\
  gnu/packages/markdown.scm			\
-  gnu/packages/mate.scm             \
  gnu/packages/maths.scm			\
  gnu/packages/mc.scm				\
  gnu/packages/mcrypt.scm			\
@@ -252,7 +243,6 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/openstack.scm			\
  gnu/packages/orpheus.scm			\
  gnu/packages/ots.scm				\
-  gnu/packages/owncloud.scm			\
  gnu/packages/package-management.scm		\
  gnu/packages/parallel.scm			\
  gnu/packages/password-utils.scm		\
@@ -276,7 +266,6 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/python.scm			\
  gnu/packages/qemu.scm				\
  gnu/packages/qt.scm				\
-  gnu/packages/ragel.scm			\
  gnu/packages/ratpoison.scm			\
  gnu/packages/rc.scm				\
  gnu/packages/rdesktop.scm			\
@@ -291,10 +280,8 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/scanner.scm			\
  gnu/packages/scheme.scm			\
  gnu/packages/screen.scm			\
-  gnu/packages/scribus.scm			\
  gnu/packages/sdl.scm				\
  gnu/packages/search.scm			\
-  gnu/packages/serialization.scm		\
  gnu/packages/serveez.scm			\
  gnu/packages/shishi.scm			\
  gnu/packages/skarnet.scm			\
@@ -314,7 +301,6 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/tcl.scm				\
  gnu/packages/tcsh.scm				\
  gnu/packages/telephony.scm			\
-  gnu/packages/terminals.scm			\
  gnu/packages/texinfo.scm			\
  gnu/packages/texlive.scm			\
  gnu/packages/textutils.scm			\
@@ -337,6 +323,7 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/wdiff.scm			\
  gnu/packages/web.scm				\
  gnu/packages/webkit.scm			\
+  gnu/packages/weechat.scm			\
  gnu/packages/wget.scm				\
  gnu/packages/wicd.scm				\
  gnu/packages/wine.scm				\
@@ -363,11 +350,9 @@ GNU_SYSTEM_MODULES =				\
  gnu/services/databases.scm			\
  gnu/services/dbus.scm				\
  gnu/services/desktop.scm			\
+  gnu/services/dmd.scm				\
  gnu/services/lirc.scm				\
-  gnu/services/mail.scm				\
  gnu/services/networking.scm			\
-  gnu/services/shepherd.scm			\
-  gnu/services/herd.scm				\
  gnu/services/ssh.scm				\
  gnu/services/web.scm				\
  gnu/services/xorg.scm				\
@@ -376,11 +361,11 @@ GNU_SYSTEM_MODULES =				\
  gnu/system/file-systems.scm			\
  gnu/system/grub.scm				\
  gnu/system/install.scm			\
+  gnu/system/linux.scm				\
  gnu/system/linux-container.scm		\
  gnu/system/linux-initrd.scm			\
  gnu/system/locale.scm				\
  gnu/system/nss.scm				\
-  gnu/system/pam.scm				\
  gnu/system/shadow.scm				\
  gnu/system/vm.scm				\
 						\
@@ -411,22 +396,22 @@ dist_patch_DATA =						\
  gnu/packages/patches/agg-am_c_prototype.patch			\
  gnu/packages/patches/alsa-lib-mips-atomic-fix.patch		\
  gnu/packages/patches/apr-skip-getservbyname-test.patch	\
-  gnu/packages/patches/arb-ldconfig.patch			\
-  gnu/packages/patches/asymptote-gsl2.patch			\
  gnu/packages/patches/ath9k-htc-firmware-binutils.patch	\
  gnu/packages/patches/ath9k-htc-firmware-gcc.patch		\
  gnu/packages/patches/ath9k-htc-firmware-objcopy.patch		\
  gnu/packages/patches/audacity-fix-ffmpeg-binding.patch	\
  gnu/packages/patches/automake-skip-amhello-tests.patch	\
-  gnu/packages/patches/automake-regexp-syntax.patch		\
  gnu/packages/patches/avahi-localstatedir.patch		\
  gnu/packages/patches/avidemux-install-to-lib.patch		\
  gnu/packages/patches/avrdude-fix-libusb.patch			\
  gnu/packages/patches/bash-completion-directories.patch	\
+  gnu/packages/patches/bedtools-32bit-compilation.patch         \
+  gnu/packages/patches/bowtie-fix-makefile.patch		\
  gnu/packages/patches/bigloo-gc-shebangs.patch			\
  gnu/packages/patches/binutils-ld-new-dtags.patch		\
  gnu/packages/patches/binutils-loongson-workaround.patch	\
-  gnu/packages/patches/byobu-writable-status.patch		\
+  gnu/packages/patches/bitlbee-configure-doc-fix.patch		\
+  gnu/packages/patches/boost-mips-avoid-m32.patch		\
  gnu/packages/patches/calibre-drop-unrar.patch			\
  gnu/packages/patches/calibre-no-updates-dialog.patch		\
  gnu/packages/patches/cdparanoia-fpic.patch			\
@@ -435,30 +420,23 @@ dist_patch_DATA =						\
  gnu/packages/patches/clucene-pkgconfig.patch			\
  gnu/packages/patches/cmake-fix-tests.patch			\
  gnu/packages/patches/cpio-gets-undeclared.patch		\
-  gnu/packages/patches/cpio-CVE-2016-2037.patch			\
  gnu/packages/patches/cpufrequtils-fix-aclocal.patch		\
  gnu/packages/patches/crda-optional-gcrypt.patch		\
  gnu/packages/patches/crossmap-allow-system-pysam.patch	\
-  gnu/packages/patches/csound-header-ordering.patch		\
  gnu/packages/patches/cssc-gets-undeclared.patch               \
  gnu/packages/patches/cssc-missing-include.patch               \
  gnu/packages/patches/clucene-contribs-lib.patch               \
  gnu/packages/patches/cursynth-wave-rand.patch			\
-  gnu/packages/patches/dbus-helper-search-path.patch		\
+  gnu/packages/patches/dbus-localstatedir.patch			\
  gnu/packages/patches/dealii-p4est-interface.patch		\
-  gnu/packages/patches/devil-fix-libpng.patch			\
-  gnu/packages/patches/dico-libtool-deterministic.patch		\
  gnu/packages/patches/diffutils-gets-undeclared.patch		\
  gnu/packages/patches/dfu-programmer-fix-libusb.patch		\
  gnu/packages/patches/doxygen-test.patch			\
+  gnu/packages/patches/doxygen-tmake.patch			\
  gnu/packages/patches/duplicity-piped-password.patch		\
  gnu/packages/patches/duplicity-test_selection-tmp.patch	\
  gnu/packages/patches/elfutils-tests-ptrace.patch		\
-  gnu/packages/patches/einstein-build.patch			\
-  gnu/packages/patches/emacs-constants-lisp-like.patch		\
  gnu/packages/patches/emacs-exec-path.patch			\
-  gnu/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch	\
-  gnu/packages/patches/emacs-source-date-epoch.patch		\
  gnu/packages/patches/eudev-rules-directory.patch		\
  gnu/packages/patches/evilwm-lost-focus-bug.patch		\
  gnu/packages/patches/expat-CVE-2015-1283.patch		\
@@ -469,13 +447,14 @@ dist_patch_DATA =						\
  gnu/packages/patches/fasthenry-spUtils.patch			\
  gnu/packages/patches/fasthenry-spSolve.patch			\
  gnu/packages/patches/fasthenry-spFactor.patch			\
+  gnu/packages/patches/findutils-absolute-paths.patch		\
  gnu/packages/patches/findutils-localstatedir.patch		\
-  gnu/packages/patches/findutils-test-xargs.patch		\
  gnu/packages/patches/flashrom-use-libftdi1.patch		\
+  gnu/packages/patches/flex-bison-tests.patch			\
  gnu/packages/patches/flint-ldconfig.patch			\
  gnu/packages/patches/fltk-shared-lib-defines.patch		\
  gnu/packages/patches/freeimage-CVE-2015-0852.patch		\
-  gnu/packages/patches/gawk-fts-test.patch			\
+  gnu/packages/patches/fuse-CVE-2015-3202.patch			\
  gnu/packages/patches/gawk-shell.patch				\
  gnu/packages/patches/gcc-arm-link-spec-fix.patch		\
  gnu/packages/patches/gcc-cross-environment-variables.patch	\
@@ -484,15 +463,14 @@ dist_patch_DATA =						\
  gnu/packages/patches/geoclue-config.patch			\
  gnu/packages/patches/ghostscript-CVE-2015-3228.patch		\
  gnu/packages/patches/ghostscript-runpath.patch		\
+  gnu/packages/patches/gitolite-openssh-6.8-compat.patch	\
  gnu/packages/patches/glib-networking-ssl-cert-file.patch	\
  gnu/packages/patches/glib-tests-desktop.patch			\
  gnu/packages/patches/glib-tests-homedir.patch			\
  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-2015-7547.patch		\
  gnu/packages/patches/glibc-bootstrap-system.patch		\
-  gnu/packages/patches/glibc-hurd-extern-inline.patch		\
  gnu/packages/patches/glibc-ldd-x86_64.patch			\
  gnu/packages/patches/glibc-locales.patch			\
  gnu/packages/patches/glibc-locale-incompatibility.patch	\
@@ -501,14 +479,15 @@ dist_patch_DATA =						\
  gnu/packages/patches/gmp-arm-asm-nothumb.patch		\
  gnu/packages/patches/gmp-faulty-test.patch			\
  gnu/packages/patches/gnucash-price-quotes-perl.patch		\
-  gnu/packages/patches/gnupg-simple-query-ignore-status-messages.patch \
+  gnu/packages/patches/gnutls-doc-fix.patch			\
  gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
  gnu/packages/patches/gobject-introspection-cc.patch		\
  gnu/packages/patches/gobject-introspection-girepository.patch	\
-  gnu/packages/patches/grep-timing-sensitive-test.patch		\
-  gnu/packages/patches/grub-CVE-2015-8370.patch			\
+  gnu/packages/patches/grep-CVE-2015-1345.patch			\
  gnu/packages/patches/grub-gets-undeclared.patch		\
  gnu/packages/patches/grub-freetype.patch			\
+  gnu/packages/patches/gsl-poly-test-fix-pt1.patch		\
+  gnu/packages/patches/gsl-poly-test-fix-pt2.patch		\
  gnu/packages/patches/guile-1.8-cpp-4.5.patch			\
  gnu/packages/patches/guile-arm-fixes.patch			\
  gnu/packages/patches/guile-default-utf8.patch			\
@@ -516,84 +495,43 @@ dist_patch_DATA =						\
  gnu/packages/patches/guile-present-coding.patch		\
  gnu/packages/patches/guile-relocatable.patch			\
  gnu/packages/patches/guile-rsvg-pkgconfig.patch		\
-  gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch	\
-  gnu/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch	\
  gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
  gnu/packages/patches/hop-bigloo-4.0b.patch			\
  gnu/packages/patches/hop-linker-flags.patch			\
+  gnu/packages/patches/hwloc-gather-topology-lstopo.patch	\
  gnu/packages/patches/hydra-automake-1.15.patch		\
  gnu/packages/patches/hydra-disable-darcs-test.patch		\
  gnu/packages/patches/icecat-avoid-bundled-includes.patch	\
-  gnu/packages/patches/icecat-update-graphite2.patch		\
-  gnu/packages/patches/icecat-update-graphite2-pt2.patch	\
-  gnu/packages/patches/icecat-re-enable-DHE-cipher-suites.patch	\
-  gnu/packages/patches/icecat-CVE-2015-4477.patch		\
-  gnu/packages/patches/icecat-CVE-2015-7207.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1952-pt01.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1952-pt02.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1952-pt03.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1952-pt04.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1952-pt05.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1952-pt06.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1954.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1960.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1961.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1962.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1964.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1965.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1966.patch		\
-  gnu/packages/patches/icecat-CVE-2016-1974.patch		\
-  gnu/packages/patches/icecat-bug-1248851.patch			\
+  gnu/packages/patches/icecat-freetype-2.6.patch		\
  gnu/packages/patches/icu4c-CVE-2014-6585.patch		\
  gnu/packages/patches/icu4c-CVE-2015-1270.patch		\
  gnu/packages/patches/icu4c-CVE-2015-4760.patch		\
-  gnu/packages/patches/ilmbase-fix-tests.patch			\
  gnu/packages/patches/imagemagick-test-segv.patch		\
  gnu/packages/patches/irrlicht-mesa-10.patch			\
-  gnu/packages/patches/jasper-CVE-2007-2721.patch		\
-  gnu/packages/patches/jasper-CVE-2008-3520.patch		\
-  gnu/packages/patches/jasper-CVE-2008-3522.patch		\
-  gnu/packages/patches/jasper-CVE-2011-4516-and-CVE-2011-4517.patch \
-  gnu/packages/patches/jasper-CVE-2014-8137.patch		\
-  gnu/packages/patches/jasper-CVE-2014-8138.patch		\
-  gnu/packages/patches/jasper-CVE-2014-8157.patch		\
-  gnu/packages/patches/jasper-CVE-2014-8158.patch		\
-  gnu/packages/patches/jasper-CVE-2014-9029.patch		\
-  gnu/packages/patches/jasper-CVE-2016-1577.patch		\
-  gnu/packages/patches/jasper-CVE-2016-1867.patch		\
-  gnu/packages/patches/jasper-CVE-2016-2089.patch		\
-  gnu/packages/patches/jasper-CVE-2016-2116.patch		\
  gnu/packages/patches/jbig2dec-ignore-testtest.patch		\
+  gnu/packages/patches/julia-0.3.10-fix-empty-array.patch	\
  gnu/packages/patches/kmod-module-directory.patch		\
-  gnu/packages/patches/ldc-disable-tests.patch			\
  gnu/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
  gnu/packages/patches/liba52-enable-pic.patch			\
  gnu/packages/patches/liba52-link-with-libm.patch		\
  gnu/packages/patches/liba52-set-soname.patch			\
  gnu/packages/patches/liba52-use-mtune-not-mcpu.patch		\
-  gnu/packages/patches/libarchive-bsdtar-test.patch		\
  gnu/packages/patches/libarchive-CVE-2013-0211.patch		\
  gnu/packages/patches/libarchive-fix-lzo-test-case.patch	\
  gnu/packages/patches/libarchive-mtree-filename-length-fix.patch \
  gnu/packages/patches/libbonobo-activation-test-race.patch	\
  gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch \
-  gnu/packages/patches/libcmis-fix-test-onedrive.patch		\
-  gnu/packages/patches/libdrm-symbol-check.patch		\
  gnu/packages/patches/libevent-dns-tests.patch			\
  gnu/packages/patches/libmtp-devices.patch			\
  gnu/packages/patches/liboop-mips64-deplibs-fix.patch		\
-  gnu/packages/patches/libotr-test-auth-fix.patch		\
  gnu/packages/patches/liblxqt-include.patch			\
  gnu/packages/patches/libmad-armv7-thumb-pt1.patch		\
  gnu/packages/patches/libmad-armv7-thumb-pt2.patch		\
  gnu/packages/patches/libmad-frame-length.patch		\
  gnu/packages/patches/libmad-mips-newgcc.patch			\
-  gnu/packages/patches/libssh-0.6.5-CVE-2016-0739.patch		\
  gnu/packages/patches/libtheora-config-guess.patch		\
-  gnu/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch \
-  gnu/packages/patches/libtiff-oob-accesses-in-decode.patch	\
-  gnu/packages/patches/libtiff-oob-write-in-nextdecode.patch	\
  gnu/packages/patches/libtool-skip-tests2.patch		\
+  gnu/packages/patches/libssh-CVE-2014-0017.patch		\
  gnu/packages/patches/libunwind-CVE-2015-3239.patch		\
  gnu/packages/patches/libwmf-CAN-2004-0941.patch		\
  gnu/packages/patches/libwmf-CVE-2006-3376.patch		\
@@ -607,13 +545,11 @@ dist_patch_DATA =						\
  gnu/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch	\
  gnu/packages/patches/libwmf-CVE-2015-4695.patch		\
  gnu/packages/patches/libwmf-CVE-2015-4696.patch		\
-  gnu/packages/patches/libxslt-CVE-2015-7995.patch		\
  gnu/packages/patches/lirc-localstatedir.patch			\
  gnu/packages/patches/libpthread-glibc-preparation.patch	\
  gnu/packages/patches/lm-sensors-hwmon-attrs.patch		\
  gnu/packages/patches/lua-pkgconfig.patch                      \
  gnu/packages/patches/lua51-liblua-so.patch                    \
-  gnu/packages/patches/lua52-liblua-so.patch                    \
  gnu/packages/patches/luajit-no_ldconfig.patch			\
  gnu/packages/patches/luajit-symlinks.patch			\
  gnu/packages/patches/luit-posix.patch				\
@@ -621,21 +557,17 @@ dist_patch_DATA =						\
  gnu/packages/patches/make-impure-dirs.patch			\
  gnu/packages/patches/mars-install.patch			\
  gnu/packages/patches/mars-sfml-2.3.patch			\
-  gnu/packages/patches/matplotlib-setupext-tk.patch		\
  gnu/packages/patches/maxima-defsystem-mkdir.patch		\
  gnu/packages/patches/mc-fix-ncurses-build.patch		\
  gnu/packages/patches/mcron-install.patch			\
  gnu/packages/patches/mdadm-gcc-4.9-fix.patch			\
  gnu/packages/patches/mhash-keygen-test-segfault.patch		\
-  gnu/packages/patches/mit-krb5-CVE-2015-8629.patch		\
-  gnu/packages/patches/mit-krb5-CVE-2015-8630.patch		\
-  gnu/packages/patches/mit-krb5-CVE-2015-8631.patch		\
-  gnu/packages/patches/mit-krb5-init-context-null-spnego.patch	\
+  gnu/packages/patches/mit-krb5-init-fix.patch			\
  gnu/packages/patches/mpc123-initialize-ao.patch		\
  gnu/packages/patches/mplayer2-theora-fix.patch		\
  gnu/packages/patches/module-init-tools-moduledir.patch	\
  gnu/packages/patches/mumps-build-parallelism.patch		\
-  gnu/packages/patches/mupen64plus-ui-console-notice.patch	\
+  gnu/packages/patches/mupdf-buildsystem-fix.patch		\
  gnu/packages/patches/mutt-store-references.patch		\
  gnu/packages/patches/net-tools-bitrot.patch			\
  gnu/packages/patches/ngircd-handle-zombies.patch		\
@@ -646,83 +578,51 @@ dist_patch_DATA =						\
  gnu/packages/patches/nvi-assume-preserve-path.patch		\
  gnu/packages/patches/nvi-dbpagesize-binpower.patch		\
  gnu/packages/patches/nvi-db4.patch				\
-  gnu/packages/patches/ocaml-findlib-make-install.patch	\
  gnu/packages/patches/openexr-missing-samples.patch		\
-  gnu/packages/patches/openimageio-boost-1.60.patch		\
  gnu/packages/patches/openjpeg-CVE-2015-6581.patch		\
  gnu/packages/patches/openjpeg-use-after-free-fix.patch	\
  gnu/packages/patches/openssl-runpath.patch			\
-  gnu/packages/patches/openssl-c-rehash-in.patch		\
+  gnu/packages/patches/openssl-c-rehash.patch			\
  gnu/packages/patches/orpheus-cast-errors-and-includes.patch	\
  gnu/packages/patches/ots-no-include-missing-file.patch	\
  gnu/packages/patches/patchelf-page-size.patch			\
  gnu/packages/patches/patchelf-rework-for-arm.patch		\
  gnu/packages/patches/patchutils-xfail-gendiff-tests.patch	\
  gnu/packages/patches/patch-hurd-path-max.patch		\
-  gnu/packages/patches/perl-CVE-2015-8607.patch			\
-  gnu/packages/patches/perl-CVE-2016-2381.patch			\
  gnu/packages/patches/perl-autosplit-default-time.patch	\
-  gnu/packages/patches/perl-deterministic-ordering.patch	\
  gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
  gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch \
-  gnu/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \
+  gnu/packages/patches/perl-module-pluggable-search.patch	\
  gnu/packages/patches/perl-net-amazon-s3-moose-warning.patch	\
  gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch	\
-  gnu/packages/patches/perl-no-build-time.patch			\
  gnu/packages/patches/perl-no-sys-dirs.patch			\
-  gnu/packages/patches/perl-module-pluggable-search.patch	\
-  gnu/packages/patches/perl-source-date-epoch.patch		\
+  gnu/packages/patches/perl-tk-x11-discover.patch		\
  gnu/packages/patches/pidgin-add-search-path.patch		\
-  gnu/packages/patches/pinball-const-fix.patch			\
-  gnu/packages/patches/pinball-cstddef.patch			\
-  gnu/packages/patches/pinball-missing-separators.patch		\
-  gnu/packages/patches/pinball-src-deps.patch			\
-  gnu/packages/patches/pinball-system-ltdl.patch		\
  gnu/packages/patches/pingus-sdl-libs-config.patch		\
-  gnu/packages/patches/plink-1.07-unclobber-i.patch		\
  gnu/packages/patches/plotutils-libpng-jmpbuf.patch		\
  gnu/packages/patches/polkit-drop-test.patch			\
  gnu/packages/patches/portaudio-audacity-compat.patch		\
-  gnu/packages/patches/procmail-ambiguous-getline-debian.patch  \
+  gnu/packages/patches/preseq-1.0.2-install-to-PREFIX.patch	\
+  gnu/packages/patches/preseq-1.0.2-link-with-libbam.patch	\
+  gnu/packages/patches/procps-make-3.82.patch			\
  gnu/packages/patches/pt-scotch-build-parallelism.patch	\
  gnu/packages/patches/pulseaudio-fix-mult-test.patch		\
  gnu/packages/patches/pulseaudio-longer-test-timeout.patch	\
  gnu/packages/patches/pycairo-wscript.patch			\
  gnu/packages/patches/pybugz-encode-error.patch		\
  gnu/packages/patches/pybugz-stty.patch			\
-  gnu/packages/patches/pygpgme-disable-problematic-tests.patch  \
  gnu/packages/patches/pyqt-configure.patch			\
-  gnu/packages/patches/python-2-deterministic-build-info.patch	\
  gnu/packages/patches/python-2.7-search-paths.patch		\
-  gnu/packages/patches/python-2.7-source-date-epoch.patch	\
-  gnu/packages/patches/python-3-deterministic-build-info.patch	\
  gnu/packages/patches/python-3-search-paths.patch		\
  gnu/packages/patches/python-disable-ssl-test.patch		\
  gnu/packages/patches/python-fix-tests.patch			\
-  gnu/packages/patches/python-ipython-inputhook-ctype.patch	\
-  gnu/packages/patches/python-rarfile-fix-tests.patch		\
  gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch	\
-  gnu/packages/patches/python-configobj-setuptools.patch	\
-  gnu/packages/patches/python-paste-remove-website-test.patch	\
-  gnu/packages/patches/python-paste-remove-timing-test.patch	\
  gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
-  gnu/packages/patches/qemu-CVE-2015-8558.patch			\
-  gnu/packages/patches/qemu-CVE-2015-8567.patch			\
-  gnu/packages/patches/qemu-CVE-2015-8613.patch			\
-  gnu/packages/patches/qemu-CVE-2015-8619.patch			\
-  gnu/packages/patches/qemu-CVE-2015-8701.patch			\
-  gnu/packages/patches/qemu-CVE-2015-8743.patch			\
-  gnu/packages/patches/qemu-CVE-2016-1568.patch			\
-  gnu/packages/patches/qemu-CVE-2016-1922.patch			\
-  gnu/packages/patches/qemu-CVE-2016-1981.patch			\
-  gnu/packages/patches/qemu-CVE-2016-2197.patch			\
-  gnu/packages/patches/qemu-usb-ehci-oob-read.patch		\
-  gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch \
+  gnu/packages/patches/qemu-CVE-2015-6855.patch			\
  gnu/packages/patches/qt4-ldflags.patch			\
  gnu/packages/patches/ratpoison-shell.patch			\
  gnu/packages/patches/readline-link-ncurses.patch		\
  gnu/packages/patches/ripperx-missing-file.patch		\
-  gnu/packages/patches/rsem-makefile.patch			\
  gnu/packages/patches/sed-hurd-path-max.patch			\
  gnu/packages/patches/scheme48-tests.patch			\
  gnu/packages/patches/scotch-test-threading.patch		\
@@ -732,23 +632,14 @@ dist_patch_DATA =						\
  gnu/packages/patches/slim-session.patch			\
  gnu/packages/patches/slim-config.patch			\
  gnu/packages/patches/slim-sigusr1.patch			\
-  gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch \
  gnu/packages/patches/soprano-find-clucene.patch		\
-  gnu/packages/patches/sudo-CVE-2015-5602.patch			\
  gnu/packages/patches/superlu-dist-scotchmetis.patch		\
-  gnu/packages/patches/synfig-build-fix.patch			\
  gnu/packages/patches/tar-d_ino_in_dirent-fix.patch		\
  gnu/packages/patches/tar-skip-unreliable-tests.patch		\
-  gnu/packages/patches/tcl-mkindex-deterministic.patch		\
-  gnu/packages/patches/tclxml-3.2-install.patch			\
  gnu/packages/patches/tcsh-fix-autotest.patch			\
  gnu/packages/patches/texi2html-document-encoding.patch	\
  gnu/packages/patches/texi2html-i18n.patch			\
  gnu/packages/patches/tidy-CVE-2015-5522+5523.patch		\
-  gnu/packages/patches/tinyxml-use-stl.patch			\
-  gnu/packages/patches/tk-find-library.patch			\
-  gnu/packages/patches/tophat-build-with-later-seqan.patch	\
-  gnu/packages/patches/torsocks-dns-test.patch			\
  gnu/packages/patches/tvtime-gcc41.patch			\
  gnu/packages/patches/tvtime-pngoutput.patch			\
  gnu/packages/patches/tvtime-videodev2.patch			\
@@ -757,11 +648,9 @@ dist_patch_DATA =						\
  gnu/packages/patches/unzip-CVE-2014-8140.patch		\
  gnu/packages/patches/unzip-CVE-2014-8141.patch		\
  gnu/packages/patches/unzip-CVE-2014-9636.patch		\
-  gnu/packages/patches/unzip-CVE-2015-7696.patch		\
-  gnu/packages/patches/unzip-CVE-2015-7697.patch		\
  gnu/packages/patches/unzip-allow-greater-hostver-values.patch	\
  gnu/packages/patches/unzip-attribs-overflow.patch		\
-  gnu/packages/patches/unzip-overflow-on-invalid-input.patch	\
+  gnu/packages/patches/unzip-fix-overflows-and-infloop.patch	\
  gnu/packages/patches/unzip-format-secure.patch		\
  gnu/packages/patches/unzip-initialize-symlink-flag.patch	\
  gnu/packages/patches/unzip-overflow-long-fsize.patch		\
@@ -769,25 +658,16 @@ dist_patch_DATA =						\
  gnu/packages/patches/util-linux-tests.patch			\
  gnu/packages/patches/upower-builddir.patch			\
  gnu/packages/patches/valgrind-enable-arm.patch		\
-  gnu/packages/patches/vorbis-tools-CVE-2015-6749.patch		\
  gnu/packages/patches/vpnc-script.patch			\
  gnu/packages/patches/vtk-mesa-10.patch			\
-  gnu/packages/patches/w3m-libgc.patch				\
-  gnu/packages/patches/w3m-force-ssl_verify_server-on.patch	\
-  gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch	\
-  gnu/packages/patches/w3m-disable-weak-ciphers.patch		\
-  gnu/packages/patches/weechat-python.patch			\
+  gnu/packages/patches/w3m-fix-compile.patch			\
+  gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch	\
  gnu/packages/patches/weex-vacopy.patch			\
  gnu/packages/patches/wicd-bitrate-none-fix.patch		\
  gnu/packages/patches/wicd-get-selected-profile-fix.patch	\
  gnu/packages/patches/wicd-template-instantiation.patch	\
  gnu/packages/patches/wicd-urwid-1.3.patch			\
  gnu/packages/patches/wmctrl-64-fix.patch			\
-  gnu/packages/patches/wpa-supplicant-CVE-2015-5310.patch	\
-  gnu/packages/patches/wpa-supplicant-CVE-2015-5314.patch	\
-  gnu/packages/patches/wpa-supplicant-CVE-2015-5315.patch	\
-  gnu/packages/patches/wpa-supplicant-CVE-2015-5316.patch	\
-  gnu/packages/patches/xdotool-fix-makefile.patch               \
  gnu/packages/patches/xf86-video-ark-remove-mibstore.patch	\
  gnu/packages/patches/xf86-video-ast-remove-mibstore.patch	\
  gnu/packages/patches/xf86-video-geode-glibc-2.20.patch	\
@@ -796,11 +676,18 @@ dist_patch_DATA =						\
  gnu/packages/patches/xf86-video-intel-compat-api.patch	\
  gnu/packages/patches/xf86-video-intel-glibc-2.20.patch	\
  gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch	\
+  gnu/packages/patches/xf86-video-mga-glibc-2.20.patch		\
  gnu/packages/patches/xf86-video-nv-remove-mibstore.patch	\
  gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch	\
+  gnu/packages/patches/xf86-video-r128-glibc-2.20.patch		\
+  gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch \
+  gnu/packages/patches/xf86-video-sis-fix-exa-crash.patch	\
+  gnu/packages/patches/xf86-video-sis-update-api.patch		\
+  gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch	\
  gnu/packages/patches/xf86-video-tga-remove-mibstore.patch	\
+  gnu/packages/patches/xf86-video-trident-remove-mibstore.patch	\
+  gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch	\
  gnu/packages/patches/xfce4-panel-plugins.patch		\
-  gnu/packages/patches/xfce4-session-fix-xflock4.patch		\
  gnu/packages/patches/xfce4-settings-defaults.patch		\
  gnu/packages/patches/xmodmap-asprintf.patch 			\
  gnu/packages/patches/zathura-plugindir-environment-variable.patch
@@ -867,18 +754,14 @@ DOWNLOAD_FILE =								\
           "$(top_srcdir)/build-aux/download.scm"

 gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz:
-	$(AM_V_DL)$(MKDIR_P) `dirname "$@"`;	\
-	$(DOWNLOAD_FILE) "$@"			\
-	  "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
+	$(MKDIR_P) `dirname "$@"`
+	$(DOWNLOAD_FILE) "$@" "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
 gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz:
-	$(AM_V_DL)$(MKDIR_P) `dirname "$@"`;	\
-	$(DOWNLOAD_FILE) "$@"			\
-	  "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
+	$(MKDIR_P) `dirname "$@"`
+	$(DOWNLOAD_FILE) "$@" "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
 gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz:
-	$(AM_V_DL)$(MKDIR_P) `dirname "$@"`;	\
-	$(DOWNLOAD_FILE) "$@"			\
-	  "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6"
+	$(MKDIR_P) `dirname "$@"`
+	$(DOWNLOAD_FILE) "$@" "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6"
 gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz:
-	$(AM_V_DL)$(MKDIR_P) `dirname "$@"`;	\
-	$(DOWNLOAD_FILE) "$@" 			\
-	  "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"
+	$(MKDIR_P) `dirname "$@"`
+	$(DOWNLOAD_FILE) "$@" "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"
@@ -34,7 +34,7 @@
      '((gnu system)
        (gnu system file-systems)
        (gnu system grub)                         ; 'grub-configuration'
-        (gnu system pam)
+        (gnu system linux)                        ; 'base-pam-services'
        (gnu system shadow)                       ; 'user-account'
        (gnu system linux-initrd)
        (gnu system nss)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -91,9 +91,7 @@
    (mkdir-p home)
    (for-each (lambda (file)
                (let ((target (string-append home "/" file)))
-                  (copy-recursively (string-append directory "/" file)
-                                    target
-                                    #:log (%make-void-port "w"))
+                  (copy-file (string-append directory "/" file) target)
                  (make-file-writable target)))
              files)))

@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -18,13 +18,11 @@

 (define-module (gnu build file-systems)
  #:use-module (guix build utils)
-  #:use-module (guix build bournish)
  #:use-module (rnrs io ports)
  #:use-module (rnrs bytevectors)
  #:use-module (ice-9 match)
  #:use-module (ice-9 rdelim)
  #:use-module (ice-9 format)
-  #:use-module (ice-9 regex)
  #:use-module (system foreign)
  #:autoload   (system repl repl) (start-repl)
  #:use-module (srfi srfi-1)
@@ -36,9 +34,6 @@
            find-partition-by-uuid
            canonicalize-device-spec

-            uuid->string
-            string->uuid
-
            MS_RDONLY
            MS_NOSUID
            MS_NODEV
@@ -218,11 +213,6 @@ or #f if none was found."
               (disk-partitions))
         (cut string-append "/dev/" <>)))

-
-;;;
-;;; UUIDs.
-;;;
-
 (define-syntax %network-byte-order
  (identifier-syntax (endianness big)))

@@ -238,41 +228,6 @@ like \"6b700d61-5550-48a1-874c-a3d86998990e\"."
    (format #f "~8,'0x-~4,'0x-~4,'0x-~4,'0x-~12,'0x"
            time-low time-mid time-hi clock-seq node)))

-(define %uuid-rx
-  ;; The regexp of a UUID.
-  (make-regexp "^([[:xdigit:]]{8})-([[:xdigit:]]{4})-([[:xdigit:]]{4})-([[:xdigit:]]{4})-([[:xdigit:]]{12})$"))
-
-(define (string->uuid str)
-  "Parse STR as a DCE UUID (see <https://tools.ietf.org/html/rfc4122>) and
-return its contents as a 16-byte bytevector.  Return #f if STR is not a valid
-UUID representation."
-  (and=> (regexp-exec %uuid-rx str)
-         (lambda (match)
-           (letrec-syntax ((hex->number
-                            (syntax-rules ()
-                              ((_ index)
-                               (string->number (match:substring match index)
-                                               16))))
-                           (put!
-                            (syntax-rules ()
-                              ((_ bv index (number len) rest ...)
-                               (begin
-                                 (bytevector-uint-set! bv index number
-                                                       (endianness big) len)
-                                 (put! bv (+ index len) rest ...)))
-                              ((_ bv index)
-                               bv))))
-             (let ((time-low  (hex->number 1))
-                   (time-mid  (hex->number 2))
-                   (time-hi   (hex->number 3))
-                   (clock-seq (hex->number 4))
-                   (node      (hex->number 5))
-                   (uuid      (make-bytevector 16)))
-               (put! uuid 0
-                     (time-low 4) (time-mid 2) (time-hi 2)
-                     (clock-seq 2) (node 6)))))))
-
-
 (define* (canonicalize-device-spec spec #:optional (title 'any))
  "Return the device name corresponding to SPEC.  TITLE is a symbol, one of
 the following:
@@ -296,12 +251,9 @@ the following:
    ;; The realm of canonicalization.
    (if (eq? title 'any)
        (if (string? spec)
-            ;; The "--root=SPEC" kernel command-line option always provides a
-            ;; string, but the string can represent a device, a UUID, or a
-            ;; label.  So check for all three.
-            (cond ((string-prefix? "/" spec) 'device)
-                  ((string->uuid spec) 'uuid)
-                  (else 'label))
+            (if (string-prefix? "/" spec)
+                'device
+                'label)
            'uuid)
        title))

@@ -327,11 +279,7 @@ the following:
     ;; Resolve the label.
     (resolve find-partition-by-label spec identity))
    ((uuid)
-     (resolve find-partition-by-uuid
-              (if (string? spec)
-                  (string->uuid spec)
-                  spec)
-              uuid->string))
+     (resolve find-partition-by-uuid spec uuid->string))
    (else
     (error "unknown device title" title))))

@@ -353,10 +301,9 @@ the following:
       (sleep 3)
       (reboot))
      (code
-       (format (current-error-port) "'~a' exited with code ~a on ~a; \
-spawning Bourne-like REPL~%"
+       (format (current-error-port) "'~a' exited with code ~a on ~a; spawning REPL~%"
               fsck code device)
-       (start-repl %bournish-language)))))
+       (start-repl)))))

 (define (mount-flags->bit-mask flags)
  "Return the number suitable for the 'flags' argument of 'mount' that
@@ -103,7 +103,7 @@ STORE."
    (directory ,store 0 30000 #o1775)

    (directory "/etc")
-    (directory "/var/log")                          ; for shepherd
+    (directory "/var/log")                          ; for dmd
    (directory "/var/guix/gcroots")
    (directory "/var/empty")                        ; for no-login accounts
    (directory "/var/db")                           ; for dhclient, etc.
@@ -159,7 +159,7 @@ as created and modified at the Epoch."
                ;; read-only store.
                (unless (eq? (stat:type s) 'symlink)
                  (utime file 0 0 0 0))))
-            (find-files directory #:directories? #t)))
+            (find-files directory "")))

 (define* (register-closure store closure
                           #:key (deduplicate? #t))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -242,10 +242,10 @@ the last argument of `mknod'."
 is true, mount ROOT read-only and make it a union with a writable tmpfs using
 UNIONFS."
  (define (mark-as-not-killable pid)
-    ;; Tell the 'user-processes' shepherd service that PID must be kept alive
-    ;; when shutting down.
-    (mkdir-p "/root/etc/shepherd")
-    (let ((port (open-file "/root/etc/shepherd/do-not-kill" "a")))
+    ;; Tell the 'user-processes' dmd service that PID must be kept alive when
+    ;; shutting down.
+    (mkdir-p "/root/etc/dmd")
+    (let ((port (open-file "/root/etc/dmd/do-not-kill" "a")))
      (chmod port #o600)
      (write pid port)
      (newline port)
@@ -381,6 +381,7 @@ to it are lost."
         (start-repl))

       (display "loading kernel modules...\n")
+       (current-module-debugging-port (current-output-port))
       (for-each (cut load-linux-module* <>
                      #:lookup-module lookup-module)
                 (map lookup-module linux-modules))
@@ -19,36 +19,16 @@
 (define-module (gnu build linux-container)
  #:use-module (ice-9 format)
  #:use-module (ice-9 match)
-  #:use-module (ice-9 rdelim)
  #:use-module (srfi srfi-98)
  #:use-module (guix utils)
  #:use-module (guix build utils)
  #:use-module (guix build syscalls)
  #:use-module ((gnu build file-systems) #:select (mount-file-system))
-  #:export (user-namespace-supported?
-            unprivileged-user-namespace-supported?
-            setgroups-supported?
-            %namespaces
+  #:export (%namespaces
            run-container
            call-with-container
            container-excursion))

-(define (user-namespace-supported?)
-  "Return #t if user namespaces are supported on this system."
-  (file-exists? "/proc/self/ns/user"))
-
-(define (unprivileged-user-namespace-supported?)
-  "Return #t if user namespaces can be created by unprivileged users."
-  (let ((userns-file "/proc/sys/kernel/unprivileged_userns_clone"))
-    (if (file-exists? userns-file)
-        (eqv? #\1 (call-with-input-file userns-file read-char))
-        #t)))
-
-(define (setgroups-supported?)
-  "Return #t if the setgroups proc file, introduced in Linux-libre 3.19,
-exists."
-  (file-exists? "/proc/self/setgroups"))
-
 (define %namespaces
  '(mnt pid ipc uts user net))

@@ -185,7 +165,7 @@ host user identifiers to map into the user namespace."
  "Return the number suitable for the 'flags' argument of 'clone' that
 corresponds to the symbols in NAMESPACES."
  ;; Use the same flags as fork(3) in addition to the namespace flags.
-  (apply logior SIGCHLD
+  (apply logior SIGCHLD CLONE_CHILD_CLEARTID CLONE_CHILD_SETTID
         (map (match-lambda
               ('mnt  CLONE_NEWNS)
               ('uts  CLONE_NEWUTS)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -96,21 +96,6 @@ contains module names, not actual file names."
      name
      (dot-ko name)))

-(define (normalize-module-name module)
-  "Return the \"canonical\" name for MODULE, replacing hyphens with
-underscores."
-  ;; See 'modname_normalize' in libkmod.
-  (string-map (lambda (chr)
-                (case chr
-                  ((#\-) #\_)
-                  (else chr)))
-              module))
-
-(define (file-name->module-name file)
-  "Return the module name corresponding to FILE, stripping the trailing '.ko'
-and normalizing it."
-  (normalize-module-name (basename file ".ko")))
-
 (define* (recursive-module-dependencies files
                                        #:key (lookup-module dot-ko))
  "Return the topologically-sorted list of file names of the modules depended
@@ -145,24 +130,6 @@ LOOKUP-MODULE to the module name."
      (((modules . _) ...)
       modules))))

-(define (module-black-list)
-  "Return the black list of modules that must not be loaded.  This black list
-is specified using 'modprobe.blacklist=MODULE1,MODULE2,...' on the kernel
-command line; it is honored by libkmod for users that pass
-'KMOD_PROBE_APPLY_BLACKLIST', which includes 'modprobe --use-blacklist' and
-udev."
-  (define parameter
-    "modprobe.blacklist=")
-
-  (let ((command (call-with-input-file "/proc/cmdline"
-                   get-string-all)))
-    (append-map (lambda (arg)
-                  (if (string-prefix? parameter arg)
-                      (string-tokenize (string-drop arg (string-length parameter))
-                                       %not-comma)
-                      '()))
-                (string-tokenize command))))
-
 (define (module-loaded? module)
  "Return #t if MODULE is already loaded.  MODULE must be a Linux module name,
 not a file name."
@@ -171,44 +138,29 @@ not a file name."
 (define* (load-linux-module* file
                             #:key
                             (recursive? #t)
-                             (lookup-module dot-ko)
-                             (black-list (module-black-list)))
-  "Load Linux module from FILE, the name of a '.ko' file; return true on
-success, false otherwise.  When RECURSIVE? is true, load its dependencies
-first (à la 'modprobe'.)  The actual files containing modules depended on are
-obtained by calling LOOKUP-MODULE with the module name.  Modules whose name
-appears in BLACK-LIST are not loaded."
+                             (lookup-module dot-ko))
+  "Load Linux module from FILE, the name of a `.ko' file.  When RECURSIVE? is
+true, load its dependencies first (à la 'modprobe'.)  The actual files
+containing modules depended on are obtained by calling LOOKUP-MODULE with the
+module name."
  (define (slurp module)
-    ;; TODO: Use 'finit_module' to reduce memory usage.
+    ;; TODO: Use 'mmap' to reduce memory usage.
    (call-with-input-file file get-bytevector-all))

-  (define (black-listed? module)
-    (let ((result (member module black-list)))
-      (when result
-        (format (current-module-debugging-port)
-                "not loading module '~a' because it's black-listed~%"
-                module))
-      result))
+  (when recursive?
+    (for-each (cut load-linux-module* <> #:lookup-module lookup-module)
+              (map lookup-module (module-dependencies file))))

-  (define (load-dependencies file)
-    (let ((dependencies (module-dependencies file)))
-      (every (cut load-linux-module* <> #:lookup-module lookup-module)
-             (map lookup-module dependencies))))
+  (format (current-module-debugging-port)
+          "loading Linux module from '~a'...~%" file)

-  (and (not (black-listed? (file-name->module-name file)))
-       (or (not recursive?)
-           (load-dependencies file))
-       (begin
-         (format (current-module-debugging-port)
-                 "loading Linux module from '~a'...~%" file)
-
-         (catch 'system-error
-           (lambda ()
-             (load-linux-module (slurp file)))
-           (lambda args
-             ;; If this module was already loaded and we're in modprobe style, ignore
-             ;; the error.
-             (or (and recursive? (= EEXIST (system-error-errno args)))
-                 (apply throw args)))))))
+  (catch 'system-error
+    (lambda ()
+      (load-linux-module (slurp file)))
+    (lambda args
+      ;; If this module was already loaded and we're in modprobe style, ignore
+      ;; the error.
+      (unless (and recursive? (= EEXIST (system-error-errno args)))
+        (apply throw args)))))

 ;;; linux-modules.scm ends here
@@ -1,7 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
-;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -99,7 +97,7 @@ the #:references-graphs parameter of 'derivation'."
    (_ #f))

  (unless (zero?
-           (apply system* qemu "-nographic" "-no-reboot"
+           (apply system* qemu "-enable-kvm" "-nographic" "-no-reboot"
                  "-m" (number->string memory-size)
                  "-net" "nic,model=virtio"
                  "-virtfs"
@@ -113,17 +111,10 @@ the #:references-graphs parameter of 'derivation'."
                  "-initrd" initrd
                  "-append" (string-append "console=ttyS0 --load="
                                           builder)
-                  (append
-                   (if make-disk-image?
-                       `("-drive" ,(string-append "file=" image-file
-                                                  ",if=virtio"))
-                       '())
-                   ;; Only enable kvm if we see /dev/kvm exists.
-                   ;; This allows users without hardware virtualization to still
-                   ;; use these commands.
-                   (if (file-exists? "/dev/kvm")
-                       '("-enable-kvm")
-                       '()))))
+                  (if make-disk-image?
+                      `("-drive" ,(string-append "file=" image-file
+                                                 ",if=virtio"))
+                      '())))
    (error "qemu failed" qemu))

  (if make-disk-image?
@@ -1,9 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,9 +22,9 @@
  #:use-module (guix packages)
  #:use-module (guix ui)
  #:use-module (guix utils)
-  #:use-module ((guix build utils)
-                #:select ((package-name->name+version
-                           . hyphen-separated-name->name+version)))
+  #:use-module ((guix ftp-client) #:select (ftp-open))
+  #:use-module (guix gnu-maintenance)
+  #:use-module (guix upstream)
  #:use-module (ice-9 ftw)
  #:use-module (ice-9 vlist)
  #:use-module (ice-9 match)
@@ -48,6 +46,12 @@
            find-best-packages-by-name
            find-newest-available-packages

+            package-direct-dependents
+            package-transitive-dependents
+            package-covering-dependents
+
+            check-package-freshness
+
            specification->package
            specification->package+output))

@@ -258,6 +262,63 @@ VERSION."
        ((_ version pkgs ...) pkgs)
        (#f '()))))

+
+(define* (vhash-refq vhash key #:optional (dflt #f))
+  "Look up KEY in the vhash VHASH, and return the value (if any) associated
+with it.  If KEY is not found, return DFLT (or `#f' if no DFLT argument is
+supplied).  Uses `eq?' for equality testing."
+  (or (and=> (vhash-assq key vhash) cdr)
+      dflt))
+
+(define package-dependencies
+  (memoize
+   (lambda ()
+     "Return a vhash keyed by package, and with associated values that are a
+list of packages that depend on that package."
+     (fold-packages
+      (lambda (package dag)
+        (fold
+         (lambda (in d)
+           ;; Insert a graph edge from each of package's inputs to package.
+           (vhash-consq in
+                        (cons package (vhash-refq d in '()))
+                        (vhash-delq in d)))
+         dag
+         (match (package-direct-inputs package)
+           (((labels packages . _) ...)
+            packages) )))
+      vlist-null))))
+
+(define (package-direct-dependents packages)
+  "Return a list of packages from the distribution that directly depend on the
+packages in PACKAGES."
+  (delete-duplicates
+   (concatenate
+    (map (lambda (p)
+           (vhash-refq (package-dependencies) p '()))
+         packages))))
+
+(define (package-transitive-dependents packages)
+  "Return the transitive dependent packages of the distribution packages in
+PACKAGES---i.e. the dependents of those packages, plus their dependents,
+recursively."
+  (let ((dependency-dag (package-dependencies)))
+    (fold-tree
+     cons '()
+     (lambda (node) (vhash-refq dependency-dag node))
+     ;; Start with the dependents to avoid including PACKAGES in the result.
+     (package-direct-dependents packages))))
+
+(define (package-covering-dependents packages)
+  "Return a minimal list of packages from the distribution whose dependencies
+include all of PACKAGES and all packages that depend on PACKAGES."
+  (let ((dependency-dag (package-dependencies)))
+    (fold-tree-leaves
+     cons '()
+     (lambda (node) (vhash-refq dependency-dag node))
+     ;; Start with the dependents to avoid including PACKAGES in the result.
+     (package-direct-dependents packages))))
+

 (define %sigint-prompt
  ;; The prompt to jump to upon SIGINT.
@@ -280,63 +341,119 @@ return its return value."
                    (lambda (k signum)
                      (handler signum))))

-
-;;;
-;;; Package specification.
-;;;
+(define-syntax-rule (waiting exp fmt rest ...)
+  "Display the given message while EXP is being evaluated."
+  (let* ((message (format #f fmt rest ...))
+         (blank   (make-string (string-length message) #\space)))
+    (display message (current-error-port))
+    (force-output (current-error-port))
+    (call-with-sigint-handler
+     (lambda ()
+       (dynamic-wind
+         (const #f)
+         (lambda () exp)
+         (lambda ()
+           ;; Clear the line.
+           (display #\cr (current-error-port))
+           (display blank (current-error-port))
+           (display #\cr (current-error-port))
+           (force-output (current-error-port)))))
+     (lambda (signum)
+       (format (current-error-port) "  interrupted by signal ~a~%" SIGINT)
+       #f))))

-(define* (%find-package spec name version #:key fallback?)
-  (match (find-best-packages-by-name name version)
-    ((pkg . pkg*)
-     (unless (null? pkg*)
-       (warning (_ "ambiguous package specification `~a'~%") spec)
-       (warning (_ "choosing ~a from ~a~%")
-                (package-full-name pkg)
-                (location->string (package-location pkg))))
-     (when fallback?
-       (warning (_ "deprecated NAME-VERSION syntax; \
-use NAME@VERSION instead~%")))
-     pkg)
-    (_
-     (if version
-         (leave (_ "~A: package not found for version ~a~%") name version)
-         (if (not fallback?)
-             ;; XXX: Fallback to the older specification style with an hyphen
-             ;; between NAME and VERSION, for backward compatibility.
-             (call-with-values
-                 (lambda ()
-                   (hyphen-separated-name->name+version name))
-               (cut %find-package spec <> <> #:fallback? #t))
+(define ftp-open*
+  ;; Memoizing version of `ftp-open'.  The goal is to avoid initiating a new
+  ;; FTP connection for each package, esp. since most of them are to the same
+  ;; server.  This has a noticeable impact when doing "guix upgrade -u".
+  (memoize ftp-open))

-             ;; The fallback case didn't find anything either, so bail out.
-             (leave (_ "~A: unknown package~%") name))))))
+(define (check-package-freshness package)
+  "Check whether PACKAGE has a newer version available upstream, and report
+it."
+  ;; TODO: Automatically inject the upstream version when desired.
+
+  (catch #t
+    (lambda ()
+      (when (false-if-exception (gnu-package? package))
+        (let ((name      (package-name package))
+              (full-name (package-full-name package)))
+          ;; XXX: This could work with non-GNU packages as well.  However,
+          ;; GNU's FTP-based updater would be too slow if it weren't memoized,
+          ;; and the generic interface in (guix upstream) doesn't support
+          ;; that.
+          (match (waiting (latest-release name
+                                          #:ftp-open ftp-open*
+                                          #:ftp-close (const #f))
+                          (_ "looking for the latest release of GNU ~a...") name)
+            ((? upstream-source? source)
+             (let ((latest-version
+                    (string-append (upstream-source-package source) "-"
+                                   (upstream-source-version source))))
+              (when (version>? latest-version full-name)
+                (format (current-error-port)
+                        (_ "~a: note: using ~a \
+but ~a is available upstream~%")
+                        (location->string (package-location package))
+                        full-name latest-version))))
+            (_ #t)))))
+    (lambda (key . args)
+      ;; Silently ignore networking errors rather than preventing
+      ;; installation.
+      (case key
+        ((getaddrinfo-error ftp-error) #f)
+        (else (apply throw key args))))))

 (define (specification->package spec)
  "Return a package matching SPEC.  SPEC may be a package name, or a package
-name followed by an at-sign and a version number.  If the version number is not
+name followed by a hyphen and a version number.  If the version number is not
 present, return the preferred newest version."
-  (let-values (((name version) (package-name->name+version spec)))
-    (%find-package spec name version)))
+  (let-values (((name version)
+                (package-name->name+version spec)))
+    (match (find-best-packages-by-name name version)
+      ((p)                                      ; one match
+       p)
+      ((p x ...)                                ; several matches
+       (warning (_ "ambiguous package specification `~a'~%") spec)
+       (warning (_ "choosing ~a from ~a~%")
+                (package-full-name p)
+                (location->string (package-location p)))
+       p)
+      (_                                        ; no matches
+       (if version
+           (leave (_ "~A: package not found for version ~a~%")
+                  name version)
+           (leave (_ "~A: unknown package~%") name))))))

 (define* (specification->package+output spec #:optional (output "out"))
  "Return the package and output specified by SPEC, or #f and #f; SPEC may
 optionally contain a version number and an output name, as in these examples:

  guile
-  guile@2.0.9
+  guile-2.0.9
  guile:debug
-  guile@2.0.9:debug
+  guile-2.0.9:debug

 If SPEC does not specify a version number, return the preferred newest
 version; if SPEC does not specify an output, return OUTPUT."
+  (define (ensure-output p sub-drv)
+    (if (member sub-drv (package-outputs p))
+        sub-drv
+        (leave (_ "package `~a' lacks output `~a'~%")
+               (package-full-name p)
+               sub-drv)))
+
  (let-values (((name version sub-drv)
                (package-specification->name+version+output spec output)))
-    (match (%find-package spec name version)
-      (#f
-       (values #f #f))
-      (package
-       (if (member sub-drv (package-outputs package))
-           (values package sub-drv)
-           (leave (_ "package `~a' lacks output `~a'~%")
-                  (package-full-name package)
-                  sub-drv))))))
+    (match (find-best-packages-by-name name version)
+      ((p)
+       (values p (ensure-output p sub-drv)))
+      ((p p* ...)
+       (warning (_ "ambiguous package specification `~a'~%")
+                spec)
+       (warning (_ "choosing ~a from ~a~%")
+                (package-full-name p)
+                (location->string (package-location p)))
+       (values p (ensure-output p sub-drv)))
+      (()
+       (leave (_ "~a: package not found~%") spec)))))
@@ -0,0 +1,70 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages aarddict)
+  #:use-module ((guix licenses) #:select (gpl3))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system python)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages qt))
+
+(define-public aarddict
+  (package
+    (name "aarddict")
+    (version "0.9.3")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "https://github.com/aarddict/desktop/archive/"
+                          version ".tar.gz"))
+      (file-name (string-append name "-" version ".tar.gz"))
+      (sha256
+       (base32
+        "12h7m0z7nd7rg8avpi9syd265k0rhh4vbdh464nq0jzdg8m9p28c"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python2-pyicu" ,python2-pyicu)
+       ("python2-pyqt-4" ,python2-pyqt-4)
+       ("python2-setuptools" ,python2-setuptools)
+       ("python2-simplejson" ,python2-simplejson)
+       ("python2-sip" ,python2-sip)))
+    (arguments
+     `(#:python ,python-2 ; incompatible with Python 3
+       #:phases
+        (alist-cons-before
+         'build 'configure
+         ;; Force data into the output instead of the python package.
+         (lambda* (#:key outputs #:allow-other-keys)
+           (let ((out (assoc-ref outputs "out")))
+             (substitute* "setup.py"
+               (("sys.prefix") (string-append "'" out "'")))))
+         %standard-phases)))
+    (home-page "http://aarddict.org/index.html")
+    (synopsis
+     "Dictionary program and offline Wikipedia reader")
+    (description
+     "Aard Dictionary is a free, fast, easy to use word lookup program that
+looks up words fast even with huge dictionaries like English Wikipedia;
+looks up words in multiple dictionaries in multiple languages without
+switching;
+works great as offline Wikipedia reader;
+is keyboard navigation friendly;
+has efficient, highly compressed dictionary data storage format with
+ability to verify data integrity built-in.")
+    (license gpl3)))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,15 +25,14 @@
 (define-public abduco
  (package
   (name "abduco")
-   (version "0.5")
+   (version "0.4")
   (source (origin
            (method url-fetch)
            (uri (string-append
                  "http://www.brain-dump.org/projects/abduco/abduco-"
                  version ".tar.gz"))
            (sha256
-             (base32
-              "11phry5wnvwm9ckij5gxbrjfgdz3x38vpnm505q5ldc88im248mz"))))
+             (base32 "1fxwg2s5w183p0rwzsxizy9jdnilv5qqs647l3wl3khny6fp58xx"))))
   (build-system gnu-build-system)
   (arguments
    `(#:make-flags (list "CC=gcc"
@@ -1,15 +1,11 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
-;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
-;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
-;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,7 +34,6 @@
  #:use-module (guix build-system trivial)
  #:use-module (gnu packages)
  #:use-module (gnu packages base)
-  #:use-module (gnu packages cyrus-sasl)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages readline)
  #:use-module (gnu packages linux)
@@ -52,8 +47,6 @@
  #:use-module (gnu packages bison)
  #:use-module (gnu packages flex)
  #:use-module (gnu packages glib)
-  #:use-module (gnu packages openldap)
-  #:use-module (gnu packages mcrypt)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages popt)
  #:use-module (gnu packages texinfo)
@@ -64,42 +57,9 @@
  #:use-module (gnu packages image)
  #:use-module (gnu packages xorg)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages man)
-  #:use-module (gnu packages autotools))
-
-(define-public aide
-  (package
-    (name "aide")
-    (version "0.15.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/aide/aide/"
-                                  version "/aide-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1vsrc0s62kv1i84skm6k6zy868gayjck268qwj38rpspc8c5qgih"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("bison" ,bison)
-       ("flex" ,flex)))
-    (inputs
-     `(("libgcrypt" ,libgcrypt)
-       ("libgpg-error" ,libgpg-error)
-       ("libmhash" ,libmhash)
-       ("zlib" ,zlib)))
-    (synopsis "File and directory integrity checker")
-    (description
-     "AIDE (Advanced Intrusion Detection Environment) is a file and directory
-integrity checker.  It creates a database from the regular expression rules
-that it finds from its configuration files.  Once this database is initialized
-it can be used to verify the integrity of the files.  It has several message
-digest algorithms that are used to check the integrity of files.  All of the
-usual file attributes can be checked for inconsistencies.")
-    (home-page "http://aide.sourceforge.net/")
-    (license license:gpl2+)))
+  #:use-module (gnu packages man))

 (define-public dmd
-  ;; Deprecated.  Kept around "just in case."
  (let ((base-version "0.2")
        (patch-level  "01"))
    (package
@@ -118,8 +78,8 @@ usual file attributes can be checked for inconsistencies.")
                         ;; is used by a bunch of services.
                         (method url-fetch)
                         (uri (string-append
-                               "http://git.savannah.gnu.org/cgit/shepherd.git/"
-                               "patch?id=d1d0ff30b3ed2b86b0a3c9bc048d2a855f8e31e6"))
+                               "http://git.savannah.gnu.org/cgit/dmd.git/patch/"
+                               "?id=d1d0ff30b3ed2b86b0a3c9bc048d2a855f8e31e6"))
                         (sha256
                          (base32
                           "1lqymypixfiyb72d6bn24m06ry2q1ljnnv0qrc89pbb4z9azaa4d"))
@@ -138,31 +98,6 @@ interface and is based on GNU Guile.")
      (license license:gpl3+)
      (home-page "http://www.gnu.org/software/dmd/"))))

-(define-public shepherd
-  (package
-    (name "shepherd")
-    (version "0.3.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "ftp://alpha.gnu.org/gnu/dmd/shepherd-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0f3yi3n4sl9myiay95yhv2a9an338qddfjrbv7da753ip66dkfz6"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags '("--localstatedir=/var")))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("guile" ,guile-2.0)))
-    (synopsis "System service manager")
-    (description
-     "The GNU Shepherd is a daemon-managing daemon, meaning that it supervises
-the execution of system services, replacing similar functionality found in
-typical init systems.  It provides dependency-handling through a convenient
-interface and is based on GNU Guile.")
-    (license license:gpl3+)
-    (home-page "http://www.gnu.org/software/shepherd/")))
-
 (define-public dfc
  (package
   (name "dfc")
@@ -189,14 +124,14 @@ graphs and can export its output to different formats.")
 (define-public htop
  (package
   (name "htop")
-   (version "2.0.1")
+   (version "1.0.3")
   (source (origin
            (method url-fetch)
            (uri (string-append "http://hisham.hm/htop/releases/"
                  version "/htop-" version ".tar.gz"))
            (sha256
             (base32
-              "0rjn9ybqx5sav7z4gn18f1q6k23nmqyb6yydfgghzdznz9nn447l"))))
+              "0a8qbpsifzjwc4f45xfwm48jhm59g6q5hlib4bf7z13mgy95fp05"))))
   (build-system gnu-build-system)
   (inputs
    `(("ncurses" ,ncurses)))
@@ -453,154 +388,111 @@ connection alive.")
    (license license:gpl3+)))

 (define-public isc-dhcp
-  (let* ((bind-major-version "9")
-         (bind-minor-version "9")
-         (bind-patch-version "8")
-         (bind-release-type "-P")
-         (bind-release-version "4")
-         (bind-version (string-append bind-major-version
-                                      "."
-                                      bind-minor-version
-                                      "."
-                                      bind-patch-version
-                                      bind-release-type
-                                      bind-release-version)))
-    (package
-      (name "isc-dhcp")
-      (version "4.3.3-P1")
-      (source (origin
-                (method url-fetch)
-                (uri (string-append "http://ftp.isc.org/isc/dhcp/"
-                                    version "/dhcp-" version ".tar.gz"))
-                (sha256
-                 (base32
-                  "08crcsmg4dm2v533aq3883ik8mf4vvvd6r998r4vrgx1zxnqj7n1"))))
-      (build-system gnu-build-system)
-      (arguments
-       `(#:parallel-build? #f
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'replace-bundled-bind
-             (lambda* (#:key inputs #:allow-other-keys)
-               (delete-file "bind/bind.tar.gz")
-               (copy-file (assoc-ref inputs "bind-source-tarball")
-                          "bind/bind.tar.gz")
-               (chmod "bind/bind.tar.gz" #o644)
-               (substitute* "bind/version.tmp"
-                 (("^MAJORVER=.*")
-                  (format #f "MAJORVER=~a\n" ,bind-major-version))
-                 (("^MINORVER=.*")
-                  (format #f "MINORVER=~a\n" ,bind-minor-version))
-                 (("^PATCHVER=.*")
-                  (format #f "PATCHVER=~a\n" ,bind-patch-version))
-                 (("^RELEASETYPE=.*")
-                  (format #f "RELEASETYPE=~a\n" ,bind-release-type))
-                 (("^RELEASEVER=.*")
-                  (format #f "RELEASEVER=~a\n" ,bind-release-version)))
-               #t))
-           (add-after 'configure 'post-configure
-             (lambda* (#:key outputs #:allow-other-keys)
-               ;; Point to the right client script, which will be
-               ;; installed in a later phase.
-               (substitute* "includes/dhcpd.h"
-                 (("#define[[:blank:]]+_PATH_DHCLIENT_SCRIPT.*")
-                  (let ((out (assoc-ref outputs "out")))
-                    (string-append "#define _PATH_DHCLIENT_SCRIPT \""
-                                   out "/libexec/dhclient-script"
-                                   "\"\n"))))
+  (package
+    (name "isc-dhcp")
+    (version "4.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://ftp.isc.org/isc/dhcp/"
+                                  version "/dhcp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1w4s7sni1m9223ya8m2a64lr62845c6xlraprjf8zfx6lylbqv16"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-cons-after
+                 'configure 'post-configure
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   ;; Point to the right client script, which will be
+                   ;; installed in a later phase.
+                   (substitute* "includes/dhcpd.h"
+                     (("#define[[:blank:]]+_PATH_DHCLIENT_SCRIPT.*")
+                      (let ((out (assoc-ref outputs "out")))
+                        (string-append "#define _PATH_DHCLIENT_SCRIPT \""
+                                       out "/libexec/dhclient-script"
+                                       "\"\n"))))

-               ;; During the 'build' phase, 'bind.tar.gz' is extracted, so
-               ;; we must patch shebangs in there and make sure the right
-               ;; shell is used.
-               (with-directory-excursion "bind"
-                 (substitute* "Makefile"
-                   (("\\./configure")
-                    (let ((sh (which "sh")))
-                      (string-append "./configure CONFIG_SHELL="
-                                     sh " SHELL=" sh))))
+                   ;; During the 'build' phase, 'bind.tar.gz' is extracted, so
+                   ;; we must patch shebangs in there and make sure the right
+                   ;; shell is used.
+                   (with-directory-excursion "bind"
+                     (substitute* "Makefile"
+                       (("\\./configure")
+                        (let ((sh (which "sh")))
+                          (string-append "./configure CONFIG_SHELL="
+                                         sh " SHELL=" sh))))

-                 (let ((bind-directory (string-append "bind-" ,bind-version)))
-                   (system* "tar" "xf" "bind.tar.gz")
-                   (for-each patch-shebang
-                             (find-files bind-directory ".*"))
-                   (zero? (system* "tar" "cf" "bind.tar.gz"
-                                   bind-directory
-                                   ;; avoid non-determinism in the archive
-                                   "--sort=name"
-                                   "--mtime=@0"
-                                   "--owner=root:0"
-                                   "--group=root:0"))))))
-           (add-after 'install 'post-install
-             (lambda* (#:key inputs outputs #:allow-other-keys)
-               ;; Install the dhclient script for GNU/Linux and make sure
-               ;; if finds all the programs it needs.
-               (let* ((out       (assoc-ref outputs "out"))
-                      (libexec   (string-append out "/libexec"))
-                      (coreutils (assoc-ref inputs "coreutils"))
-                      (inetutils (assoc-ref inputs "inetutils"))
-                      (net-tools (assoc-ref inputs "net-tools"))
-                      (sed       (assoc-ref inputs "sed")))
-                 (substitute* "client/scripts/linux"
-                   (("/sbin/ip")
-                    (string-append (assoc-ref inputs "iproute")
-                                   "/sbin/ip")))
+                     (system* "tar" "xf" "bind.tar.gz")
+                     (for-each patch-shebang
+                               (find-files "bind-9.9.5-P1" ".*"))
+                     (zero? (system* "tar" "cf" "bind.tar.gz"
+                                     "bind-9.9.5-P1"
+                                     ;; avoid non-determinism in the archive
+                                     "--sort=name"
+                                     "--mtime=@0"
+                                     "--owner=root:0"
+                                     "--group=root:0"))))
+                 (alist-cons-after
+                  'install 'post-install
+                  (lambda* (#:key inputs outputs #:allow-other-keys)
+                    ;; Install the dhclient script for GNU/Linux and make sure
+                    ;; if finds all the programs it needs.
+                    (let* ((out       (assoc-ref outputs "out"))
+                           (libexec   (string-append out "/libexec"))
+                           (coreutils (assoc-ref inputs "coreutils"))
+                           (inetutils (assoc-ref inputs "inetutils"))
+                           (net-tools (assoc-ref inputs "net-tools"))
+                           (sed       (assoc-ref inputs "sed")))
+                      (substitute* "client/scripts/linux"
+                        (("/sbin/ip")
+                         (string-append (assoc-ref inputs "iproute")
+                                        "/sbin/ip")))

-                 (mkdir-p libexec)
-                 (copy-file "client/scripts/linux"
-                            (string-append libexec "/dhclient-script"))
+                      (mkdir-p libexec)
+                      (copy-file "client/scripts/linux"
+                                 (string-append libexec "/dhclient-script"))

-                 (wrap-program
-                     (string-append libexec "/dhclient-script")
-                   `("PATH" ":" prefix
-                     ,(map (lambda (dir)
-                             (string-append dir "/bin:"
-                                            dir "/sbin"))
-                           (list inetutils net-tools coreutils sed))))))))))
+                      (wrap-program
+                          (string-append libexec "/dhclient-script")
+                        `("PATH" ":" prefix
+                          ,(map (lambda (dir)
+                                  (string-append dir "/bin:"
+                                                 dir "/sbin"))
+                                (list inetutils net-tools coreutils sed))))))
+                  %standard-phases))))

-      (native-inputs `(("perl" ,perl)))
+    (native-inputs `(("perl" ,perl)))

-      (inputs `(("inetutils" ,inetutils)
-                ("net-tools" ,net-tools)
-                ("iproute" ,iproute)
+    (inputs `(("inetutils" ,inetutils)
+              ("net-tools" ,net-tools)
+              ("iproute" ,iproute)

-                ;; XXX isc-dhcp bundles a copy of bind that has security
-                ;; flaws, so we use a newer version.
-                ("bind-source-tarball"
-                 ,(origin
-                    (method url-fetch)
-                    (uri (string-append "http://ftp.isc.org/isc/bind9/"
-                                        bind-version
-                                        "/bind-" bind-version ".tar.gz"))
-                    (sha256
-                     (base32
-                      "1wl9kl0630dc1qjrf7fnp8cscagfm5qgmisi0zhr1p6iwi9bil2y"))))
+              ;; When cross-compiling, we need the cross Coreutils and sed.
+              ;; Otherwise just use those from %FINAL-INPUTS.
+              ,@(if (%current-target-system)
+                    `(("coreutils" ,coreutils)
+                      ("sed" ,sed))
+                    '())))

-                ;; When cross-compiling, we need the cross Coreutils and sed.
-                ;; Otherwise just use those from %FINAL-INPUTS.
-                ,@(if (%current-target-system)
-                      `(("coreutils" ,coreutils)
-                        ("sed" ,sed))
-                      '())))
-
-      (home-page "http://www.isc.org/products/DHCP/")
-      (synopsis "Dynamic Host Configuration Protocol (DHCP) tools")
-      (description
-       "ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a
+    (home-page "http://www.isc.org/products/DHCP/")
+    (synopsis "Dynamic Host Configuration Protocol (DHCP) tools")
+    (description
+     "ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a
 reference implementation of all aspects of DHCP, through a suite of DHCP
 tools: server, client, and relay agent.")
-      (license license:isc))))
+    (license license:isc)))

 (define-public libpcap
  (package
    (name "libpcap")
-    (version "1.7.4")
+    (version "1.5.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "http://www.tcpdump.org/release/libpcap-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "1c28ykkizd7jqgzrfkg7ivqjlqs9p6lygp26bsw2i0z8hwhi3lvs"))))
+                "14wyjywrdi1ikaj6yc9c72m6m2r64z94lb0gm7k1a3q6q5cj3scs"))))
    (build-system gnu-build-system)
    (native-inputs `(("bison" ,bison) ("flex" ,flex)))
    (arguments '(#:configure-flags '("--with-pcap=linux")
@@ -618,14 +510,14 @@ network statistics collection, security monitoring, network debugging, etc.")
 (define-public tcpdump
  (package
    (name "tcpdump")
-    (version "4.7.4")
+    (version "4.5.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "http://www.tcpdump.org/release/tcpdump-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "1byr8w6grk08fsq0444jmcz9ar89lq9nf4mjq2cny0w9k8k21rbb"))))
+                "15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql"))))
    (build-system gnu-build-system)
    (inputs `(("libpcap" ,libpcap)
              ("openssl" ,openssl)))
@@ -755,7 +647,7 @@ system administrator.")
 (define-public sudo
  (package
    (name "sudo")
-    (version "1.8.15")
+    (version "1.8.10p3")
    (source (origin
              (method url-fetch)
              (uri
@@ -765,36 +657,22 @@ system administrator.")
                                    version ".tar.gz")))
              (sha256
               (base32
-                "0263gi6i19fyzzc488n0qw3m518i39f6a7qmrfvahk9j10bkh5j3"))
-              (patches (list (search-patch "sudo-CVE-2015-5602.patch")))))
+                "002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"))))
    (build-system gnu-build-system)
    (arguments
-     `(#:configure-flags
-       (list "--with-logpath=/var/log/sudo.log"
-             "--with-rundir=/var/run/sudo"    ;must be cleaned up at boot time
-             "--with-vardir=/var/db/sudo"
-             "--with-iologdir=/var/log/sudo-io"
-
-             ;; 'visudo.c' expects _PATH_MV to be defined, but glibc doesn't
-             ;; provide it.
-             (string-append "CPPFLAGS=-D_PATH_MV='\""
-                            (assoc-ref %build-inputs "coreutils")
-                            "/bin/mv\"'"))
-
-       ;; Avoid non-determinism; see <http://bugs.gnu.org/21918>.
-       #:parallel-build? #f
-
+     `(#:configure-flags '("--with-logpath=/var/log/sudo.log"
+                           "--with-rundir=/run/sudo"
+                           "--with-vardir=/var/db/sudo"
+                           "--with-iologdir=/var/log/sudo-io")
       #:phases (alist-cons-before
                 'configure 'pre-configure
                 (lambda _
-                   (substitute* "src/sudo_usage.h.in"
-                     ;; Do not capture 'configure' arguments since we would
-                     ;; unduly retain references, and also because the
-                     ;; CPPFLAGS above would close the string literal
-                     ;; prematurely.
-                     (("@CONFIGURE_ARGS@") "\"\""))
+                   (substitute* "configure"
+                     ;; Refer to the right executables.
+                     (("/usr/bin/mv") (which "mv"))
+                     (("/usr/bin/sh") (which "sh")))
                   (substitute* (find-files "." "Makefile\\.in")
-                     (("-o [[:graph:]]+ -g [[:graph:]]+")
+                     (("-O [[:graph:]]+ -G [[:graph:]]+")
                      ;; Allow installation as non-root.
                      "")
                     (("^install: (.*)install-sudoers(.*)" _ before after)
@@ -838,12 +716,7 @@ commands and their arguments.")
                    ".tar.gz"))
              (sha256
               (base32
-                "05mkp5bx1c3z7h5biddsv0p49gkrq9ksany3anp4wdiv92p5prfc"))
-              (patches
-               (map search-patch '("wpa-supplicant-CVE-2015-5310.patch"
-                                   "wpa-supplicant-CVE-2015-5314.patch"
-                                   "wpa-supplicant-CVE-2015-5315.patch"
-                                   "wpa-supplicant-CVE-2015-5316.patch")))))
+                "05mkp5bx1c3z7h5biddsv0p49gkrq9ksany3anp4wdiv92p5prfc"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases (alist-replace
@@ -1342,190 +1215,3 @@ handles configuration-management, application deployment, cloud provisioning,
 ad-hoc task-execution, and multinode orchestration - including trivializing
 things like zero downtime rolling updates with load balancers.")
    (license license:gpl3+)))
-
-(define-public cpulimit
-  (package
-    (name "cpulimit")
-    (version "0.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/opsengine/cpulimit/archive/v"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1nn2w849xd5bw4y5sqnll29nxdwl5h0cv4smc7dwmpb9qnd2ycb4"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (delete 'configure)
-                  (replace
-                   'build
-                   (lambda _
-                     (zero? (system* "make" "CC=gcc" "-Csrc"))))
-                  (replace
-                   'check
-                   (lambda _
-                     (zero? (system* "make" "CC=gcc" "-Ctests"))))
-                  (replace
-                   'install
-                   (lambda* (#:key outputs #:allow-other-keys)
-                     (let* ((out (assoc-ref outputs "out"))
-                            (bin (string-append out "/bin")))
-                       (install-file "src/cpulimit" bin)))))))
-    (home-page "https://github.com/opsengine/cpulimit")
-    (synopsis "Limit CPU usage")
-    (description
-     "Cpulimit limits the CPU usage of a process.  It does not change the nice
-value or other scheduling priority settings, but the real CPU usage, and is
-able to adapt itself dynamically to the overall system load.  Children
-processes and threads of the specified process may optionally share the same
-limits.")
-    (license license:gpl2+)))
-
-(define-public autojump
-  (package
-    (name "autojump")
-    (version "22.2.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/wting/autojump/archive/"
-                           "release-v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0xglj7nb8xczaqy2dhn78drqdwqj64rqpymxhqmmwwqzfaqassw1"))))
-    (build-system gnu-build-system)
-    (native-inputs                      ;for tests
-     `(("python-mock" ,python-mock)
-       ("python-pytest" ,python-pytest)))
-    (inputs
-     `(("python" ,python-wrapper)))
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (delete 'configure)
-                  (delete 'build)
-                  (replace 'check
-                    (lambda _
-                      (zero?
-                       (system* "python" "tests/autojump_utils_test.py"))))
-                  (replace 'install
-                    ;; The install.py script doesn't allow system installation
-                    ;; into an arbitrary prefix, so do our own install.
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let* ((out (assoc-ref outputs "out"))
-                             (bin (string-append out "/bin"))
-                             (share (string-append out "/share/autojump"))
-                             (py (string-append out "/lib/python"
-                                                ,(version-major+minor
-                                                  (package-version python-wrapper))
-                                                "/site-packages"))
-                             (man (string-append out "/share/man/man1")))
-                        (install-file "bin/autojump" bin)
-                        (for-each (λ (f) (install-file f py))
-                                  (find-files "bin" "\\.py$"))
-                        (for-each (λ (f) (install-file f share))
-                                  (find-files "bin" "autojump\\..*$"))
-                        (substitute* (string-append share "/autojump.sh")
-                          (("/usr/local") out))
-                        (install-file "docs/autojump.1" man)
-                        (wrap-program (string-append bin "/autojump")
-                          `("PYTHONPATH" ":" prefix (,py)))
-                        #t))))))
-    (home-page "https://github.com/wting/autojump")
-    (synopsis "Shell extension for filesystem navigation")
-    (description
-     "Autojump provides a faster way to navigate your filesystem, with a \"cd
-command that learns\".  It works by maintaining a database of the directories
-you use the most from the command line and allows you to \"jump\" to
-frequently used directories by typing only a small pattern.")
-    (license license:gpl3+)))
-
-(define-public iftop
-  (package
-    (name "iftop")
-    (version "1.0pre4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://www.ex-parrot.com/~pdw/iftop/download"
-                                  "/iftop-" version ".tar.gz"))
-              (sha256
-               (base32
-                "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp"))))
-    (build-system gnu-build-system)
-    (inputs
-      `(("libpcap" ,libpcap)
-        ("ncurses" ,ncurses)))
-    (synopsis "Monitor network usage")
-    (description "Iftop does for network usage what @command{top} does
-for CPU usage.  It listens to network traffic on a named interface and
-displays a table of current bandwidth usage by pairs of hosts.")
-    (home-page "http://www.ex-parrot.com/~pdw/iftop/")
-    (license license:gpl2+)))
-
-(define-public munge
-  (package
-    (name "munge")
-    (version "0.5.11")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/dun/munge/archive/munge-"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0njplyalwwqh7xr7xc7klc6x06mq0ak8w2pxh85w8n4hxkmqqnf5"))))
-    (inputs
-     `(("openssl" ,openssl)
-       ("libgcrypt" ,libgcrypt)))
-    (build-system gnu-build-system)
-    (home-page "http://dun.github.io/munge/")
-    (synopsis "Cluster computing authentication service")
-    (description
-     "Munge is an authentication service for creating and validating
-credentials.  It allows a process to authenticate the UID and GID of another
-local or remote process within a group of hosts having common users and
-groups.  These hosts form a security realm that is defined by a shared
-cryptographic key.  Clients within this security realm can create and validate
-credentials without the use of root privileges, reserved ports, or
-platform-specific methods.")
-    (license license:gpl3+)))
-
-(define-public audit
-  (package
-    (name "audit")
-    (version "2.4.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://people.redhat.com/sgrubb/audit/"
-                                  "audit-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1q1q51dvxscbi4kbakmd4bn0xrvwwaiwvaya79925cbrqwzxsg77"))))
-    (build-system gnu-build-system)
-    (home-page "http://people.redhat.com/sgrubb/audit/")
-    (arguments
-     `(#:configure-flags (list "--with-python=no")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-tests
-           (lambda _
-             ;; In the build environmnte /etc/passwd does not contain an entry
-             ;; for root/0, so we have to patch the expected value.
-             (substitute* "auparse/test/auparse_test.ref"
-               (("=0 \\(root\\)") "=0 (unknown(0))"))
-             #t)))))
-    (inputs
-     `(("openldap" ,openldap)
-       ("openssl" ,openssl)
-       ("sasl" ,cyrus-sasl)))
-    (synopsis "User-space component to the Linux auditing system")
-    (description
-     "auditd is the user-space component to the Linux auditing system, which
-allows logging of system calls made by user-land processes.  It's responsible
-for writing audit records to the disk.  Viewing the logs is done with the
-@code{ausearch} or @code{aureport} utilities.  Configuring the audit rules is
-done with the @code{auditctl} utility.")
-    (license license:gpl2+)))
@@ -1,6 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,8 +20,7 @@
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages pkg-config))
+  #:use-module (guix build-system gnu))

 (define-public adns
  (package
@@ -55,28 +53,3 @@ functionality.  The library is asynchronous, allowing several concurrent
 calls.  The package also includes several command-line utilities for use in
 scripts.")
    (license gpl3+)))
-
-(define-public c-ares
-  (package
-    (name "c-ares")
-    (version "1.11.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://c-ares.haxx.se/download/" name "-" version
-                    ".tar.gz"))
-              (sha256
-               (base32
-                "1z9y1f835dpi1ka2a2vzjygm3djdvr01036ml4l2js6r2xk2wqdk"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (home-page "http://c-ares.haxx.se/")
-    (synopsis "C library for asynchronous DNS requests")
-    (description
-      "C-ares is a C library that performs DNS requests and name resolution
-asynchronously.  It is intended for applications which need to perform DNS
-queries without blocking, or need to perform multiple DNS queries in parallel.
-The primary examples of such applications are servers which communicate with
-multiple clients and programs with graphical user interfaces.")
-    (license (x11-style "http://c-ares.haxx.se/license.html"))))
@@ -1,6 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 John Darringon <jmd@gnu.org>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,10 +33,9 @@
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/barcode/barcode-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8"))))
+                          version ".tar.xz"))
+              (sha256 (base32
+                       "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8"))))
    (build-system gnu-build-system)
    (synopsis "Convert text strings to printed bars in various standards")
    (description "GNU Barcode is a flexible tool to produce printed barcodes
@@ -50,15 +48,14 @@ formats.")
 (define-public qrencode
  (package
    (name "qrencode")
-    (version "3.4.4")
+    (version "3.4.3")
    (source (origin
              (method url-fetch)
              (uri (string-append
-                    "https://fukuchi.org/works/qrencode/qrencode-" version
-                    ".tar.gz"))
-              (sha256
-               (base32
-                "0wiagx7i8p9zal53smf5abrnh9lr31mv0p36wg017401jrmf5577"))))
+                    "http://fukuchi.org/works/qrencode/qrencode-" version
+                    ".tar.bz2")) 
+              (sha256 (base32
+                       "163sb580p570p27imc6jhkfdw15kzp8vy1jq92nip1rwa63i9myz"))))
    (build-system gnu-build-system)
    (inputs `(("libpng" ,libpng)))
    (native-inputs `(("pkg-config" ,pkg-config)))
@@ -68,4 +65,4 @@ symbol, a kind of 2D symbology that can be scanned by handy terminals such as
 a mobile phone with CCD.  The capacity of QR Code is up to 7000 digits or 4000
 characters, and is highly robust.")
    (license license:lgpl2.1+)
-    (home-page "https://fukuchi.org/works/qrencode")))
+    (home-page "http://fukuchi.org/works/qrencode")))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2012, 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
@@ -26,8 +26,6 @@
  #:use-module (gnu packages perl)
  #:use-module (gnu packages readline)
  #:use-module (gnu packages flex)
-  #:use-module (gnu packages texlive)
-  #:use-module (gnu packages xorg)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix download)
@@ -67,7 +65,7 @@ multiplication routines such as Toom–Cook and the FFT.")
 (define-public cm
  (package
   (name "cm")
-   (version "0.3")
+   (version "0.2.1")
   (source (origin
            (method url-fetch)
            (uri (string-append
@@ -75,7 +73,7 @@ multiplication routines such as Toom–Cook and the FFT.")
                  version ".tar.gz"))
            (sha256
             (base32
-              "1nf5kr0nqmhbzrsrinky18z0ighjpsmb5cr8zyg8jf04bfbyrfmc"))))
+              "1r5dx5qy0ka2sq26n9jll9iy4sjqg0jp5r3jnbjhpgxvmj8jbhq8"))))
   (build-system gnu-build-system)
   (propagated-inputs
     `(("mpfrcx" ,mpfrcx)
@@ -89,7 +87,7 @@ imaginary quadratic number fields and of elliptic curves with complex
 multiplication via floating point approximations.  It consists of libraries
 that can be called from within a C program and of executable command
 line applications.")
-   (license license:gpl3+)
+   (license license:gpl2+)
   (home-page "http://cm.multiprecision.org/")))

 (define-public fplll
@@ -116,7 +114,7 @@ solve the shortest vector problem.")
 (define-public pari-gp
  (package
   (name "pari-gp")
-   (version "2.7.5")
+   (version "2.7.4")
   (source (origin
            (method url-fetch)
            (uri (string-append
@@ -124,23 +122,24 @@ solve the shortest vector problem.")
                  version ".tar.gz"))
            (sha256
              (base32
-                "0c8l83a0gjq73r9hndsrzkypwxvnnm4pxkkzbg6jm95m80nzwh11"))))
+                "0k1qqagfl6zn7gvwmsqffj6g9yrzqvszwh2mblhmxpjlw1pigfh8"))))
   (build-system gnu-build-system)
-   (native-inputs `(("texlive" ,texlive-minimal)))
   (inputs `(("gmp" ,gmp)
-             ("libx11" ,libx11)
             ("perl" ,perl)
             ("readline" ,readline)))
   (arguments
-    '(#:make-flags '("all")
+    '(#:make-flags '("gp")
+      ;; FIXME: building the documentation requires tex; once this is
+      ;; available, replace "gp" by "all"
      #:test-target "dobench"
-      #:phases (modify-phases %standard-phases
-                 (replace 'configure
-                          (lambda* (#:key outputs #:allow-other-keys)
-                           (let ((out (assoc-ref outputs "out")))
-                            (zero?
-                             (system* "./Configure"
-                                      (string-append "--prefix=" out)))))))))
+      #:phases
+      (alist-replace
+       'configure
+       (lambda* (#:key outputs #:allow-other-keys)
+         (let ((out (assoc-ref outputs "out")))
+           (zero?
+            (system* "./Configure" (string-append "--prefix=" out)))))
+       %standard-phases)))
   (synopsis "PARI/GP, a computer algebra system for number theory")
   (description
    "PARI/GP is a widely used computer algebra system designed for fast
@@ -156,7 +155,7 @@ PARI is also available as a C library to allow for faster computations.")
 (define-public gp2c
  (package
   (name "gp2c")
-   (version "0.0.9pl5")
+   (version "0.0.9pl3")
   (source (origin
            (method url-fetch)
            (uri (string-append
@@ -164,7 +163,7 @@ PARI is also available as a C library to allow for faster computations.")
                  version ".tar.gz"))
            (sha256
              (base32
-                "1q003mkagc5ib6lqb2xfay7j4ffkwv7xlnznp6wdrq2sbqq4vyak"))))
+                "0wbghihwlcx3w4j1la3bjf5gcrkk6lp9syw6iimqndq1f73ijlq3"))))
   (build-system gnu-build-system)
   (native-inputs `(("perl" ,perl)))
   (inputs `(("pari-gp" ,pari-gp)))
@@ -237,7 +236,7 @@ fast arithmetic.")
 (define-public arb
  (package
   (name "arb")
-   (version "2.8.1")
+   (version "2.7.0")
   (source (origin
            (method url-fetch)
            (uri (string-append
@@ -246,8 +245,7 @@ fast arithmetic.")
            (file-name (string-append name "-" version ".tar.gz"))
            (sha256
              (base32
-                "04hhcpshfkcq9fr4hixbhpps50yf9drk62xgkvlcaj5kb4nyrx7l"))
-            (patches (map search-patch '("arb-ldconfig.patch")))))
+                "1rwkffs57v8mry63rq8l2dyw69zfs9rg5fpbfllqp3nkjnkp1fly"))))
   (build-system gnu-build-system)
   (propagated-inputs
    `(("flint" ,flint))) ; flint.h is included by arf.h
@@ -383,15 +381,14 @@ cosine/ sine transforms or DCT/DST).")
 (define-public eigen
  (package
    (name "eigen")
-    (version "3.2.7")
+    (version "3.2.6")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://bitbucket.org/eigen/eigen/get/"
                                  version ".tar.bz2"))
              (sha256
               (base32
-                "0gigbjjdlw2q0gvcnyiwc6in314a647rkidk6977bwiwn88im3p5"))
-              (file-name (string-append name "-" version ".tar.bz2"))
+                "0gil5ksmgcg6v3nw0v613mvpzz4n33xhawqs8l7fj7rnlpwm4cwa"))
              (modules '((guix build utils)))
              (snippet
               ;; There are 3 test failures in the "unsupported" directory,
@@ -399,28 +396,29 @@ cosine/ sine transforms or DCT/DST).")
               ;; anyway, so just skip them.
               '(substitute* "CMakeLists.txt"
                  (("add_subdirectory\\(unsupported\\)")
-                   "# Do not build the tests for unsupported features.\n")
-                  ;; Work around
-                  ;; <http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1114>.
-                  (("\"include/eigen3\"")
-                   "\"${CMAKE_INSTALL_PREFIX}/include/eigen3\"")))))
+                   "# Do not build the tests for unsupported features.\n")))))
    (build-system cmake-build-system)
    (arguments
     '(;; Turn off debugging symbols to save space.
       #:build-type "Release"

-       #:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda _
-                      (let* ((cores  (parallel-job-count))
-                             (dash-j (format #f "-j~a" cores)))
-                        ;; First build the tests, in parallel.  See
-                        ;; <http://eigen.tuxfamily.org/index.php?title=Tests>.
-                        (and (zero? (system* "make" "buildtests" dash-j))
+       ;; Use 'make check', as per
+       ;; <http://eigen.tuxfamily.org/index.php?title=Tests>.
+       #:test-target "check"

-                             ;; Then run 'CTest' with -V so we get more
-                             ;; details upon failure.
-                             (zero? (system* "ctest" "-V" dash-j)))))))))
+       #:phases (alist-cons-before
+                 'check 'build-tests
+                 (lambda _
+                   ;; First build the tests, in parallel.
+                   ;; See <http://eigen.tuxfamily.org/index.php?title=Tests>.
+                   (let* ((cores  (parallel-job-count))
+                          (dash-j (format #f "-j~a" cores)))
+                     ;; These variables are supposed to be honored.
+                     (setenv "EIGEN_MAKE_ARGS" dash-j)
+                     (setenv "EIGEN_CTEST_ARGS" dash-j)
+
+                     (zero? (system* "make" "buildtests" dash-j))))
+                 %standard-phases)))
    (home-page "http://eigen.tuxfamily.org")
    (synopsis "C++ template library for linear algebra")
    (description
@@ -1,178 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages animation)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix utils)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages boost)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages fontutils)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages graphics)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages imagemagick)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages video))
-
-(define-public etl
-  (package
-    (name "etl")
-    (version "0.04.19")
-    (source (origin
-              (method url-fetch)
-              ;; Keep this synchronized with the synfig release version.
-              (uri (string-append "mirror://sourceforge/synfig/releases/"
-                                  "1.0.2/source/ETL-" version ".tar.gz"))
-              (sha256
-               (base32
-                "070c70slizrklq1gbgja8m49xfmq65wlcd6hz6418cpx0wd4r55s"))))
-    (build-system gnu-build-system)
-    (home-page "http://www.synfig.org")
-    (synopsis "Extended C++ template library")
-    (description
-     "ETL is a class and template library designed to add new datatypes and
-functions which combine well with the existing types and functions from the
-C++ @dfn{Standard Template Library} (STL).")
-    (license license:gpl3+)))
-
-(define-public synfig
-  (package
-    (name "synfig")
-    (version "1.0.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/synfig/releases/"
-                                  version "/source/synfig-" version
-                                  ".tar.gz"))
-              (sha256
-               (base32
-                "1d3z2r78j3rkff47q3wl0ami69y3l4nyi5r9zclymb8ar7mgkk9l"))
-              (patches (list (search-patch "synfig-build-fix.patch")))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:configure-flags
-       ;; The Boost library path is taken from the value of BOOST_LDFLAGS.
-       (list (string-append "BOOST_LDFLAGS=-L"
-                            (assoc-ref %build-inputs "boost")
-                            "/lib"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'adapt-to-libxml++-changes
-          (lambda _
-            (substitute* "configure"
-              (("libxml\\+\\+-2\\.6") "libxml++-3.0"))
-            (substitute* (append (find-files "src/modules/" "\\.cpp$")
-                                 (find-files "src/synfig/" "\\.(cpp|h)$"))
-              (("add_child\\(") "add_child_element(")
-              (("get_child_text\\(") "get_first_child_text(")
-              (("set_child_text\\(") "set_first_child_text(")
-              (("remove_child\\(") "remove_node("))
-            (substitute* "src/modules/mod_svg/svg_parser.cpp"
-              (("xmlpp::Node::NodeList") "xmlpp::Node::const_NodeList"))
-            #t))
-         (add-before 'configure 'set-flags
-          (lambda _
-            ;; Compile with C++11, required by libsigc++.
-            (setenv "CXXFLAGS" "-D__STDC_CONSTANT_MACROS -std=gnu++11")
-            #t)))))
-    (inputs
-     `(("boost" ,boost)
-       ("ffmpeg" ,ffmpeg)
-       ("libdv" ,libdv)
-       ("libjpeg" ,libjpeg)
-       ("libpng" ,libpng)
-       ("libmng" ,libmng)
-       ("zlib" ,zlib)))
-    ;; synfig.pc lists the following as required: Magick++ freetype2
-    ;; fontconfig OpenEXR ETL glibmm-2.4 giomm-2.4 libxml++-3.0 sigc++-2.0
-    ;; cairo pango pangocairo mlt++
-    (propagated-inputs
-     `(("cairo" ,cairo)
-       ("etl" ,etl)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("glibmm" ,glibmm)
-       ("imagemagick" ,imagemagick)
-       ("libxml++" ,libxml++)
-       ("libsigc++" ,libsigc++)
-       ("mlt" ,mlt)
-       ("openexr" ,openexr)
-       ("pango" ,pango)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (home-page "http://www.synfig.org")
-    (synopsis "Vector-based 2D animation renderer")
-    (description
-     "Synfig is a vector-based 2D animation package.  It is designed to be
-capable of producing feature-film quality animation.  It eliminates the need
-for tweening, preventing the need to hand-draw each frame.")
-    (license license:gpl3+)))
-
-(define-public synfigstudio
-  (package
-    (name "synfigstudio")
-    (version "1.0.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/synfig/releases/"
-                                  version "/source/synfigstudio-" version
-                                  ".tar.gz"))
-              (sha256
-               (base32
-                "1xa74dlgkpjn0gzdcs0x25z7wg0806v2wygvvi73f7sn1fm88ig4"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  (substitute* "src/synfigapp/pluginmanager.cpp"
-                    (("xmlpp::Node\\* n =")    "const xmlpp::Node* n =")
-                    (("xmlpp::Node::NodeList") "xmlpp::Node::const_NodeList"))
-                  ;; Some files are ISO-8859-1 encoded.
-                  (with-fluids ((%default-port-encoding #f))
-                    (substitute* (find-files "src/" "\\.(cpp|h)$")
-                      (("#include <sigc\\+\\+/retype\\.h>")
-                       "#include <sigc++/adaptors/retype.h>")
-                      (("#include <sigc\\+\\+/hide\\.h>")
-                       "#include <sigc++/adaptors/hide.h>")
-                      (("#include <sigc\\+\\+/object\\.h>")
-                       "#include <sigc++/trackable.h>")))
-                  #t))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:configure-flags
-       (list "CXXFLAGS=-std=gnu++11")))
-    (inputs
-     `(("gtkmm" ,gtkmm)
-       ("libsigc++" ,libsigc++)
-       ("synfig" ,synfig)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("intltool" ,intltool)))
-    (home-page "http://www.synfig.org")
-    (synopsis "Vector-based 2D animation package (GUI)")
-    (description
-     "Synfig is a vector-based 2D animation package.  It is designed to
-be capable of producing feature-film quality animation.  It eliminates the
-need for tweening, preventing the need to hand-draw each frame.  This package
-contains the graphical user interface for synfig.")
-    (license license:gpl3+)))
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,16 +38,6 @@
       (base32
        "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"))))
    (build-system gnu-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'wrap-aspell
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((bin/aspell (string-append (assoc-ref outputs "out")
-                                              "/bin/aspell")))
-               (wrap-program bin/aspell
-                 '("ASPELL_CONF" "" =
-                   ("${ASPELL_CONF:-\"dict-dir ${GUIX_PROFILE:-$HOME/.guix-profile}/lib/aspell\"}")))))))))
    (inputs `(("perl" ,perl)))
    (home-page "http://aspell.net/")
    (synopsis "Spell checker")
@@ -99,10 +89,10 @@ dictionaries, including personal ones.")

 (define-public aspell-dict-en
  (aspell-dictionary "en" "English"
-                     #:version "2016.01.19-0"
+                     #:version "7.1-0"
                     #:sha256
                     (base32
-                      "01h4cl4lngp6mcfbyb47cjrc2gspyg2519dvknd97ki896nx7vcn")))
+                      "02ldfiny4iakgfgy4sdrzjqdzi7l1rmb6y30lv31kfy5x31g77gz")))

 (define-public aspell-dict-eo
  (aspell-dictionary "eo" "Esperanto"
@@ -132,18 +122,3 @@ dictionaries, including personal ones.")
                     #:sha256
                     (base32
                      "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw")))
-
-(define-public aspell-dict-it
-  (aspell-dictionary "it" "Italian"
-                     #:version "2.2_20050523-0"
-                     #:sha256
-                     (base32
-                      "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v")))
-
-(define-public aspell-dict-nl
-  (aspell-dictionary "nl" "Dutch"
-                     #:version "0.50-2"
-                     #:prefix "aspell-"
-                     #:sha256
-                     (base32
-                      "0ffb87yjsh211hllpc4b9khqqrblial4pzi1h9r3v465z1yhn3j4")))
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2012, 2013, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,41 +28,46 @@
 (define-public attr
  (package
    (name "attr")
-    (version "2.4.47")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://savannah/attr/attr-"
-                                  version ".src.tar.gz"))
-              (sha256
-               (base32
-                "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5"))))
+    (version "2.4.46")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://savannah/attr/attr-"
+                          version ".src.tar.gz"))
+      (sha256
+       (base32
+        "07qf6kb2zk512az481bbnsk9jycn477xpva1a726n5pzlzf9pmnw"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'configure 'patch-makefile-SHELL
-           (lambda _
-             (patch-makefile-SHELL "include/buildmacros")))
-         (replace 'install
-           (lambda _
-             (zero? (system* "make"
-                             "install"
-                             "install-lib"
-                             "install-dev"))))
-         (replace 'check
-           (lambda* (#:key target #:allow-other-keys)
-             ;; Use the right shell.
-             (substitute* "test/run"
-               (("/bin/sh")
-                (which "bash")))
+       (alist-cons-after
+        'configure 'patch-makefile-SHELL
+        (lambda _
+          (patch-makefile-SHELL "include/buildmacros"))
+        (alist-replace
+         'install
+         (lambda _
+           (zero? (system* "make"
+                           "install"
+                           "install-lib"
+                           "install-dev")))

-             ;; When building natively, run the tests.
-             (unless target
-               (system* "make" "tests" "-C" "test"))
+         ;; When building natively, adjust the test cases.
+         ,(if (%current-target-system)
+              '%standard-phases
+              '(alist-replace 'check
+                              (lambda _
+                                ;; Use the right shell.
+                                (substitute* "test/run"
+                                  (("/bin/sh")
+                                   (which "bash")))

-             ;; XXX: Ignore the test result since this is
-             ;; dependent on the underlying file system.
-             #t)))))
+                                (system* "make" "tests" "-C" "test")
+
+                                ;; XXX: Ignore the test result since this is
+                                ;; dependent on the underlying file system.
+                                #t)
+                              %standard-phases))))))
    (inputs
     ;; Perl is needed to run tests; remove it from cross builds.
     (if (%current-target-system)
@@ -1,9 +1,9 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30,7 +30,6 @@
  #:use-module (guix build-system waf)
  #:use-module (guix build-system trivial)
  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system python)
  #:use-module (gnu packages)
  #:use-module (gnu packages algebra)
  #:use-module (gnu packages autotools)
@@ -43,8 +42,6 @@
  #:use-module (gnu packages databases)
  #:use-module (gnu packages file)
  #:use-module (gnu packages flex)
-  #:use-module (gnu packages fltk)
-  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gtk)
@@ -61,7 +58,6 @@
  #:use-module (gnu packages python)
  #:use-module (gnu packages rdf)
  #:use-module (gnu packages readline)
-  #:use-module (gnu packages webkit)
  #:use-module (gnu packages xiph)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg)
@@ -71,26 +67,15 @@
 (define-public alsa-modular-synth
  (package
    (name "alsa-modular-synth")
-    (version "2.1.2")
+    (version "2.1.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/alsamodular/ams-"
                                  version ".tar.bz2"))
              (sha256
               (base32
-                "1azbrhpfk4nnybr7kgmc7w6al6xnzppg853vas8gmkh185kk11l0"))))
+                "1nb7qzzqlqa2x8h797jbwi18ihnfkxqg9lyi0c4nvf8ybwzxkzd2"))))
    (build-system gnu-build-system)
-    (arguments
-     `(#:configure-flags '("--enable-qt5")
-       #:phases
-       (modify-phases %standard-phases
-         ;; Insert an extra space between linker flags.
-         (add-before 'configure 'add-missing-space
-           (lambda _
-             (substitute* "configure"
-               (("LIBS\\+=\\$LIBSsave") "LIBS+=\" $LIBSsave\"")
-               (("CFLAGS\\+=\\$CFLAGSsave") "CFLAGS+=\" $CFLAGSsave\""))
-             #t)))))
    (inputs
     `(("alsa-lib" ,alsa-lib)
       ;; We cannot use zita-alsa-pcmi (the successor of clalsadrv) due to
@@ -100,7 +85,7 @@
       ("jack" ,jack-1)
       ("ladspa" ,ladspa)
       ("liblo" ,liblo)
-       ("qt" ,qt)))
+       ("qt" ,qt-4)))
    (native-inputs
     `(("pkg-config" ,pkg-config)))
    (home-page "http://alsamodular.sourceforge.net/")
@@ -143,7 +128,7 @@ Filter) modules follow the convention of 1V / Octave.")
    (native-inputs
     `(("pkg-config" ,pkg-config)))
    (home-page "http://aubio.org/")
-    (synopsis "Library for audio labelling")
+    (synopsis "A library for audio labelling")
    (description
     "aubio is a tool designed for the extraction of annotations from audio
 signals.  Its features include segmenting a sound file before each of its
@@ -167,32 +152,33 @@ streams from live audio.")
                         libdir "/vamp" "\"]"))))
     #t))

-(define-public ardour
+(define-public ardour-3
  (package
    (name "ardour")
-    (version "4.7")
+    (version "3.5.403")
    (source (origin
+              ;; The project only provides tarballs upon individual request
+              ;; (or after payment) so we take the code from git.
              (method git-fetch)
              (uri (git-reference
                    (url "git://git.ardour.org/ardour/ardour.git")
                    (commit version)))
              (snippet
-               ;; Ardour expects this file to exist at build time.  The revision
-               ;; is the output of
-               ;;    git describe HEAD | sed 's/^[A-Za-z]*+//'
+               ;; Ardour expects this file to exist at build time.  It can be
+               ;; created from a git checkout with:
+               ;;   ./waf create_stored_revision
               '(call-with-output-file
                    "libs/ardour/revision.cc"
                  (lambda (port)
                    (format port "#include \"ardour/revision.h\"
-namespace ARDOUR { const char* revision = \"4.7-219-g0e36f8e\" ; }"))))
+namespace ARDOUR { const char* revision = \"3.5-403-gec2cb31\" ; }"))))
              (sha256
               (base32
-                "149gswphz77m3pkzsn2nqbm6yvcfa3fva560bcvjzlgb73f64q5l"))
+                "01b0wxh0wlxjfz5j8gcwwqhxc6q2kn4njz2fcmzv9fr3xaya5dbp"))
              (file-name (string-append name "-" version))))
    (build-system waf-build-system)
    (arguments
-     `(#:configure-flags '("--cxx11") ; required by gtkmm
-       #:phases
+     `(#:phases
       (modify-phases %standard-phases
         (add-after
          'unpack 'set-rpath-in-LDFLAGS
@@ -244,6 +230,35 @@ record, edit, mix and master audio and MIDI projects.  It is targeted at audio
 engineers, musicians, soundtrack editors and composers.")
    (license license:gpl2+)))

+(define-public ardour
+  (package (inherit ardour-3)
+    (name "ardour")
+    (version "4.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "git://git.ardour.org/ardour/ardour.git")
+                    (commit version)))
+              (snippet
+               ;; Ardour expects this file to exist at build time.  It can be
+               ;; created from a git checkout with:
+               ;;   ./waf create_stored_revision
+               '(call-with-output-file
+                    "libs/ardour/revision.cc"
+                  (lambda (port)
+                    (format port "#include \"ardour/revision.h\"
+namespace ARDOUR { const char* revision = \"4.2\" ; }"))))
+              (sha256
+               (base32
+                "1j8zw0bvh16qwyy8qrqynpak9nghl9j3qhjjcdl7wh9raafjqc00"))
+              (file-name (string-append name "-" version))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments ardour-3)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (replace 'set-rpath-in-LDFLAGS
+                    ,(ardour-rpath-phase (version-prefix version 1)))))))))
+
 (define-public azr3
  (package
    (name "azr3")
@@ -286,8 +301,9 @@ plugins are provided.")
    (version "0.0.60")
    (source (origin
              (method url-fetch)
-              (uri (string-append "http://calf-studio-gear.org/files/calf-"
-                                  version ".tar.gz"))
+              (uri (string-append
+                    "mirror://sourceforge/calf/calf/"
+                    version "/calf-" version ".tar.gz"))
              (sha256
               (base32
                "019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9"))))
@@ -332,15 +348,8 @@ tools (analyzer, mono/stereo tools, crossovers).")
                    version "/Csound" version ".tar.gz"))
              (sha256
               (base32
-                "0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd"))
-              (patches (list (search-patch "csound-header-ordering.patch")))))
+                "0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd"))))
    (build-system cmake-build-system)
-    (arguments
-     ;; Work around this error on x86_64 with libc 2.22+:
-     ;;    libmvec.so.1: error adding symbols: DSO missing from command line
-     (if (string-prefix? "x86_64" (or (%current-target-system) (%current-system)))
-         '(#:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-lmvec"))
-         '()))
    (inputs
     `(("alsa-lib" ,alsa-lib)
       ("boost" ,boost)
@@ -406,319 +415,6 @@ language and software synthesizer.")
 ALSA PCM devices.")
    (license license:gpl2+)))

-(define-public amb-plugins
-  (package
-    (name "amb-plugins")
-    (version "0.8.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://kokkinizita.linuxaudio.org"
-                    "/linuxaudio/downloads/AMB-plugins-"
-                    version ".tar.bz2"))
-              (sha256
-               (base32
-                "0x4blm4visjqj0ndqr0cg776v3b7lvplpc8cgi9n51llhavn0jpl"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f ; no "check" target
-       #:phases
-       (modify-phases %standard-phases
-         ;; no configure script
-         (delete 'configure)
-         (add-before 'install 'prepare-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (mkdir-p (string-append (assoc-ref outputs "out") "/lib/ladspa"))
-             #t))
-         (add-after 'unpack 'override-target-directory-and-tool-paths
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/usr/lib/ladspa")
-                (string-append (assoc-ref outputs "out") "/lib/ladspa"))
-               (("/usr/bin/install") (which "install"))
-               (("/bin/rm") "#"))
-             #t)))))
-    (home-page "http://kokkinizita.linuxaudio.org")
-    (synopsis "LADSPA ambisonics plugins")
-    (description
-     "The AMB plugins are a set of LADSPA ambisonics plugins, mainly to be
-used within Ardour.  Features include: mono and stereo to B-format panning,
-horizontal rotator, square, hexagon and cube decoders.")
-    (license license:gpl2+)))
-
-(define-public mcp-plugins
-  (package
-    (name "mcp-plugins")
-    (version "0.4.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://kokkinizita.linuxaudio.org"
-                    "/linuxaudio/downloads/MCP-plugins-"
-                    version ".tar.bz2"))
-              (sha256
-               (base32
-                "06a9r1l85jmg7l1cvc3788mk8ra0xagjfy1rmhw3b80y4n0vlnvc"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f ; no "check" target
-       #:phases
-       (modify-phases %standard-phases
-         ;; no configure script
-         (delete 'configure)
-         (add-before 'install 'prepare-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (mkdir-p (string-append (assoc-ref outputs "out") "/lib/ladspa"))
-             #t))
-         (add-after 'unpack 'override-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/usr") (assoc-ref outputs "out")))
-             #t)))))
-    (home-page "http://kokkinizita.linuxaudio.org")
-    (synopsis "Chorus, phaser, and vintage high-pass and low-pass filters")
-    (description
-     "This package provides various LADSPA plugins.  @code{cs_chorus} and
-@code{cs_phaser} provide chorus and phaser effects, respectively;
-@code{mvclpf24} provides four implementations of the low-pass filter used in
-vintage Moog synthesizers; @code{mvchpf24} is based on the voltage-controlled
-high-pass filter by Robert Moog.  The filters attempt to accurately emulate
-the non-linear circuit elements of their original analog counterparts.")
-    (license license:gpl2+)))
-
-(define-public rev-plugins
-  (package
-    (name "rev-plugins")
-    (version "0.7.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://kokkinizita.linuxaudio.org"
-                    "/linuxaudio/downloads/REV-plugins-"
-                    version ".tar.bz2"))
-              (sha256
-               (base32
-                "1ikpinxm00pkfi259bnkzhsy3miagrjgdihaaf5x4v7zac29j3g7"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f ; no "check" target
-       #:phases
-       (modify-phases %standard-phases
-         ;; no configure script
-         (delete 'configure)
-         (add-before 'install 'prepare-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (mkdir-p (string-append (assoc-ref outputs "out") "/lib/ladspa"))
-             #t))
-         (add-after 'unpack 'override-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/usr") (assoc-ref outputs "out")))
-             #t)))))
-    (home-page "http://kokkinizita.linuxaudio.org")
-    (synopsis "LADSPA reverb plugin")
-    (description
-     "This package provides a stereo reverb LADSPA plugin based on the
-well-known greverb.")
-    (license license:gpl2+)))
-
-(define-public fil-plugins
-  (package
-    (name "fil-plugins")
-    (version "0.3.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://kokkinizita.linuxaudio.org"
-                    "/linuxaudio/downloads/FIL-plugins-"
-                    version ".tar.bz2"))
-              (sha256
-               (base32
-                "1scfv9j7jrp50r565haa4rvxn1vk2ss86xssl5qgcr8r45qz42qw"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f ; no "check" target
-       #:phases
-       (modify-phases %standard-phases
-         ;; no configure script
-         (delete 'configure)
-         (add-before 'install 'prepare-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (mkdir-p (string-append (assoc-ref outputs "out") "/lib/ladspa"))
-             #t))
-         (add-after 'unpack 'override-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/usr") (assoc-ref outputs "out")))
-             #t)))))
-    (home-page "http://kokkinizita.linuxaudio.org")
-    (synopsis "LADSPA four-band parametric equalizer plugin")
-    (description
-     "This package provides a LADSPA plugin for a four-band parametric
-equalizer.  Each section has an active/bypass switch, frequency, bandwidth and
-gain controls.  There is also a global bypass switch and gain control.
-
-The 2nd order resonant filters are implemented using a Mitra-Regalia style
-lattice filter, which is stable even while parameters are being changed.
-
-All switches and controls are internally smoothed, so they can be used 'live'
-without any clicks or zipper noises.  This makes this plugin suitable for use
-in systems that allow automation of plugin control ports, such as Ardour, or
-for stage use.")
-    (license license:gpl2+)))
-
-(define-public ste-plugins
-  (package
-    (name "ste-plugins")
-    (version "0.0.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://kokkinizita.linuxaudio.org"
-                    "/linuxaudio/downloads/STE-plugins-"
-                    version ".tar.bz2"))
-              (sha256
-               (base32
-                "0s3c9w5xihs87cnd1lh9xgj3maabjdyh6bl766qp5lhkg3ax8zy6"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f ; no "check" target
-       #:phases
-       (modify-phases %standard-phases
-         ;; no configure script
-         (delete 'configure)
-         (add-before 'install 'prepare-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (mkdir-p (string-append (assoc-ref outputs "out") "/lib/ladspa"))
-             #t))
-         (add-after 'unpack 'override-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/usr") (assoc-ref outputs "out")))
-             #t)))))
-    (home-page "http://kokkinizita.linuxaudio.org")
-    (synopsis "LADSPA stereo width plugin")
-    (description
-     "This package provides a LADSPA plugin to manipulate the stereo width of
-audio signals.")
-    (license license:gpl2+)))
-
-(define-public vco-plugins
-  (package
-    (name "vco-plugins")
-    (version "0.3.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://kokkinizita.linuxaudio.org"
-                    "/linuxaudio/downloads/VCO-plugins-"
-                    version ".tar.bz2"))
-              (sha256
-               (base32
-                "1xzqdg3b07r7zww05y9bb737l9dxvfkv28m3fyak1aazaci3rsgl"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f ; no "check" target
-       #:phases
-       (modify-phases %standard-phases
-         ;; no configure script
-         (delete 'configure)
-         (add-before 'install 'prepare-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (mkdir-p (string-append (assoc-ref outputs "out") "/lib/ladspa"))
-             #t))
-         (add-after 'unpack 'override-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/usr") (assoc-ref outputs "out"))
-               (("/bin/cp") (which "cp")))
-             #t)))))
-    (home-page "http://kokkinizita.linuxaudio.org")
-    (synopsis "LADSPA plugin for synthesizer oscillators")
-    (description
-     "The @code{blvco} LADSPA plugin provides three anti-aliased oscillators:
-
-@enumerate
-@item Pulse-VCO, a dirac pulse oscillator with flat amplitude spectrum
-@item Saw-VCO, a sawtooth oscillator with 1/F amplitude spectrum
-@item Rec-VCO, a square / rectange oscillator
-@end enumerate\n
-
-All oscillators are low-pass filtered to provide waveforms similar to the
-output of analog synthesizers such as the Moog Voyager.")
-    (license license:gpl2+)))
-
-(define-public wah-plugins
-  (package
-    (name "wah-plugins")
-    (version "0.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://kokkinizita.linuxaudio.org"
-                    "/linuxaudio/downloads/WAH-plugins-"
-                    version ".tar.bz2"))
-              (sha256
-               (base32
-                "1wkbjarxdhjixkh7d5abralj11dj2xxg644fz3ycd7qyfgfvjfgd"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f ; no "check" target
-       #:phases
-       (modify-phases %standard-phases
-         ;; no configure script
-         (delete 'configure)
-         (add-before 'install 'prepare-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (mkdir-p (string-append (assoc-ref outputs "out") "/lib/ladspa"))
-             #t))
-         (add-after 'unpack 'override-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/usr") (assoc-ref outputs "out")))
-             #t)))))
-    (home-page "http://kokkinizita.linuxaudio.org")
-    (synopsis "LADSPA Autowah effect plugin")
-    (description
-     "This package provides a LADSPA plugin for a Wah effect with envelope
-follower.")
-    (license license:gpl2+)))
-
-(define-public g2reverb
-  (package
-    (name "g2reverb")
-    (version "0.7.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://kokkinizita.linuxaudio.org"
-                    "/linuxaudio/downloads/g2reverb-"
-                    version ".tar.bz2"))
-              (sha256
-               (base32
-                "18wb8vj1kky5glr76s34awbi8qzplsmf3wjbd7a12hfv4j0bkwrj"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f ; no "check" target
-       #:phases
-       (modify-phases %standard-phases
-         ;; no configure script
-         (delete 'configure)
-         (add-before 'install 'prepare-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (mkdir-p (string-append (assoc-ref outputs "out") "/lib/ladspa"))
-             #t))
-         (add-after 'unpack 'override-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/usr") (assoc-ref outputs "out")))
-             #t)))))
-    (home-page "http://kokkinizita.linuxaudio.org")
-    (synopsis "LADSPA stereo reverb plugin")
-    (description
-     "This package provides a LADSPA plugin for a stereo reverb effect.")
-    (license license:gpl2+)))
-
 (define-public fluidsynth
  (package
    (name "fluidsynth")
@@ -862,7 +558,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
 (define-public guitarix
  (package
    (name "guitarix")
-    (version "0.34.0")
+    (version "0.33.0")
    (source (origin
             (method url-fetch)
             (uri (string-append
@@ -870,7 +566,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
                   version ".tar.bz2"))
             (sha256
              (base32
-               "0pamaq8iybsaglq6y1m1rlmz4wgbs2r6m24bj7x4fwg4grjvzjl8"))))
+               "1w6dg2n0alfjsx1iy6s53783invygwxk11p1i65cc3nq3zlidcgx"))))
    (build-system waf-build-system)
    (arguments
     `(#:tests? #f ; no "check" target
@@ -878,8 +574,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
       #:configure-flags
       (list
        ;; Add the output lib directory to the RUNPATH.
-        (string-append "--ldflags=-Wl,-rpath=" %output "/lib")
-        "--cxxflags=-std=c++11")))
+        (string-append "--ldflags=-Wl,-rpath=" %output "/lib"))))
    (inputs
     `(("libsndfile" ,libsndfile)
       ("boost" ,boost)
@@ -891,7 +586,6 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
       ("jack" ,jack-1)
       ("gtkmm" ,gtkmm-2)
       ("gtk+" ,gtk+-2)
-       ("webkitgtk/gtk+-2" ,webkitgtk/gtk+-2)
       ("fftwf" ,fftwf)
       ("lrdf" ,lrdf)
       ("zita-resampler" ,zita-resampler)
@@ -917,56 +611,6 @@ from a simple noise gate to modulation effects like flanger, phaser or
 auto-wah.")
    (license license:gpl2+)))

-(define-public rakarrack
-  (package
-    (name "rakarrack")
-    (version "0.6.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/rakarrack/rakarrack/"
-                                  "rakarrack-" version "/rakarrack-"
-                                  version ".tar.bz2"))
-              (sha256
-               (base32
-                "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  (substitute* '("src/process.C"
-                                 "src/global.h")
-                    (("#include <Fl/") "#include <FL/"))
-                  #t))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("alsa-utils" ,alsa-utils)
-       ("fltk" ,fltk)
-       ("libx11" ,libx11)
-       ("libxext" ,libxext)
-       ("libxfixes" ,libxfixes)
-       ("libxft" ,libxft)
-       ("libxrender" ,libxrender)
-       ("libxpm" ,libxpm)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("jack" ,jack-1)
-       ("alsa-lib" ,alsa-lib)
-       ("libsndfile" ,libsndfile)
-       ("libsamplerate" ,libsamplerate)
-       ("zlib" ,zlib)))
-    (home-page "http://rakarrack.sourceforge.net/")
-    (synopsis "Audio effects processor")
-    (description
-     "Rakarrack is a richly featured multi-effects processor emulating a
-guitar effects pedalboard.  Effects include compressor, expander, noise gate,
-equalizers, exciter, flangers, chorus, various delay and reverb effects,
-distortion modules and many more.  Most of the effects engine is built from
-modules found in the excellent software synthesizer ZynAddSubFX.  Presets and
-user interface are optimized for guitar, but Rakarrack processes signals in
-stereo while it does not apply internal band-limiting filtering, and thus is
-well suited to all musical instruments and vocals.")
-    ;; The code is explicitly licensed under the GPL version 2 only.
-    (license license:gpl2)))
-
 (define-public ir
  (package
    (name "ir")
@@ -1063,8 +707,7 @@ synchronous execution of all clients, and low latency operation.")
               "03b0iiyk3ng3vh5s8gaqwn565vik7910p56mlbk512bw3dhbdwc8"))))
    (build-system waf-build-system)
    (arguments
-     `(#:python ,python-2
-       #:tests? #f  ; no check target
+     `(#:tests? #f  ; no check target
       #:configure-flags '("--dbus"
                           "--alsa")
       #:phases
@@ -1077,22 +720,13 @@ synchronous execution of all clients, and low latency operation.")
              ((".*CFLAGS.*-Wall.*" m)
               (string-append m
                              "    conf.env.append_unique('LINKFLAGS',"
-                              "'-Wl,-rpath=" %output "/lib')\n")))))
-         (add-after 'install 'wrap-python-scripts
-          (lambda* (#:key inputs outputs #:allow-other-keys)
-            ;; Make sure 'jack_control' runs with the correct PYTHONPATH.
-            (let* ((out (assoc-ref outputs "out"))
-                   (path (getenv "PYTHONPATH")))
-              (wrap-program (string-append out "/bin/jack_control")
-                `("PYTHONPATH" ":" prefix (,path))))
-            #t)))))
+                              "'-Wl,-rpath=" %output "/lib')\n"))))))))
    (inputs
     `(("alsa-lib" ,alsa-lib)
       ("dbus" ,dbus)
       ("expat" ,expat)
       ("libsamplerate" ,libsamplerate)
       ("opus" ,opus)
-       ("python2-dbus" ,python2-dbus)
       ("readline" ,readline)))
    (native-inputs
     `(("pkg-config" ,pkg-config)))
@@ -1111,22 +745,14 @@ synchronous execution of all clients, and low latency operation.")
               (base32
                "1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9"))))
    (build-system waf-build-system)
-    (arguments
-     `(#:tests? #f ; no check target
-       #:phases
-       (modify-phases %standard-phases
-         (add-before
-          'configure 'set-flags
-          (lambda _
-            ;; Compile with C++11, required by gtkmm.
-            (setenv "CXXFLAGS" "-std=c++11")
-            #t)))))
+    (arguments `(#:tests? #f)) ; no check target
    (inputs
     `(("lv2" ,lv2)
       ("lilv" ,lilv)
       ("suil" ,suil)
       ("gtk" ,gtk+-2)
       ("gtkmm" ,gtkmm-2)
+       ("qt" ,qt-4)
       ("jack" ,jack-1)))
    (native-inputs
     `(("pkg-config" ,pkg-config)))
@@ -1142,20 +768,15 @@ plugin function as a JACK application.")
  (package
    (name "ladspa")
    (version "1.13")
-    (source
-     (origin
-       (method url-fetch)
-       ;; Since the official link is dead,
-       ;; we download the tarball from Debian or Internet Archive.
-       (uri (list (string-append "http://http.debian.net"
-                                 "/debian/pool/main/l/ladspa-sdk/ladspa-sdk_"
-                                 version ".orig.tar.gz")
-                  (string-append "https://web.archive.org/web/20140717172251/"
-                                 "http://www.ladspa.org/download/ladspa_sdk_"
-                                 version ".tgz")))
-       (sha256
-        (base32
-         "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"))))
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "http://www.ladspa.org/download/ladspa_sdk_"
+                   version
+                   ".tgz"))
+             (sha256
+              (base32
+               "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"))))
    (build-system gnu-build-system)
    (arguments
     `(#:tests? #f  ; the "test" target is a listening test only
@@ -1173,9 +794,7 @@ plugin function as a JACK application.")
              (("^CC.*")            "CC = gcc\n")
              (("^CPP.*")           "CPP = g++\n"))))
        (alist-delete 'build %standard-phases))))
-    ;; Since the home page is gone, we provide a link to the archived version.
-    (home-page
-     "https://web.archive.org/web/20140729190945/http://www.ladspa.org/")
+    (home-page "http://ladspa.org")
    (synopsis "Linux Audio Developer's Simple Plugin API (LADSPA)")
    (description
     "LADSPA is a standard that allows software audio processors and effects
@@ -1270,34 +889,6 @@ essential distortions.")
 implementation of the Open Sound Control (OSC) protocol.")
    (license license:lgpl2.1+)))

-(define-public python-pyliblo
-  (package
-    (name "python-pyliblo")
-    (version "0.10.0")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "http://das.nasophon.de/download/pyliblo-"
-                                 version ".tar.gz"))
-             (sha256
-              (base32
-               "13vry6xhxm7adnbyj28w1kpwrh0kf7nw83cz1yq74wl21faz2rzw"))))
-    (build-system python-build-system)
-    (arguments `(#:tests? #f)) ;no tests
-    (inputs
-     `(("python-cython" ,python-cython)
-       ("liblo" ,liblo)))
-    (home-page "http://das.nasophon.de/pyliblo/")
-    (synopsis "Python bindings for liblo")
-    (description
-     "Pyliblo is a Python wrapper for the liblo Open Sound Control (OSC)
-library.  It supports almost the complete functionality of liblo, allowing you
-to send and receive OSC messages using a nice and simple Python API.  Also
-included are the command line utilities @code{send_osc} and @code{dump_osc}.")
-    (license license:lgpl2.1+)))
-
-(define-public python2-pyliblo
-  (package-with-python2 python-pyliblo))
-
 (define-public lilv
  (package
    (name "lilv")
@@ -1434,16 +1025,7 @@ software.")
       #:configure-flags
       (list (string-append "--boost-includes="
                            (assoc-ref %build-inputs "boost")
-                            "/include"))
-       #:phases (modify-phases %standard-phases
-                  (add-before
-                   'configure 'set-flags
-                   (lambda* (#:key inputs #:allow-other-keys)
-                     ;; See e.g. https://github.com/lvtk/lvtk/issues/21
-                     (setenv "LDFLAGS"
-                             (string-append
-                              "-L" (assoc-ref inputs "boost") "/lib "
-                              "-lboost_system")))))))
+                            "/include"))))
    (inputs
     `(("boost" ,boost)
       ("lv2" ,lv2)))
@@ -1887,14 +1469,14 @@ surround and reverb.")
 (define-public libxmp
  (package
    (name "libxmp")
-    (version "4.3.10")
+    (version "4.3.8")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/xmp/libxmp/"
                                  name "-" version ".tar.gz"))
              (sha256
               (base32
-                "1gm5xa0ca7ypcbj3bkmj3k1vvzl7nkch8gjyrm8p1a9vgzr0n761"))))
+                "0h06091hlpgc6ds4pjmfq8sx4snw7av3nhny180q4pwfyasjb6ny"))))
    (build-system gnu-build-system)
    (home-page "http://xmp.sourceforge.net/")
    (synopsis "Module player library")
@@ -2201,11 +1783,6 @@ result.")
                    "http://kokkinizita.linuxaudio.org"
                    "/linuxaudio/downloads/zita-convolver-"
                    version ".tar.bz2"))
-              (snippet
-               ;; Don't optimize for a specific processor architecture.
-               '(substitute* "libs/Makefile"
-                  (("^CXXFLAGS \\+= -march=native") "")))
-              (modules '((guix build utils)))
              (sha256
               (base32
                "14qrnczhp5mbwhky64il7kxc4hl1mmh495v60va7i2qnhasr6zmz"))))
@@ -2248,11 +1825,6 @@ engine.")
                    "http://kokkinizita.linuxaudio.org"
                    "/linuxaudio/downloads/zita-resampler-"
                    version ".tar.bz2"))
-              (snippet
-               ;; Don't optimize for a specific processor architecture.
-               '(substitute* '("apps/Makefile" "libs/Makefile")
-                  (("^CXXFLAGS \\+= -march=native") "")))
-              (modules '((guix build utils)))
              (sha256
               (base32
                "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq"))))
@@ -2332,92 +1904,3 @@ access to ALSA PCM devices, taking care of the many functions required to
 open, initialise and use a hw: device in mmap mode, and providing floating
 point audio data.")
    (license license:gpl3+)))
-
-(define-public cuetools
-  (package
-    (name "cuetools")
-    (version "1.4.1")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "https://github.com/svend/cuetools/archive/"
-                                 version ".tar.gz"))
-             (file-name (string-append name "-" version ".tar.gz"))
-             (sha256
-              (base32
-               "01xi3rvdmil9nawsha04iagjylqr1l9v9vlzk99scs8c207l58i4"))))
-    (build-system gnu-build-system)
-    ;; The source tarball is not bootstrapped.
-    (arguments
-     `(#:phases
-        (modify-phases %standard-phases
-          (add-after 'unpack 'bootstrap
-            (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
-    ;; Bootstrapping tools
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("flex" ,flex)
-       ("bison" ,bison)))
-    (synopsis "Cue and toc file parsers and utilities")
-    (description "Cuetools is a set of programs that are useful for manipulating
-and using CUE sheet (cue) files and Table of Contents (toc) files.  CUE and TOC
-files are a way to represent the layout of a data or audio CD in a
-machine-readable ASCII format.")
-    (home-page "https://github.com/svend/cuetools")
-    (license license:gpl2+)))
-
-(define-public shntool
-  (package
-    (name "shntool")
-    (version "3.0.10")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "http://etree.org/shnutils/shntool/dist/src/"
-                                 "shntool-" version ".tar.gz"))
-             (sha256
-              (base32
-               "00i1rbjaaws3drkhiczaign3lnbhr161b7rbnjr8z83w8yn2wc3l"))))
-    (build-system gnu-build-system)
-    (synopsis "WAVE audio data processing tool")
-    (description "shntool is a multi-purpose WAVE data processing and reporting
-utility.  File formats are abstracted from its core, so it can process any file
-that contains WAVE data, compressed or not---provided there exists a format
-module to handle that particular file type.")
-    (home-page "http://etree.org/shnutils/shntool/")
-    ;; 'install-sh' bears the x11 license
-    (license (list license:gpl2+ license:x11))))
-
-(define-public dcadec
-  (package
-    (name "dcadec")
-    (version "0.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/foo86/dcadec/archive/v"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0i0dpypgqkhhi4v1fmsp2way6w9kbcix3c7q79pmg39yvrzj17gd"))))
-    (build-system gnu-build-system)
-    (arguments
-     ;; Test files are missing: https://github.com/foo86/dcadec/issues/53
-     '(#:tests? #f
-       #:make-flags
-       (list "CC=gcc"
-             ;; Build shared library.
-             "CONFIG_SHARED=1"
-             (string-append "PREFIX=" (assoc-ref %outputs "out"))
-             ;; Set proper runpath.
-             (string-append "LDFLAGS=-Wl,-rpath="
-                            (assoc-ref %outputs "out")
-                            "/lib"))
-       #:phases
-       (modify-phases %standard-phases
-         ;; No configure script, just a hand-written Makefile.
-         (delete 'configure))))
-    (synopsis "DTS Coherent Acoustics decoder")
-    (description "Dcadec is a DTS Coherent Acoustics surround sound decoder
-with support for HD extensions.")
-    (home-page "https://github.com/foo86/dcadec")
-    (license license:lgpl2.1+)))
@@ -1,59 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages augeas)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix utils)
-  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages readline)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages xml))
-
-(define-public augeas
-  (package
-    (name "augeas")
-    (version "1.4.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://download.augeas.net/augeas-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0c2vncn0afmgwggnqa5s5z7m3zbcc66bi8v9m1h9w0i9q9xax7v5"))))
-    (build-system gnu-build-system)
-    ;; Marked as "required" in augeas.pc
-    (propagated-inputs
-     `(("libxml2" ,libxml2)))
-    (inputs
-     `(("readline" ,readline)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (home-page "http://augeas.net/")
-    (synopsis "Edit configuration files programmatically")
-    (description
-     "Augeas is a library and command line tool for programmatically editing
-configuration files in a controlled manner.  Augeas exposes a tree of all
-configuration settings and a simple local API for manipulating the tree.
-Augeas then modifies underlying configuration files according to the changes
-that have been made to the tree; it does as little modeling of configurations
-as possible, and focuses exclusivley on transforming the tree-oriented syntax
-of its public API to the myriad syntaxes of individual configuration files.")
-    (license license:lgpl2.1+)))
@@ -1,6 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013,2014 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,15 +30,16 @@
 (define-public autogen
  (package
    (name "autogen")
-    (version "5.18.7")
+    (version "5.18.6")
    (source
     (origin
      (method url-fetch)
-      (uri (string-append "mirror://gnu/autogen"
-                          "/autogen-" version ".tar.xz"))
+      (uri (string-append "mirror://gnu/autogen/rel"
+                          version "/autogen-"
+                          version ".tar.xz"))
      (sha256
       (base32
-        "01d4m8ckww12sy50vgyxlnz83z9dxqpyqp153cscncc9w6jq19d7"))))
+        "0sfmmy19k9z0j3f738fyk6ljf6b66410cvd5zzyplxi2683j10qs"))))
    (build-system gnu-build-system)
    (native-inputs `(("perl" ,perl)     ;for doc generator mdoc
                     ("pkg-config" ,pkg-config)))
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
 ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
@@ -195,9 +195,7 @@ output is indexed in many ways to simplify browsing.")
              (base32
               "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r"))
             (patches
-              (map search-patch
-                   '("automake-regexp-syntax.patch"
-                     "automake-skip-amhello-tests.patch")))))
+              (list (search-patch "automake-skip-amhello-tests.patch")))))
    (build-system gnu-build-system)
    (native-inputs
     `(("autoconf" ,(autoconf-wrapper))
@@ -23,7 +23,7 @@
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages)
-  #:use-module (gnu packages databases)
+  #:use-module (gnu packages gdbm)
  #:use-module (gnu packages libdaemon)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages glib)
@@ -1,6 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
-;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -18,14 +17,12 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages avr)
-  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix licenses)
  #:use-module (guix download)
  #:use-module (guix packages)
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages)
-  #:use-module (gnu packages cross-base)
-  #:use-module (gnu packages vim)
-  #:use-module (gnu packages zip))
+  #:use-module (gnu packages cross-base))

 (define-public avr-libc
  (package
@@ -51,41 +48,4 @@
    (description
     "AVR Libc is a project whose goal is to provide a high quality C library
 for use with GCC on Atmel AVR microcontrollers.")
-    (license (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt"))))
-
-(define-public microscheme
-  (package
-    (name "microscheme")
-    (version "0.9.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ryansuchocki/"
-                                  "microscheme/archive/v" version ".zip"))
-              (sha256
-               (base32
-                "0cmp1c6ilcib4w9ysqghav310g8jsq9gdfpfa9sd23wgl7mlncxf"))
-              (file-name (string-append name "-" version ".zip"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:parallel-build? #f ; fails to build otherwise
-       #:tests? #f ; no tests
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))
-       #:make-flags
-       (list (string-append "PREFIX=" (assoc-ref %outputs "out")))))
-    (native-inputs
-     `(("unzip" ,unzip)
-       ("vim" ,vim))) ; for xxd
-    (home-page "http://microscheme.org/")
-    (synopsis "Scheme subset for Atmel microcontrollers")
-    (description
-     "Microscheme, or @code{(ms)} for short, is a functional programming
-language for the Arduino, and for Atmel 8-bit AVR microcontrollers in general.
-Microscheme is a subset of Scheme, in the sense that every valid @code{(ms)}
-program is also a valid Scheme program (with the exception of Arduino
-hardware-specific primitives).  The @code{(ms)} compiler performs function
-inlining, and features an aggressive tree-shaker, eliminating unused top-level
-definitions.  Microscheme has a robust @dfn{Foreign Function Interface} (FFI)
-meaning that C code may be invoked directly from (ms) programs.")
-    (license license:expat)))
+    (license (non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt"))))
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
-;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30,12 +30,9 @@
  #:use-module (gnu packages acl)
  #:use-module (gnu packages base)
  #:use-module (gnu packages compression)
-  #:use-module (gnu packages databases)
  #:use-module (gnu packages dejagnu)
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gnupg)
-  #:use-module (gnu packages gperf)
-  #:use-module (gnu packages guile)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages mcrypt)
  #:use-module (gnu packages nettle)
@@ -148,10 +145,8 @@ backups (called chunks) to allow easy burning to CD/DVD.")
       (patches
        (list (search-patch "libarchive-mtree-filename-length-fix.patch")
              (search-patch "libarchive-fix-lzo-test-case.patch")
-              (search-patch "libarchive-CVE-2013-0211.patch")
-              (search-patch "libarchive-bsdtar-test.patch")))))
+              (search-patch "libarchive-CVE-2013-0211.patch")))))
    (build-system gnu-build-system)
-    ;; TODO: Add -L/path/to/nettle in libarchive.pc.
    (inputs
     `(("zlib" ,zlib)
       ("nettle" ,nettle)
@@ -348,16 +343,8 @@ rdiff-backup is easy to use and settings have sensible defaults.")
    (inputs
     `(("acl" ,acl)
       ("openssl" ,openssl)
-       ("python-msgpack" ,python-msgpack)
-
-       ;; Attic is probably incompatible with llfuse > 0.41.
-       ;; These links are to discussions of llfuse compatibility from
-       ;; the borg project. Borg is a recent fork of attic, and attic
-       ;; has not been updated since the fork, so it's likely that
-       ;; llfuse compatibility requirements are still the same.
-       ;; https://github.com/borgbackup/borg/issues/642
-       ;; https://github.com/borgbackup/borg/issues/643
-       ("python-llfuse" ,python-llfuse-0.41)))
+       ("python-llfuse" ,python-llfuse)
+       ("python-msgpack" ,python-msgpack)))
    (synopsis "Deduplicating backup program")
    (description "Attic is a deduplicating backup program.  The main goal of
 Attic is to provide an efficient and secure way to backup data.  The data
@@ -365,97 +352,3 @@ deduplication technique used makes Attic suitable for daily backups since only
 changes are stored.")
    (home-page "https://attic-backup.org/")
    (license license:bsd-3)))
-
-(define-public libchop
-  (package
-    (name "libchop")
-    (version "0.5.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://savannah/libchop/libchop-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"))
-              (patches
-               (list (search-patch "diffutils-gets-undeclared.patch")))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("guile" ,guile-2.0)
-       ("gperf" ,gperf)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.0)
-       ("util-linux" ,util-linux)
-       ("gnutls" ,gnutls)
-       ("tdb" ,tdb)
-       ("bdb" ,bdb)
-       ("gdbm" ,gdbm)
-       ("libgcrypt" ,libgcrypt)
-       ("lzo" ,lzo)
-       ("bzip2" ,bzip2)
-       ("zlib" ,zlib)))
-    (home-page "http://nongnu.org/libchop/")
-    (synopsis "Tools & library for data backup and distributed storage")
-    (description
-     "Libchop is a set of utilities and library for data backup and
-distributed storage.  Its main application is @command{chop-backup}, an
-encrypted backup program that supports data integrity checks, versioning,
-distribution among several sites, selective sharing of stored data, adaptive
-compression, and more.  The library itself implements storage techniques such
-as content-addressable storage, content hash keys, Merkle trees, similarity
-detection, and lossless compression.")
-    (license license:gpl3+)))
-
-(define-public borg
-  (package
-    (name "borg")
-    (version "1.0.0")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "borgbackup" version))
-              (sha256
-               (base32
-                "0wa6cvqs3rni5nwrgagigchcly8a53rxk56z0zn8iaii2cqrw2sh"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'set-env
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((openssl (assoc-ref inputs "openssl"))
-                   (lz4 (assoc-ref inputs "lz4")))
-               (setenv "BORG_OPENSSL_PREFIX" openssl)
-               (setenv "BORG_LZ4_PREFIX" lz4)
-               (setenv "PYTHON_EGG_CACHE" "/tmp")
-               #t)))
-         (add-after 'install 'install-doc
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (man (string-append out "/share/man/man1")))
-               (and
-                 (zero? (system* "python3" "setup.py" "build_ext" "--inplace"))
-                 (zero? (system* "make" "-C" "docs" "man"))
-                 (begin
-                   (install-file "docs/_build/man/borg.1" man)
-                   #t))))))))
-    (native-inputs
-     `(("python-setuptools-scm" ,python-setuptools-scm)
-       ;; For generating the documentation.
-       ("python-sphinx" ,python-sphinx)
-       ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
-    (inputs
-     `(("acl" ,acl)
-       ("lz4" ,lz4)
-       ("openssl" ,openssl)
-       ("python-llfuse" ,python-llfuse)
-       ("python-msgpack" ,python-msgpack)))
-    (synopsis "Deduplicated, encrypted, authenticated and compressed backups")
-    (description "Borg is a deduplicating backup program.  Optionally, it
-supports compression and authenticated encryption.  The main goal of Borg is to
-provide an efficient and secure way to backup data.  The data deduplication
-technique used makes Borg suitable for daily backups since only changes are
-stored.  The authenticated encryption technique makes it suitable for backups
-to not fully trusted targets.  Borg is a fork of Attic.")
-    (home-page "https://borgbackup.github.io/borgbackup/")
-    (license license:bsd-3)))
@@ -1,11 +1,10 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -74,18 +73,16 @@ command-line arguments, multiple languages, and so on.")
 (define-public grep
  (package
   (name "grep")
-   (version "2.22")
+   (version "2.21")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/grep/grep-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa"))
-            (patches
-             (list (search-patch "grep-timing-sensitive-test.patch")))))
+              "1pp5n15qwxrw1pibwjhhgsibyv5cafhamf8lwzjygs6y00fa2i2j"))
+            (patches (list (search-patch "grep-CVE-2015-1345.patch")))))
   (build-system gnu-build-system)
-   (native-inputs `(("perl" ,perl)))             ;some of the tests require it
   (synopsis "Print lines matching a pattern")
   (description
     "grep is a tool for finding text inside files.  Text is found by
@@ -173,7 +170,7 @@ standard utility.")
                "16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx"))
              (patches (list (search-patch "patch-hurd-path-max.patch")))))
   (build-system gnu-build-system)
-   (native-inputs `(("ed" ,ed)))
+   (native-inputs `(("ed", ed)))
   (synopsis "Apply differences to originals, with optional backups")
   (description
    "Patch is a program that applies changes to files based on differences
@@ -209,17 +206,17 @@ interactive means to merge two files.")
 (define-public findutils
  (package
   (name "findutils")
-   (version "4.6.0")
+   (version "4.4.2")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/findutils/findutils-"
                                version ".tar.gz"))
            (sha256
             (base32
-              "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y"))
+              "0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks3"))
            (patches (map search-patch
-                          '("findutils-localstatedir.patch"
-                            "findutils-test-xargs.patch")))))
+                          '("findutils-absolute-paths.patch"
+                            "findutils-localstatedir.patch")))))
   (build-system gnu-build-system)
   (arguments
    `(#:configure-flags (list
@@ -327,7 +324,7 @@ functionality beyond that which is outlined in the POSIX standard.")
              "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb"))
            (patches (list (search-patch "make-impure-dirs.patch")))))
   (build-system gnu-build-system)
-   (native-inputs `(("pkg-config" ,pkg-config)))  ; to detect Guile
+   (native-inputs `(("pkg-config", pkg-config)))  ; to detect Guile
   (inputs `(("guile" ,guile-2.0)))
   (outputs '("out" "debug"))
   (arguments
@@ -488,8 +485,7 @@ store.")
                          '("glibc-ldd-x86_64.patch"
                            "glibc-locale-incompatibility.patch"
                            "glibc-versioned-locpath.patch"
-                            "glibc-o-largefile.patch"
-                            "glibc-CVE-2015-7547.patch")))))
+                            "glibc-o-largefile.patch")))))
   (build-system gnu-build-system)

   ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
@@ -599,15 +595,6 @@ store.")
                         (string-append "#define _PATH_BSHELL \""
                                        bash "/bin/bash\"\n")))

-                      ;; Nscd uses __DATE__ and __TIME__ to create a string to
-                      ;; make sure the client and server come from the same
-                      ;; libc.  Use something deterministic instead.
-                      (substitute* "nscd/nscd_stat.c"
-                        (("static const char compilation\\[21\\] =.*$")
-                         (string-append
-                          "static const char compilation[21] = \""
-                          (string-take (basename out) 20) "\";\n")))
-
                      ;; Make sure we don't retain a reference to the
                      ;; bootstrap Perl.
                      (substitute* "malloc/mtrace.pl"
@@ -646,21 +633,6 @@ with the Linux kernel.")
   (license lgpl2.0+)
   (home-page "http://www.gnu.org/software/libc/")))

-(define-public glibc-2.21
-  ;; The old libc, which we use mostly to build locale data in the old format
-  ;; (which the new libc can cope with.)
-  (package
-    (inherit glibc)
-    (version "2.21")
-    (source (origin
-              (inherit (package-source glibc))
-              (uri (string-append "mirror://gnu/glibc/glibc-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf"))
-              (patches (list (search-patch "glibc-ldd-x86_64.patch")))))))
-
 (define-public glibc-locales
  (package
    (inherit glibc)
@@ -875,7 +847,7 @@ command.")
 (define-public tzdata
  (package
    (name "tzdata")
-    (version "2015g")
+    (version "2015c")
    (source (origin
             (method url-fetch)
             (uri (string-append
@@ -883,7 +855,7 @@ command.")
                   version ".tar.gz"))
             (sha256
              (base32
-               "0qb1awqrn3215zd2jikpqnmkzrxwfjf0d3dw2xmnk4c40yzws8xr"))))
+               "0nin48g5dmkfgckp25bngxchn3sw3yyjss5sq7gs5xspbxgsq3w6"))))
    (build-system gnu-build-system)
    (arguments
     '(#:tests? #f
@@ -930,7 +902,7 @@ command.")
                                version ".tar.gz"))
                          (sha256
                           (base32
-                            "1i3y1kzjiz2j62c7vd4wf85983sqk9x9lg3473njvbdz4kph5r0q"))))))
+                            "0bplibiy70dvlrhwqzkzxgmg81j6d2kklvjgi2f1g2zz1nkb3vkz"))))))
    (home-page "http://www.iana.org/time-zones")
    (synopsis "Database of current and historical time zones")
    (description "The Time Zone Database (often called tz or zoneinfo)
@@ -1,7 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -93,11 +92,7 @@
   (36 "0z6jbyy70lfdm6d3x0sbazbqdxb3xnpn9bmz7madpvrnbd284pxc")
   (37 "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k")
   (38 "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd")
-   (39 "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b")
-   (40 "0sypv66vsldmc95gwvf7ylz1k7y37vnvdsjg8ajjr6b2j9mkkfw4")
-   (41 "06ic2gdpbi1afik3wqf9d4vh95if4bz8bmhcgr555621dsb35i2f")
-   (42 "06a90k0p6bqc4wk2dsmapna69124an76xvlnlj3xm497vci968dc")))
-
+   (39 "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b")))
 (define (download-patches store count)
  "Download COUNT Bash patches into store.  Return a list of
 number/base32-hash tuples, directly usable in the 'patch-series' form."
@@ -148,18 +143,17 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
             ;; guile-bash expect.
             (let ((include (string-append (assoc-ref outputs "include")
                                            "/include/bash"))
-                   (includes "^\\./include/[^/]+\\.h$")
                   (headers "^\\./(builtins/|lib/glob/|lib/tilde/|)[^/]+\\.h$"))
               (mkdir-p include)
               (for-each (lambda (file)
-                           (when (string-match includes file)
-                             (install-file file include))
-                           (when (string-match headers file)
-                             (install-file file
-                                           (string-append include "/"
-                                                          (dirname file)))))
+                           (when ((@ (ice-9 regex) string-match) headers file)
+                             (let ((directory (string-append include "/"
+                                                             (dirname file))))
+                               (mkdir-p directory)
+                               (copy-file file
+                                          (string-append directory "/"
+                                                         (basename file))))))
                         (find-files "." "\\.h$"))
-               (delete-file (string-append include "/" "y.tab.h"))
               #t)))
         (version "4.3"))
    (package
@@ -183,9 +177,8 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
     (build-system gnu-build-system)

     (outputs '("out"
-                "doc"                         ;1.7 MiB of HTML and extra files
-                "include"))                   ;headers used by extensions
-     (native-inputs `(("bison" ,bison)))      ;to rebuild the parser
+                "include"))                       ;headers used by extensions
+     (native-inputs `(("bison" ,bison)))          ;to rebuild the parser
     (inputs `(("readline" ,readline)
               ("ncurses" ,ncurses)))             ;TODO: add texinfo
     (arguments
@@ -198,7 +191,7 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."

        ;; Bash is reportedly not parallel-safe.  See, for instance,
        ;; <http://patches.openembedded.org/patch/32745/> and
-        ;; <http://git.buildroot.net/buildroot/commit/?h=79e2d802a>.
+        ;; <http://git.buildroot.net/buildroot/commit/?h=79e2d802ae7e376a413c02097790493e1f65c3a4>.
        #:parallel-build? #f
        #:parallel-tests? #f

@@ -206,14 +199,10 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
        ;; for now.
        #:tests? #f

-        #:modules ((ice-9 regex)
-                   (guix build utils)
-                   (guix build gnu-build-system))
-
        #:phases (modify-phases %standard-phases
                   (add-after 'install 'post-install ,post-install-phase)
                   (add-after 'install 'install-headers
-                     ,install-headers-phase))))
+                              ,install-headers-phase))))
     (synopsis "The GNU Bourne-Again SHell")
     (description
      "Bash is the shell, or command-line interpreter, of the GNU system.  It
@@ -301,10 +290,8 @@ without modification.")
                          (completions (string-append out
                                                      "/share/bash-completion"
                                                      "/completions"))
-                          (already     (find-files
-                                        (string-append
-                                         util-linux
-                                         "/etc/bash_completion.d"))))
+                          (already     (find-files (string-append util-linux
+                                                                  "/etc/bash_completion.d"))))
                     (with-directory-excursion completions
                       (for-each (lambda (file)
                                   (when (file-exists? file)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -39,9 +39,7 @@
   (arguments
    ;; Make it so that we don't rely on /proc.  This is especially useful in
    ;; an initrd run before /proc is mounted.
-    '(#:configure-flags '("CPPFLAGS=-DUSE_LIBC_PRIVATES"
-                          ;; Install gc_cpp.h et al.
-                          "--enable-cplusplus")))
+    '(#:configure-flags '("CPPFLAGS=-DUSE_LIBC_PRIVATES")))
   (outputs '("out" "debug"))
   (synopsis "The Boehm-Demers-Weiser conservative garbage collector
 for C and C++")
@@ -105,4 +103,4 @@ lock-free code, experiment with thread programming paradigms, etc.")
    (inputs `(("libatomic-ops" ,libatomic-ops)))

    ;; 'USE_LIBC_PRIVATES' is now the default.
-    (arguments '(#:configure-flags '("--enable-cplusplus")))))
+    (arguments '())))
@@ -1,8 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
-;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,28 +21,22 @@
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system python)
  #:use-module (guix build-system glib-or-gtk)
  #:use-module ((guix licenses) #:prefix l:)
-  #:use-module (gnu packages adns)
-  #:use-module (gnu packages check)
-  #:use-module (gnu packages compression)
+  #:use-module (gnu packages libevent)
  #:use-module (gnu packages curl)
-  #:use-module (gnu packages cyrus-sasl)
-  #:use-module (gnu packages databases)
+  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages file)
+  #:use-module (gnu packages linux)
+  #:use-module ((gnu packages compression)
+                #:select (zlib))
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages libevent)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages multiprecision)
-  #:use-module (gnu packages nettle)
+  #:use-module (gnu packages check)
  #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages ssh)
-  #:use-module (gnu packages tls)
-  #:use-module (gnu packages xml))
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages cyrus-sasl)
+  #:use-module (gnu packages tls))

 (define-public transmission
  (package
@@ -157,89 +149,3 @@ full encryption, DHT, PEX, and Magnet Links.  It can also be controlled via
 XML-RPC over SCGI.")
    (home-page "https://github.com/rakshasa/rtorrent")
    (license l:gpl2+)))
-
-(define-public transmission-remote-cli
-  (package
-    (name "transmission-remote-cli")
-    (version "1.7.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/fagga/"
-                                  "transmission-remote-cli/archive/v"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1y0hkpcjf6jw9xig8yf484hbhy63nip0pkchx401yxj81m25l4z9"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:python ,python-2 ; only supports Python 2
-       #:tests? #f ; no test suite
-       #:phases (modify-phases %standard-phases
-                  ;; The software is just a Python script that must be
-                  ;; copied into place.
-                  (delete 'build)
-                  (replace 'install
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let* ((out (assoc-ref outputs "out"))
-                             (bin (string-append out "/bin"))
-                             (man (string-append out "/share/man/man1"))
-                             ;; FIXME install zsh completions
-                             (completions (string-append out "/etc/bash_completion.d")))
-                        (install-file "transmission-remote-cli" bin)
-                        (install-file "transmission-remote-cli.1" man)
-                        (install-file
-                          (string-append
-                            "completion/bash/"
-                            "transmission-remote-cli-bash-completion.sh")
-                          completions)))))))
-    (synopsis "Console client for the Transmission BitTorrent daemon")
-    (description "Transmission-remote-cli is a console client, with a curses
-interface, for the Transmission BitTorrent daemon.")
-    (home-page "https://github.com/fagga/transmission-remote-cli")
-    (license l:gpl3+)))
-
-(define-public aria2
-  (package
-    (name "aria2")
-    (version "1.21.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/tatsuhiro-t/aria2/"
-                                  "releases/download/release-" version "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1035rzx9y7qv4p7cv04f461343dxha7ikprch059x2fci8n5yp12"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:configure-flags '("--enable-libaria2")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'delete-socket-tests
-           (lambda _
-             (substitute* "test/LpdMessageDispatcherTest.cc"
-               (("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageDispatcherTest\\);" text)
-                (string-append "// " text)))
-             (substitute* "test/LpdMessageReceiverTest.cc"
-               (("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageReceiverTest\\);" text)
-                (string-append "// " text))))))))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("c-ares" ,c-ares)
-       ("cppunit" ,cppunit) ; for the tests
-       ("gnutls" ,gnutls)
-       ("gmp" ,gmp)
-       ("libssh2" ,libssh2)
-       ("libxml2" ,libxml2)
-       ("nettle" ,nettle)
-       ("sqlite" ,sqlite)
-       ("zlib" ,zlib)))
-    (home-page "http://aria2.sourceforge.net/")
-    (synopsis "Utility for parallel downloading files")
-    (description
-      "Aria2 is a lightweight, multi-protocol & multi-source command-line
-download utility.  It supports HTTP/HTTPS, FTP, SFTP, BitTorrent and Metalink.
-Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.")
-    (license l:gpl2+)))
@@ -2,7 +2,6 @@
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -34,7 +33,7 @@
 (define-public boost
  (package
    (name "boost")
-    (version "1.60.0")
+    (version "1.58.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -43,7 +42,8 @@
                    ".tar.bz2"))
              (sha256
               (base32
-                "0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8"))))
+                "1rfkqxns60171q62cppiyzj8pmsbwp1l8jd7p6crriryqd7j1z7x"))
+              (patches (list (search-patch "boost-mips-avoid-m32.patch")))))
    (build-system gnu-build-system)
    (inputs `(("zlib" ,zlib)))
    (native-inputs
@@ -63,38 +63,38 @@
              ;; so we disable that too.
              ,@(if (string-prefix? "mips64" (or (%current-target-system)
                                                 (%current-system)))
-                    '("--without-context"
-                      "--without-coroutine" "--without-coroutine2")
+                    '("--without-context" "--without-coroutine")
                    '()))))
       `(#:tests? #f
         #:phases
-         (modify-phases %standard-phases
-           (replace
-            'configure
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((out (assoc-ref outputs "out")))
-                (substitute* '("libs/config/configure"
-                               "libs/spirit/classic/phoenix/test/runtest.sh"
-                               "tools/build/doc/bjam.qbk"
-                               "tools/build/src/engine/execunix.c"
-                               "tools/build/src/engine/Jambase"
-                               "tools/build/src/engine/jambase.c")
-                  (("/bin/sh") (which "sh")))
+         (alist-replace
+          'configure
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let ((out (assoc-ref outputs "out")))
+              (substitute* '("libs/config/configure"
+                             "libs/spirit/classic/phoenix/test/runtest.sh"
+                             "tools/build/doc/bjam.qbk"
+                             "tools/build/src/engine/execunix.c"
+                             "tools/build/src/engine/Jambase"
+                             "tools/build/src/engine/jambase.c")
+                (("/bin/sh") (which "sh")))

-                (setenv "SHELL" (which "sh"))
-                (setenv "CONFIG_SHELL" (which "sh"))
+              (setenv "SHELL" (which "sh"))
+              (setenv "CONFIG_SHELL" (which "sh"))

-                (zero? (system* "./bootstrap.sh"
-                                (string-append "--prefix=" out)
-                                "--with-toolset=gcc")))))
-           (replace
-            'build
-            (lambda* (#:key outputs #:allow-other-keys)
-              (zero? (system* "./b2" ,@build-flags))))
-           (replace
+              (zero? (system* "./bootstrap.sh"
+                              (string-append "--prefix=" out)
+                              "--with-toolset=gcc"))))
+          (alist-replace
+           'build
+           (lambda* (#:key outputs #:allow-other-keys)
+             (zero? (system* "./b2" ,@build-flags)))
+
+           (alist-replace
            'install
            (lambda* (#:key outputs #:allow-other-keys)
-              (zero? (system* "./b2" "install" ,@build-flags))))))))
+              (zero? (system* "./b2" "install" ,@build-flags)))
+            %standard-phases))))))

    (home-page "http://boost.org")
    (synopsis "Peer-reviewed portable C++ source libraries")
@@ -40,12 +40,12 @@
                "12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf"))))
    (build-system gnu-build-system)
    (arguments
-     `(#:phases
+     `(#:phases 
       (alist-replace
-        'configure
+        'configure 
        (lambda _ (zero? (system* "make" "defconfig")))
        (alist-replace
-         'check
+         'check 
         (lambda _
           (substitute* '("testsuite/du/du-s-works"
                          "testsuite/du/du-works")
@@ -70,7 +70,7 @@
             ;; So mark it with SKIP_KNOWN_BUGS like the others.
             ;; Presumably it wasn't known at the time of release ...
             ;; (It is strange that they release software which they know to have bugs)
-             (("testing \"grep -w \\^str doesn't match str not at the beginning\"")
+             (("testing \"grep -w \\^str doesn't match str not at the beginning\"") 
              "test x\"$SKIP_KNOWN_BUGS\" = x\"\" && testing \"grep -w ^str doesn't match str not at the beginning\""))

           ;; This test cannot possibly pass.
@@ -79,7 +79,7 @@
           (delete-file "testsuite/which/which-uses-default-path")
           (rmdir "testsuite/which")

-           (zero? (system* "make"
+           (zero? (system* "make" 
                           ;; "V=1"
                           "SKIP_KNOWN_BUGS=1"
                           "SKIP_INTERNET_TESTS=1"
@@ -1,6 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,16 +21,9 @@
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
-  #:use-module (guix build utils)
  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system python)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages databases)
-  #:use-module (gnu packages dav)
-  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages icu4c)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages python))
+  #:use-module (gnu packages perl))

 (define-public libical
  (package
@@ -58,70 +50,3 @@
     "Libical is an implementation of the iCalendar protocols and protocol
 data units.")
    (license lgpl2.1)))
-
-(define-public khal
-  (package
-    (name "khal")
-    (version "0.7.0")
-    (source (origin
-             (method url-fetch)
-             (uri (pypi-uri "khal" version))
-             (sha256
-              (base32
-               "00llxj7cv31mjsx0j6zxmyi9s1q20yvfkn025xcy8cv1ylfwic66"))
-             (modules '((guix build utils)))
-             ;; Patch broken path in 'doc' Makefile.
-             ;; Patch sent upstream: https://github.com/geier/khal/pull/307
-             (snippet
-               '(substitute* "doc/source/Makefile"
-                 (("../../../khal/khal/settings/khal.spec")
-                  "../../khal/settings/khal.spec" )))))
-    (build-system python-build-system)
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-        ;; Bug reported: https://github.com/geier/khal/issues/309
-        (add-after 'unpack 'disable-test
-          (lambda _
-            (substitute* "tests/khalendar_test.py"
-                         (("test_only_update_old_event")
-                          "disabled_only_update_old_event"))))
-        ;; Building the manpage requires khal to be installed.
-        (add-after 'install 'manpage
-          (lambda* (#:key outputs #:allow-other-keys)
-            (setenv "PYTHONPATH"
-                    (string-append
-                      (getenv "PYTHONPATH") ":" (assoc-ref outputs "out")))
-            (zero? (system* "make" "--directory=doc/" "man"))
-            (install-file
-              "doc/build/man/khal.1"
-              (string-append (assoc-ref outputs "out") "/share/man/man1"))))
-        ;; The tests require us to choose a timezone.
-        (replace 'check
-          (lambda* (#:key inputs #:allow-other-keys)
-            (setenv "TZ"
-                    (string-append (assoc-ref inputs "tzdata")
-                                   "/share/zoneinfo/Zulu"))
-            (zero? (system* "py.test" "tests")))))))
-    (native-inputs
-     `(("python-pytest" ,python-pytest)
-       ("python-setuptools-scm" ,python-setuptools-scm)
-       ;; Required for tests
-       ("tzdata" ,tzdata)
-       ;; Required to build manpage
-       ("python-sphinxcontrib-newsfeed" ,python-sphinxcontrib-newsfeed)
-       ("python-sphinx" ,python-sphinx)))
-    (inputs
-     `(("sqlite" ,sqlite)))
-    (propagated-inputs
-     `(("python-configobj" ,python-configobj)
-       ("python-dateutil-2" ,python-dateutil-2)
-       ("python-icalendar" ,python-icalendar)
-       ("python-tzlocal" ,python-tzlocal)
-       ("python-urwid" ,python-urwid)
-       ("python-pyxdg" ,python-pyxdg)
-       ("vdirsyncer" ,vdirsyncer)))
-    (synopsis "Console calendar program")
-    (description "Khal is a standards based console calendar program,
-able to synchronize with CalDAV servers through vdirsyncer.")
-    (home-page "http://lostpackets.de/khal/")
-    (license expat)))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,7 +28,7 @@
 (define-public ccache
  (package
    (name "ccache")
-    (version "3.2.4")
+    (version "3.2.2")
    (source
     (origin
      (method url-fetch)
@@ -36,7 +36,7 @@
                          version ".tar.xz"))
      (sha256
       (base32
-        "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w"))))
+        "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag"))))
    (build-system gnu-build-system)
    (native-inputs `(("perl" ,perl)))   ;for test.sh
    (inputs `(("zlib" ,zlib)))
@@ -46,6 +46,7 @@
                 (lambda _
                   (substitute* '("test/test_hashutil.c" "test.sh")
                     (("#!/bin/sh") (string-append "#!" (which "sh"))))
+                   (setenv "SHELL" (which "sh"))
                   #t)
                 %standard-phases)))
    (home-page "https://ccache.samba.org/")
@@ -3,7 +3,6 @@
 ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
-;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -44,14 +43,14 @@
 (define-public libcddb
  (package
    (name "libcddb")
-    (version "1.3.2")
+    (version "1.3.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://sourceforge/libcddb/libcddb-"
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim"))))
+               "1y8bfy12dwm41m1jahayn3v47dm34fmz7m9cjxyh7xcw6fp3lzaf"))))
    (build-system gnu-build-system)
    (arguments '(#:tests? #f))      ; tests rely on access to external servers
    (home-page "http://libcddb.sourceforge.net/")
@@ -126,14 +125,14 @@ libcdio.")
 (define-public xorriso
  (package
    (name "xorriso")
-    (version "1.4.2")
+    (version "1.4.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/xorriso/xorriso-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "1cq4a0904lnz6nygbgarnlq49cz4qnfdyvz90s3nfk5as7gbwhr8"))))
+               "0mhfxn2idkrw1i65a5y4gnb1fig85zpnszb9ax7w4a2v062y1l8b"))))
    (build-system gnu-build-system)
    (inputs
     `(("acl" ,acl)
@@ -158,8 +157,7 @@ files.")
    (version "10.2")
    (source (origin
             (method url-fetch)
-             (uri (string-append "http://downloads.xiph.org/releases/"
-                                 "cdparanoia/cdparanoia-III-"
+             (uri (string-append "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-"
                                 version ".src.tgz"))
             (sha256
              (base32
@@ -189,14 +187,14 @@ reconstruction capability.")
 (define-public dvdisaster
  (package
    (name "dvdisaster")
-    (version "0.79.5")
+    (version "0.72.6")
    (source (origin
             (method url-fetch)
             (uri (string-append "http://dvdisaster.net/downloads/dvdisaster-"
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w"))))
+               "0sqrprc5rh3shnfli25m2wy0i5f83db54iv04s5s7bxf77m7sy79"))))
    (build-system gnu-build-system)
    (inputs
     `(("gtk+" ,gtk+-2)))
@@ -208,7 +206,14 @@ reconstruction capability.")
     `(;; Parallel builds appear to be unsafe, see
       ;; <http://hydra.gnu.org/build/49331/nixlog/1/raw>.
       #:parallel-build? #f
-       #:tests? #f)) ; no check target
+       #:tests? #f ; no check target
+       #:phases
+         (alist-cons-before
+          'patch-source-shebangs 'sanitise
+          (lambda _
+            ;; delete dangling symlink
+            (delete-file ".#GNUmakefile"))
+          %standard-phases)))
    (home-page "http://dvdisaster.net/en/index.html")
    (synopsis "Error correcting codes for optical media images")
    (description "Optical media (CD,DVD,BD) keep their data only for a
@@ -233,7 +238,7 @@ capacity is user-selectable.")
    (version "1.4.0")
    (source (origin
             (method url-fetch)
-             (uri (string-append "https://github.com/lipnitsk/libcue/archive/v"
+             (uri (string-append "mirror://sourceforge/libcue/libcue-"
                                 version ".tar.bz2"))
             (sha256
              (base32
@@ -279,15 +284,15 @@ from an audio CD.")
 (define-public abcde
  (package
    (name "abcde")
-    (version "2.7.1")
-    (home-page "https://abcde.einval.com/")
+    (version "2.7")
+    (home-page "http://abcde.einval.com/")
    (source (origin
              (method url-fetch)
              (uri (string-append home-page "/download/abcde-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "0l7j0nk8p30s97285i418rv9ym9bgns7bn6l8gldw3mjhnby609l"))
+                "0ikpffzvacadh6vj9qlary8126j1zrd2knp9gvivmp7y1656jj01"))
              (modules '((guix build utils)))
              (snippet
               '(substitute* "Makefile"
@@ -297,36 +302,37 @@ from an audio CD.")
                   (string-append "etcdir = $(prefix)/etc\n"))))))
    (build-system gnu-build-system)
    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key outputs inputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("^prefix = .*$")
-                (string-append "prefix = "
-                               (assoc-ref outputs "out")
-                               "\n")))))
-         (add-after 'install 'wrap
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((wget   (assoc-ref inputs "wget"))
-                   (vorbis (assoc-ref inputs "vorbis-tools"))
-                   (parano (assoc-ref inputs "cdparanoia"))
-                   (which  (assoc-ref inputs "which"))
-                   (discid (assoc-ref inputs "cd-discid"))
-                   (out    (assoc-ref outputs "out")))
-               (define (wrap file)
-                 (wrap-program file
-                               `("PATH" ":" prefix
-                                 (,(string-append out "/bin:"
-                                                  wget "/bin:"
-                                                  which "/bin:"
-                                                  vorbis "/bin:"
-                                                  discid "/bin:"
-                                                  parano "/bin")))))
+     '(#:phases (alist-replace
+                 'configure
+                 (lambda* (#:key outputs inputs #:allow-other-keys)
+                   (substitute* "Makefile"
+                     (("^prefix = .*$")
+                      (string-append "prefix = "
+                                     (assoc-ref outputs "out")
+                                     "\n"))))
+                 (alist-cons-after
+                  'install 'wrap
+                  (lambda* (#:key inputs outputs #:allow-other-keys)
+                    (let ((wget   (assoc-ref inputs "wget"))
+                          (vorbis (assoc-ref inputs "vorbis-tools"))
+                          (parano (assoc-ref inputs "cdparanoia"))
+                          (which  (assoc-ref inputs "which"))
+                          (discid (assoc-ref inputs "cd-discid"))
+                          (out    (assoc-ref outputs "out")))
+                      (define (wrap file)
+                        (wrap-program file
+                                      `("PATH" ":" prefix
+                                        (,(string-append out "/bin:"
+                                                         wget "/bin:"
+                                                         which "/bin:"
+                                                         vorbis "/bin:"
+                                                         discid "/bin:"
+                                                         parano "/bin")))))

-               (for-each wrap
-                         (find-files (string-append out "/bin")
-                                     ".*"))))))
+                      (for-each wrap
+                                (find-files (string-append out "/bin")
+                                            ".*"))))
+                  %standard-phases))
       #:tests? #f))

    (inputs `(("wget" ,wget)
@@ -3,8 +3,6 @@
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,7 +26,6 @@
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix git-download)
-  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system trivial))

@@ -90,14 +87,15 @@ with a flexible variety of user interfaces.")
 (define-public cppunit
  (package
    (name "cppunit")
-    (version "1.13.2")
+    (version "1.12.1")
    (source (origin
             (method url-fetch)
-              (uri (string-append "http://dev-www.libreoffice.org/src/"
-                                  name "-" version ".tar.gz"))
+              (uri (string-append "mirror://sourceforge/cppunit/" name "/"
+                                  name "-"
+                                  version ".tar.gz"))
             (sha256
              (base32
-               "17s2kzmkw3kfjhpp72rfppyd7syr7bdq5s69syj2nvrlwd3d4irz"))))
+               "0jm49v5rmc5qw34vqs56gy8xja1dhci73bmh23cig4kcir6a0a5c"))))
    ;; Explicitly link with libdl. This is expected to be done by packages
    ;; relying on cppunit for their tests. However, not all of them do.
    ;; If we added the linker flag to such packages, we would pollute all
@@ -105,7 +103,7 @@ with a flexible variety of user interfaces.")
    (arguments
     `(#:make-flags '("LDFLAGS=-ldl")))
    (build-system gnu-build-system)
-    (home-page "https://wiki.freedesktop.org/www/Software/cppunit/")
+    (home-page "http://sourceforge.net/projects/cppunit/")
    (synopsis "Unit testing framework for C++")
    (description "CppUnit is the C++ port of the famous JUnit framework for
 unit testing.  Test output is in XML for automatic testing and GUI based for
@@ -115,17 +113,17 @@ supervised tests.")
 (define-public catch-framework
  (package
    (name "catch")
-    (version "1.3.5")                  ;Sub-minor is the build number
+    (version "1.1.3")                  ;Sub-minor is the build number
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/philsquared/Catch")
                    ;; Semi-arbitrary.
-                    (commit "ae5ee2cf63d6d67bd1369b512d2a7b60b571c907")))
+                    (commit "c51e86819d")))
              (file-name (string-append name "-" version))
              (sha256
               (base32
-                "1yfb3lxv929szqy1nw9xw3d45wzkppziqshkjxvrb1fdmf46x564"))))
+                "0kgi7wxxysgjbpisqfj4dj0k19cyyai92f001zi8gzkybd4fkgv5"))))
    (build-system trivial-build-system)
    (arguments
     `(#:modules ((guix build utils))
@@ -149,47 +147,3 @@ supervised tests.")
     "Catch stands for C++ Automated Test Cases in Headers and is a
 multi-paradigm automated test framework for C++ and Objective-C.")
    (license boost1.0)))
-
-(define-public cmocka
-  (package
-    (name "cmocka")
-    (version "1.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://cmocka.org/files/1.0/cmocka-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "0fvm6rdalqcxckbddch8ycdw6n2ckldblv117n09chi2l7bm0q5k"))))
-    (build-system cmake-build-system)
-    (arguments
-     `(#:tests? #f)) ; No test target
-    (home-page "https://cmocka.org/")
-    (synopsis "Unit testing framework for C")
-    (description "Cmocka is a unit testing framework for C with support for
-mock objects.  It only requires the standard C library, and works with
-different compilers.  Cmocka supports several different message output formats
-like Test Anything Protocol, Subunit, xUnit XML or the original cmockery output
-format.")
-    (license asl2.0)))
-
-(define-public cppcheck
-  (package
-    (name "cppcheck")
-    (version "1.72")
-    (source (origin
-      (method url-fetch)
-      (uri (string-append "https://github.com/danmar/cppcheck/archive/"
-                          version ".tar.gz"))
-      (sha256
-       (base32 "0zxaixhqi4vmj7xj56gzadggcbjhbjjm6abyr86qlan23sg98667"))
-      (file-name (string-append name "-" version ".tar.gz"))))
-    (build-system cmake-build-system)
-    (home-page "http://cppcheck.sourceforge.net")
-    (synopsis "Static C/C++ code analyzer")
-    (description "Cppcheck is a static code analyzer for C and C++.  Unlike
-C/C++ compilers and many other analysis tools it does not detect syntax errors
-in the code.  Cppcheck primarily detects the types of bugs that the compilers
-normally do not detect.  The goal is to detect only real errors in the code
-(i.e. have zero false positives).")
-    (license gpl3+)))
@@ -36,15 +36,15 @@
 (define-public cmake
  (package
    (name "cmake")
-    (version "3.3.2")
+    (version "3.3.1")
    (source (origin
             (method url-fetch)
-             (uri (string-append "https://www.cmake.org/files/v"
-                                 (version-major+minor version)
-                                 "/cmake-" version ".tar.gz"))
+             (uri (string-append
+                   "http://www.cmake.org/files/v"
+                   (version-major+minor version)
+                   "/cmake-" version ".tar.gz"))
             (sha256
-              (base32
-               "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7"))
+              (base32 "1mp32dqywk4dfw7zmpgp31axszv7h74yk69g273z21q7d8n04rfd"))
             (patches (list (search-patch "cmake-fix-tests.patch")))))
    (build-system gnu-build-system)
    (arguments
@@ -66,8 +66,7 @@
                         "Source/cmExecProgramCommand.cxx"
                         "Utilities/cmbzip2/Makefile-libbz2_so"
                         "Utilities/Release/release_cmake.cmake"
-                         "Utilities/cmlibarchive/libarchive/\
-archive_write_set_format_shar.c"
+                         "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c"
                         "Tests/CMakeLists.txt"
                         "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
                     (("/bin/sh") (which "sh"))))
@@ -77,7 +76,7 @@ archive_write_set_format_shar.c"
                    ;; Help cmake's bootstrap process to find system libraries
                    (begin
                      (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
-                      (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))
+                      (setenv "CMAKE_INCLUDE_PATH" (getenv "CPATH"))
                      ;; Get verbose output from failed tests
                      (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE")))
                  (alist-replace
@@ -2,7 +2,6 @@
 ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -68,14 +67,14 @@ a major mode for Emacs for examining the flowcharts that it produces.")
 (define-public complexity
  (package
    (name "complexity")
-    (version "1.10")
+    (version "1.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/complexity/complexity-"
-                                  version ".tar.xz"))
+                                  version ".tar.gz"))
              (sha256
               (base32
-                "0lr0l9kj2w3jilz9h9y4np9pf9i9ccpy6331lanki2fnz4z8ldvd"))))
+                "19bc64sxpqd5rqylqaa7dijz2x7qp2b0dg3ah3fb3qbcvd8b4wgy"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("texinfo" ,texinfo)
@@ -92,14 +91,14 @@ highlighting your own code that seemed comprehensible when you wrote it.")
 (define-public global                             ; a global variable
  (package
    (name "global")
-    (version "6.5.2")
+    (version "6.5.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/global/global-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "07qx3dbjwkbd1dn42qs7zgj77rxdj2psfrf7bx7yx9al38f87z60"))))
+               "1y34nbazsw2p6r2jhv27z15qvm9mhy5xjchpz8pwps00shkm578f"))))
    (build-system gnu-build-system)
    (inputs `(("ncurses" ,ncurses)
              ("libltdl" ,libltdl)
@@ -111,17 +110,18 @@ highlighting your own code that seemed comprehensible when you wrote it.")
             (string-append "--with-sqlite3="
                            (assoc-ref %build-inputs "sqlite")))

-       #:phases
-       (modify-phases %standard-phases
-        (add-after 'install 'post-install
-          (lambda* (#:key outputs #:allow-other-keys)
-            ;; Install the Emacs Lisp file in the right place.
-            (let* ((out  (assoc-ref outputs "out"))
-                   (data (string-append out "/share/gtags"))
-                   (lisp (string-append out "/share/emacs/site-lisp")))
-              (install-file (string-append data "/gtags.el") lisp)
-              (delete-file (string-append data "/gtags.el"))
-              #t))))))
+       #:phases (alist-cons-after
+                 'install 'post-install
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   ;; Install the Emacs Lisp file in the right place.
+                   (let* ((out  (assoc-ref outputs "out"))
+                          (data (string-append out "/share/gtags"))
+                          (lisp (string-append out "/share/emacs/site-lisp")))
+                     (install-file (string-append data "/gtags.el")
+                                   lisp)
+                     (delete-file (string-append data "/gtags.el"))
+                     #t))
+                 %standard-phases)))
    (home-page "http://www.gnu.org/software/global/")
    (synopsis "Cross-environment source code tag system")
    (description
@@ -190,7 +190,7 @@ COCOMO model or user-provided parameters.")
 (define-public the-silver-searcher
  (package
    (name "the-silver-searcher")
-    (version "0.31.0")
+    (version "0.29.1")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -198,7 +198,7 @@ COCOMO model or user-provided parameters.")
                    version ".tar.gz"))
              (sha256
               (base32
-                "1a3xncsq3x8pci194k484s5mdqij2sirpz6dj6711n2p8mzq5g31"))
+                "0ah7vcqprl9hhafi68bvzaiywy7dfm28zf7kpw3xrlqzfn0vg7kp"))
              (file-name (string-append name "-" version ".tar.gz"))))
    (build-system gnu-build-system)
    (native-inputs
@@ -280,35 +280,3 @@ stack traces.")
    ;; Sources are released under Expat license, but since BFD is licensed
    ;; under the GPLv3+ the combined work is GPLv3+ as well.
    (license license:gpl3+)))
-
-(define-public lcov
-  (package
-    (name "lcov")
-    (version "1.12")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/ltp/lcov-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "19wfifdpxxivhq9adbphanjfga9bg9spms9v7c3589wndjff8x5l"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:make-flags (let ((out (assoc-ref %outputs "out")))
-                      (list (string-append "PREFIX=" out)
-                            (string-append "BIN_DIR=" out "/bin")
-                            (string-append "MAN_DIR=" out "/share/man")))
-       #:phases (modify-phases %standard-phases
-                  (delete 'configure))
-       #:tests? #f))                              ;no 'check' target
-    (inputs `(("perl" ,perl)))
-    (home-page "http://ltp.sourceforge.net/coverage/lcov.php")
-    (synopsis "Code coverage tool that enhances GNU gcov")
-    (description
-     "LCOV is an extension of @command{gcov}, a tool part of the
-GNU@tie{}Binutils, which provides information about what parts of a program
-are actually executed (i.e., \"covered\") while running a particular test
-case.  The extension consists of a set of Perl scripts which build on the
-textual @command{gcov} output to implement the following enhanced
-functionality such as HTML output.")
-    (license license:gpl2+)))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
@@ -92,15 +92,12 @@
                                            ,@%bootstrap-inputs)
                                          #:guile %bootstrap-guile)))
     (package (inherit p)
-       (name "diffutils-boot0")
       (arguments `(#:tests? #f         ; the test suite needs diffutils
                    ,@(package-arguments p)))))))

 (define findutils-boot0
  (package-with-bootstrap-guile
-   (package-with-explicit-inputs (package
-                                   (inherit findutils)
-                                   (name "findutils-boot0"))
+   (package-with-explicit-inputs findutils
                                 `(("make" ,gnu-make-boot0)
                                   ("diffutils" ,diffutils-boot0) ; for tests
                                   ,@%bootstrap-inputs)
@@ -109,9 +106,7 @@

 (define file-boot0
  (package-with-bootstrap-guile
-   (package-with-explicit-inputs (package
-                                   (inherit file)
-                                   (name "file-boot0"))
+   (package-with-explicit-inputs file
                                 `(("make" ,gnu-make-boot0)
                                   ,@%bootstrap-inputs)
                                 (current-source-location)
@@ -209,8 +204,7 @@
                            "--disable-libssp"
                            "--disable-libquadmath"
                            "--disable-decimal-float")
-                      (remove (cut string-match
-                                "--(with-system-zlib|enable-languages.*)" <>)
+                      (remove (cut string-match "--enable-languages.*" <>)
                              ,flags)))
            ((#:phases phases)
             `(alist-cons-after
@@ -236,7 +230,7 @@
                                        (package-full-name lib)
                                        char-set:letter)
                                      ,(package-name lib)))
-                          (list gmp-6.0 mpfr mpc))))
+                          (list gmp mpfr mpc))))
               (alist-cons-after
                'install 'symlink-libgcc_eh
                (lambda* (#:key outputs #:allow-other-keys)
@@ -250,7 +244,7 @@
                      (symlink "libgcc.a" "libgcc_eh.a"))))
                ,phases))))))

-     (inputs `(("gmp-source" ,(package-source gmp-6.0))
+     (inputs `(("gmp-source" ,(package-source gmp))
               ("mpfr-source" ,(package-source mpfr))
               ("mpc-source" ,(package-source mpc))
               ("binutils-cross" ,binutils-boot0)
@@ -265,26 +259,11 @@
                                  (package-native-inputs gcc))))))

 (define perl-boot0
-  (let ((perl (package
-                (inherit perl)
-                (name "perl-boot0")
-                (replacement #f)
-                (arguments
-                 (substitute-keyword-arguments (package-arguments perl)
-                   ((#:phases phases)
-                    `(modify-phases ,phases
-                       ;; Pthread support is missing in the bootstrap compiler
-                       ;; (broken spec file), so disable it.
-                       (add-before 'configure 'disable-pthreads
-                         (lambda _
-                           (substitute* "Configure"
-                             (("^libswanted=(.*)pthread" _ before)
-                              (string-append "libswanted=" before))))))))))))
-   (package-with-bootstrap-guile
-    (package-with-explicit-inputs perl
-                                  %boot0-inputs
-                                  (current-source-location)
-                                  #:guile %bootstrap-guile))))
+  (package-with-bootstrap-guile
+   (package-with-explicit-inputs perl
+                                 %boot0-inputs
+                                 (current-source-location)
+                                 #:guile %bootstrap-guile)))

 (define (linux-libre-headers-boot0)
  "Return Linux-Libre header files for the bootstrap environment."
@@ -306,7 +285,7 @@
  ;; Also, use %BOOT0-INPUTS to avoid building Perl once more.
  (let ((texinfo (package (inherit texinfo)
                   (native-inputs '())
-                   (inputs `(("perl" ,perl-boot0))))))
+                   (inputs (alist-delete "ncurses" (package-inputs texinfo))))))
    (package-with-bootstrap-guile
     (package-with-explicit-inputs texinfo %boot0-inputs
                                   (current-source-location)
@@ -430,22 +409,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                                               (current-source-location)
                                               #:guile %bootstrap-guile)))
         (bison (package (inherit bison)
+                  (native-inputs `(("perl" ,perl-boot0)))
                  (propagated-inputs `(("m4" ,m4)))
                  (inputs '())                    ;remove Flex...
-                  (arguments
-                   '(#:tests? #f                  ;... and thus disable tests
-
-                     ;; Zero timestamps in liby.a; this must be done
-                     ;; explicitly here because the bootstrap Binutils don't
-                     ;; do that (default is "cru".)
-                     #:make-flags '("ARFLAGS=crD" "RANLIB=ranlib -D"
-                                    "V=1"))))))
-    (package
-      (inherit (package-with-bootstrap-guile
-                (package-with-explicit-inputs bison %boot0-inputs
-                                              (current-source-location)
-                                              #:guile %bootstrap-guile)))
-      (native-inputs `(("perl" ,perl-boot0))))))
+                  (arguments '(#:tests? #f)))))   ;... and thus disable tests
+   (package-with-bootstrap-guile
+    (package-with-explicit-inputs bison %boot0-inputs
+                                  (current-source-location)
+                                  #:guile %bootstrap-guile))))

 (define static-bash-for-glibc
  ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co.
@@ -453,19 +424,17 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                                  glibc-final-with-bootstrap-bash
                                  (car (assoc-ref %boot1-inputs "bash"))))
         (bash (package (inherit static-bash)
+                 (native-inputs `(("bison" ,bison-boot1)))
                 (arguments
                  `(#:guile ,%bootstrap-guile
-                    ,@(package-arguments static-bash)))))
-         (inputs `(("gcc" ,gcc)
-                   ("libc" ,glibc-final-with-bootstrap-bash)
-                   ,@(fold alist-delete %boot1-inputs
-                           '("gcc" "libc")))))
-    (package
-      (inherit (package-with-bootstrap-guile
-                (package-with-explicit-inputs bash inputs
-                                              (current-source-location)
-                                              #:guile %bootstrap-guile)))
-      (native-inputs `(("bison" ,bison-boot1))))))
+                    ,@(package-arguments static-bash))))))
+    (package-with-bootstrap-guile
+     (package-with-explicit-inputs bash
+                                   `(("gcc" ,gcc)
+                                     ("libc" ,glibc-final-with-bootstrap-bash)
+                                     ,@(fold alist-delete %boot1-inputs
+                                             '("gcc" "libc")))
+                                   (current-source-location)))))

 (define gettext-boot0
  ;; A minimal gettext used during bootstrap.
@@ -557,7 +526,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
     (arguments
      `(#:guile ,%bootstrap-guile
        #:implicit-inputs? #f
-        #:allowed-references ("out")
+
        #:out-of-source? #t
        #:phases (alist-cons-before
                  'configure 'chdir
@@ -579,25 +548,6 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
     (propagated-inputs '())
     (synopsis "GNU C++ standard library (intermediate)"))))

-(define zlib-final
-  ;; Zlib used by GCC-FINAL.
-  (package-with-bootstrap-guile
-   (package
-     (inherit zlib)
-     (arguments
-      `(#:guile ,%bootstrap-guile
-        #:implicit-inputs? #f
-        #:allowed-references ("out" ,glibc-final)
-        ,@(package-arguments zlib)))
-     (inputs %boot2-inputs))))
-
-(define ld-wrapper-boot3
-  ;; A linker wrapper that uses the bootstrap Guile.
-  (make-ld-wrapper "ld-wrapper-boot3"
-                   #:binutils binutils-final
-                   #:guile %bootstrap-guile
-                   #:bash (car (assoc-ref %boot2-inputs "bash"))))
-
 (define gcc-final
  ;; The final GCC.
  (package (inherit gcc-boot0)
@@ -612,7 +562,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
     `(#:guile ,%bootstrap-guile
       #:implicit-inputs? #f

-       #:allowed-references ("out" "lib" ,zlib-final
+       #:allowed-references ("out" "lib"
                             ,glibc-final ,static-bash-for-glibc)

       ;; Things like libasan.so and libstdc++.so NEED ld.so for some
@@ -632,16 +582,18 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                ((_ rest ...)
                 (loop rest)))))
           ((#:make-flags flags)
-            ;; Since $LIBRARY_PATH is not honored, add the relevant flags.
-            `(let ((zlib (assoc-ref %build-inputs "zlib")))
-               (map (lambda (flag)
-                      (if (string-prefix? "LDFLAGS=" flag)
-                          (string-append flag " -L"
-                                         (assoc-ref %build-inputs "libstdc++")
-                                         "/lib -L" zlib "/lib -Wl,-rpath="
-                                         zlib "/lib")
-                          flag))
-                    ,flags)))
+            ;; Since $LIBRARY_PATH and $CPATH are not honored, add the
+            ;; relevant flags.
+            `(cons (string-append "CPPFLAGS=-I"
+                                  (assoc-ref %build-inputs "libstdc++")
+                                  "/include")
+                   (map (lambda (flag)
+                          (if (string-prefix? "LDFLAGS=" flag)
+                              (string-append flag " -L"
+                                             (assoc-ref %build-inputs "libstdc++")
+                                             "/lib")
+                              flag))
+                        ,flags)))
           ((#:phases phases)
            `(alist-delete 'symlink-libgcc_eh ,phases)))))

@@ -653,15 +605,20 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                     ("static-bash" ,static-bash-for-glibc)
                     ,@(package-native-inputs gcc-boot0)))

-    (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0)))
+    (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp)))
              ("mpfr-source" ,(package-source mpfr))
              ("mpc-source" ,(package-source mpc))
-              ("ld-wrapper" ,ld-wrapper-boot3)
              ("binutils" ,binutils-final)
              ("libstdc++" ,libstdc++)
-              ("zlib" ,zlib-final)
              ,@%boot2-inputs))))

+(define ld-wrapper-boot3
+  ;; A linker wrapper that uses the bootstrap Guile.
+  (make-ld-wrapper "ld-wrapper-boot3"
+                   #:binutils binutils-final
+                   #:guile %bootstrap-guile
+                   #:bash (car (assoc-ref %boot2-inputs "bash"))))
+
 (define %boot3-inputs
  ;; 4th stage inputs.
  `(("gcc" ,gcc-final)
@@ -671,13 +628,11 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
 (define bash-final
  ;; Link with `-static-libgcc' to make sure we don't retain a reference
  ;; to the bootstrap GCC.
-  (package
-    (inherit (package-with-bootstrap-guile
-              (package-with-explicit-inputs (static-libgcc-package bash)
-                                            %boot3-inputs
-                                            (current-source-location)
-                                            #:guile %bootstrap-guile)))
-    (native-inputs `(("bison" ,bison-boot1)))))
+  (package-with-bootstrap-guile
+   (package-with-explicit-inputs (static-libgcc-package bash)
+                                 %boot3-inputs
+                                 (current-source-location)
+                                 #:guile %bootstrap-guile)))

 (define %boot4-inputs
  ;; Now use the final Bash.
@@ -747,9 +702,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
  ;; The final grep.  Gzip holds a reference to it (via zgrep), so it must be
  ;; built before gzip.
  (package-with-bootstrap-guile
-   (package-with-explicit-inputs (package
-                                   (inherit grep)
-                                   (native-inputs `(("perl" ,perl-boot0))))
+   (package-with-explicit-inputs grep
                                 %boot5-inputs
                                 (current-source-location)
                                 #:guile guile-final)))
@@ -871,10 +824,10 @@ and binaries, plus debugging symbols in the 'debug' output), and Binutils.")
              ("libc-debug" ,glibc-final "debug")))))

 (define-public gcc-toolchain-4.8
-  (gcc-toolchain gcc-4.8))
+  (gcc-toolchain gcc-final))

 (define-public gcc-toolchain-4.9
-  (gcc-toolchain gcc-final))
+  (gcc-toolchain gcc-4.9))

 (define-public gcc-toolchain-5
  (gcc-toolchain gcc-5))
@@ -7,8 +7,7 @@
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
-;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
+;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,17 +32,15 @@
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system perl)
-  #:use-module (gnu packages backup)
  #:use-module (gnu packages base)
  #:use-module (gnu packages perl)
-  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages valgrind)
  #:use-module ((srfi srfi-1) #:select (last)))

 (define-public zlib
  (package
    (name "zlib")
-    (version "1.2.8")
+    (version "1.2.7")
    (source
     (origin
      (method url-fetch)
@@ -53,7 +50,7 @@
                                 version ".tar.gz")))
      (sha256
       (base32
-        "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n"))))
+        "1i96gsdvxqb6skp9a58bacf1wxamwi9m9pg4yn7cpf7g7239r77s"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases (alist-replace
@@ -244,7 +241,7 @@ decompression.")
               "1vk6065dv3a47p86vmp8hv3n1ygd9hraz0gq89gvzlx7lmcb6fsp"))))
    (build-system gnu-build-system)
    (inputs
-     `(("bzip2" ,bzip2)))
+     `(("bzip2", bzip2)))
    (arguments
     `(#:tests? #f ; no tests
       #:phases (modify-phases %standard-phases
@@ -263,16 +260,14 @@ compressed with pbzip2 can be decompressed with bzip2).")
 (define-public xz
  (package
   (name "xz")
-   (version "5.2.2")
+   (version "5.0.4")
   (source (origin
            (method url-fetch)
-            (uri (list (string-append "http://tukaani.org/xz/xz-" version
-                                      ".tar.gz")
-                       (string-append "http://multiprecision.org/guix/xz-"
-                                      version ".tar.gz")))
+            (uri (string-append "http://tukaani.org/xz/xz-" version
+                                ".tar.gz"))
            (sha256
             (base32
-              "18h2k4jndhzjs8ln3a54qdnfv59y6spxiwh9gpaqniph6iflvpvk"))))
+              "1dl35ca8fdss9z2d6y234gxh24ixq904xksizrjmjr5dimwhax6n"))))
   (build-system gnu-build-system)
   (synopsis "General-purpose data compression")
   (description
@@ -662,29 +657,3 @@ multiple processors and multiple cores when compressing data.")
    ;; Things under zopfli/ are under ASL2.0, but 4 files at the top-level,
    ;; written by Mark Adler, are under another non-copyleft license.
    (license license:asl2.0)))
-
-(define-public pixz
-  (package
-    (name "pixz")
-    (version "1.0.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/vasi/pixz/releases/download/v" version
-                    "/pixz-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1s3j7zw6j5zi3fhdxg287ndr3wf6swac7z21mqd1pyiln530gi82"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("libarchive" ,libarchive)))
-    (home-page "https://github.com/vasi/pixz")
-    (synopsis "Parallel indexing implementation of LZMA")
-    (description
-     "The existing XZ Utils provide great compression in the .xz file format,
-but they produce just one big block of compressed data.  Pixz instead produces
-a collection of smaller blocks which makes random access to the original data
-possible and can compress in parallel.  This is especially useful for large
-tarballs.")
-    (license license:bsd-2)))
@@ -76,7 +76,7 @@ services (Search, Gmail, Maps, Reader, etc.), Del.icio.us, Reddit, Last.fm and
 YouTube.  For easier editing of form fields, it can spawn external editors.")
    (home-page "http://conkeror.org")
    ;; Conkeror is triple licensed.
-    (license (list
-              ;; MPL 1.1 -- this license is not GPL compatible
-              license:gpl2
-              license:lgpl2.1))))
+    (license (list license:gpl2
+                   license:lgpl2.1
+                   ;; MPL 1.1 -- this license is not GPL compatible
+                   ))))
@@ -35,17 +35,17 @@
       (method url-fetch)
       (uri (string-append
             "http://miller.emu.id.au/pmiller/software/cook/cook-" version
-             ".tar.gz"))
+             ".tar.gz")) 
       (sha256
        (base32
         "104saqnqql1l7zr2pm3f718fdky3ds8j07c6xvwrs1rfkhrw58yw"))))
    (build-system gnu-build-system)
    (arguments
     `(#:parallel-build? #f ; There are some nasty racy rules in the Makefile.
-       #:phases
+       #:phases 
       (alist-cons-before
        'configure 'pre-conf
-        (lambda _
+        (lambda _ 
          (substitute* (append '("common/env.c")
                               (find-files "test" "\\.sh"))
            (("/bin/sh") (which "sh")))
@@ -57,7 +57,7 @@
          ;; which plays havoc with this test, for which correct timestamps
          ;; are very important. Adding the U flag undoes the effect of
          ;; --enable-deterministic-archives and allows this test to work
-          ;; again.
+          ;; again.   
          (substitute* "test/00/t0077a.sh"
            (("ar qc") "ar qcU"))

@@ -35,8 +35,7 @@
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "0vi9q475h1rki53100zml75vxsykzyhrn70hidy41s5c2rc8r6bh"))
-             (patches (list (search-patch "cpio-CVE-2016-2037.patch")))))
+               "0vi9q475h1rki53100zml75vxsykzyhrn70hidy41s5c2rc8r6bh"))))
    (build-system gnu-build-system)
    (home-page "https://www.gnu.org/software/cpio/")
    (synopsis "Manage cpio and tar file archives")
--- a/Show More
+++ b/Show More