Update NEWS.

mapped-devices: raid-device-mapping: Avoid non-top-level 'use-modules'.
Fixes <http://bugs.gnu.org/24135>. Reported by myglc2 <myglc2@gmail.com>. * gnu/system/mapped-devices.scm (open-raid-device): Avoid non-top-level 'use-modules' form.
2026-07-07 23:24:05 +02:00 · 2016-08-03 00:28:02 +02:00 · 2016-08-03 00:07:06 +02:00 · 2016-08-02 23:51:12 +02:00 · 2016-08-02 23:43:29 +02:00 · 2016-08-02 23:43:29 +02:00
655 changed files with 49727 additions and 31324 deletions
@@ -41,6 +41,8 @@
   (eval . (put 'with-atomic-file-output 'scheme-indent-function 1))
   (eval . (put 'call-with-compressed-output-port 'scheme-indent-function 2))
   (eval . (put 'call-with-decompressed-port 'scheme-indent-function 2))
+   (eval . (put 'call-with-gzip-input-port 'scheme-indent-function 1))
+   (eval . (put 'call-with-gzip-output-port 'scheme-indent-function 1))
   (eval . (put 'signature-case 'scheme-indent-function 1))
   (eval . (put 'emacs-batch-eval 'scheme-indent-function 0))
   (eval . (put 'emacs-batch-edit-file 'scheme-indent-function 1))
@@ -59,6 +61,7 @@
   (eval . (put 'run-with-store 'scheme-indent-function 1))
   (eval . (put 'run-with-state 'scheme-indent-function 1))
   (eval . (put 'wrap-program 'scheme-indent-function 1))
+   (eval . (put 'with-imported-modules 'scheme-indent-function 1))

   (eval . (put 'call-with-container 'scheme-indent-function 1))
   (eval . (put 'container-excursion 'scheme-indent-function 1))
@@ -35,6 +35,7 @@
 /doc/guix.ky
 /doc/guix.pg
 /doc/guix.toc
+/doc/guix.t2p
 /doc/guix.tp
 /doc/guix.vr
 /doc/guix.vrs
@@ -12,6 +12,7 @@ Ben Woodcroft <donttrustben@gmail.com> <b.woodcroft@uq.edu.au>
 Ben Woodcroft <donttrustben@gmail.com> <donttrustben near gmail.com>
 Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
 Cyprien Nicolas <cyprien@nicolas.tf> <c.nicolas+gitorious@gmail.com>
+Danny Milosavljevic <dannym@scratchpost.org> <dannym+a@scratchpost.org>
 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>
@@ -23,17 +24,22 @@ 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>
+Kei Kebreau <kei@openmailbox.org>
 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>
 Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
-Nils Gillmann <niasterisk@grrlz.net> <ng@niasterisk.space>
+ng0 <ng0@we.make.ritual.n0.is> <niasterisk@grrlz.net>
+ng0 <ng0@we.make.ritual.n0.is> <ng@niasterisk.space>
+ng0 <ng0@we.make.ritual.n0.is> <ng0@libertad.pw>
 Pjotr Prins <pjotr.public01@thebird.nl>
 Pjotr Prins <pjotr.public01@thebird.nl> <pjotr.public12@thebird.nl>
 Raimon Grau <raimonster@gmail.com> <raimon@3scale.net>
+Raymond Nicholson <rain1@openmailbox.org>
 Ricardo Wurmus <rekado@elephly.net>
 Ricardo Wurmus <rekado@elephly.net> <ricardo.wurmus@mdc-berlin.de>
 Sou Bunnbu (宋文武) <iyzsong@gmail.com>
 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 Tomáš Čech <sleep_walker@gnu.org> <sleep_walker@suse.cz>
+Tobias Geerinckx-Rice <me@tobias.gr> <tobias.geerinckx.rice@gmail.com>
@@ -1,5 +1,8 @@
 Contributor Code of Conduct

+  Note: In the sequel, "project" refers to GNU Guix, and "project
+  maintainer(s)" refers to maintainer(s) of GNU Guix.
+
 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
@@ -2,7 +2,7 @@

 #+TITLE: Hacking GNU Guix and Its Incredible Distro

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

  Copying and distribution of this file, with or without modification,
@@ -35,6 +35,14 @@ upgrading GnuTLS or GLib.)  We have a mailing list for commit notifications
 (guix-commits@gnu.org), so people can notice.  Before pushing your changes,
 make sure to run ‘git pull --rebase’.

+All commits that are pushed to the central repository on Savannah must be
+signed with an OpenPGP key, and the public key should be uploaded to your user
+account on Savannah and to public key servers, such as ‘pgp.mit.edu’.  To
+configure Git to automatically sign commits, run:
+
+  git config commit.gpgsign true
+  git config user.signingkey CABBA6EA1DC0FF33
+
 For anything else, please post to guix-devel@gnu.org and leave time for a
 review, without committing anything.  If you didn’t receive any reply
 after two weeks, and if you’re confident, it’s OK to commit.
@@ -27,7 +27,7 @@ nodist_noinst_SCRIPTS =				\
  pre-inst-env					\
  test-env

-include gnu-system.am
+include gnu/local.mk

 MODULES =					\
  guix/base32.scm				\
@@ -38,10 +38,12 @@ MODULES =					\
  guix/hash.scm					\
  guix/pk-crypto.scm				\
  guix/pki.scm					\
+  guix/combinators.scm				\
  guix/utils.scm				\
  guix/sets.scm					\
  guix/download.scm				\
  guix/git-download.scm				\
+  guix/hg-download.scm				\
  guix/monads.scm				\
  guix/monad-repl.scm				\
  guix/gexp.scm					\
@@ -55,6 +57,7 @@ MODULES =					\
  guix/licenses.scm				\
  guix/graph.scm				\
  guix/cve.scm					\
+  guix/zlib.scm					\
  guix/build-system.scm				\
  guix/build-system/ant.scm			\
  guix/build-system/cmake.scm			\
@@ -81,6 +84,7 @@ MODULES =					\
  guix/build/cmake-build-system.scm		\
  guix/build/emacs-build-system.scm		\
  guix/build/git.scm				\
+  guix/build/hg.scm				\
  guix/build/glib-or-gtk-build-system.scm	\
  guix/build/gnu-build-system.scm		\
  guix/build/gnu-dist.scm			\
@@ -98,6 +102,7 @@ MODULES =					\
  guix/build/rpath.scm				\
  guix/build/cvs.scm				\
  guix/build/svn.scm				\
+  guix/build/syscalls.scm                       \
  guix/build/gremlin.scm			\
  guix/build/emacs-utils.scm			\
  guix/build/graft.scm				\
@@ -154,13 +159,6 @@ MODULES +=					\

 endif

-if BUILD_SYSCALLS_MODULE
-
-MODULES +=					\
-  guix/build/syscalls.scm
-
-endif
-
 if BUILD_DAEMON_OFFLOAD

 MODULES +=					\
@@ -173,8 +171,8 @@ dist_noinst_DATA = guix/tests.scm

 # 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.7-i686.conf	\
+  gnu/packages/linux-libre-4.7-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	\
@@ -231,6 +229,7 @@ SCM_TESTS =					\
  tests/ui.scm					\
  tests/records.scm				\
  tests/upstream.scm				\
+  tests/combinators.scm				\
  tests/utils.scm				\
  tests/build-utils.scm				\
  tests/packages.scm				\
@@ -246,6 +245,7 @@ SCM_TESTS =					\
  tests/profiles.scm				\
  tests/syscalls.scm				\
  tests/gremlin.scm				\
+  tests/bournish.scm				\
  tests/lint.scm				\
  tests/publish.scm				\
  tests/scripts.scm				\
@@ -253,6 +253,7 @@ SCM_TESTS =					\
  tests/graph.scm				\
  tests/challenge.scm				\
  tests/cve.scm					\
+  tests/zlib.scm				\
  tests/file-systems.scm			\
  tests/system.scm				\
  tests/services.scm				\
@@ -293,10 +294,14 @@ endif BUILD_DAEMON

 TESTS = $(SCM_TESTS) $(SH_TESTS)

-AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)"
+AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" GUILE_AUTO_COMPILE=0

-SCM_LOG_COMPILER = $(top_builddir)/test-env $(GUILE)
-AM_SCM_LOG_FLAGS = --no-auto-compile -L "$(top_srcdir)"
+SCM_LOG_DRIVER =				\
+  $(top_builddir)/test-env --quiet-stderr	\
+  $(GUILE) --no-auto-compile -e main		\
+      $(top_srcdir)/build-aux/test-driver.scm
+
+AM_SCM_LOG_DRIVER_FLAGS = --brief=yes

 SH_LOG_COMPILER = $(top_builddir)/test-env $(SHELL)
 AM_SH_LOG_FLAGS = -x -e
@@ -324,6 +329,12 @@ check-local:

 endif !CAN_RUN_TESTS

+check-system: $(GOBJECTS)
+	$(AM_V_at)$(top_builddir)/pre-inst-env			\
+	   $(GUILE) --no-auto-compile				\
+	   -e '(@@ (run-system-tests) run-system-tests)'	\
+	   $(top_srcdir)/build-aux/run-system-tests.scm
+
 # Public key used to sign substitutes from hydra.gnu.org.
 dist_pkgdata_DATA = hydra.gnu.org.pub

@@ -338,6 +349,7 @@ EXTRA_DIST =						\
  .dir-locals.el					\
  build-aux/build-self.scm				\
  build-aux/compile-all.scm				\
+  build-aux/hydra/evaluate.scm				\
  build-aux/hydra/gnu-system.scm			\
  build-aux/hydra/demo-os.scm				\
  build-aux/hydra/guix.scm				\
@@ -346,6 +358,8 @@ EXTRA_DIST =						\
  build-aux/download.scm				\
  build-aux/make-binary-tarball.scm			\
  build-aux/generate-authors.scm			\
+  build-aux/test-driver.scm				\
+  build-aux/run-system-tests.scm			\
  srfi/srfi-37.scm.in					\
  srfi/srfi-64.scm					\
  srfi/srfi-64.upstream.scm				\
@@ -365,13 +379,6 @@ EXTRA_DIST +=					\

 endif !BUILD_DAEMON_OFFLOAD

-if !BUILD_SYSCALLS_MODULE
-
-EXTRA_DIST +=					\
-  guix/build/syscalls.scm
-
-endif !BUILD_SYSCALLS_MODULE
-

 CLEANFILES =					\
  $(GOBJECTS)					\
@@ -382,11 +389,13 @@ CLEANFILES =					\
 # 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.
+# the whole thing.  Likewise, set 'XDG_CACHE_HOME' to avoid loading possibly
+# stale files from ~/.cache/guile/ccache.
 %.go: make-go ; @:
 make-go: $(MODULES) guix/config.scm guix/tests.scm
 	$(AM_V_at)echo "Compiling Scheme modules..." ;			\
 	unset GUILE_LOAD_COMPILED_PATH ;				\
+	XDG_CACHE_HOME=/nowhere						\
 	host=$(host) srcdir="$(top_srcdir)"				\
 	$(top_builddir)/pre-inst-env					\
 	$(GUILE) -L "$(top_builddir)" -L "$(top_srcdir)"		\
@@ -413,11 +422,11 @@ install-data-hook: set-bootstrap-executable-permissions
 SUBDIRS = po/guix po/packages
 BUILT_SOURCES =

-include doc.am
+include doc/local.mk

 if BUILD_DAEMON

-include daemon.am
+include nix/local.mk

 endif BUILD_DAEMON

@@ -434,7 +443,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS =			\

 dist_emacsui_DATA = emacs/guix-main.scm
 nodist_emacsui_DATA = emacs/guix-helper.scm
-include emacs.am
+include emacs/local.mk

 # The self-contained tarball.
 guix-binary.%.tar.xz:
@@ -478,15 +487,23 @@ assert-no-store-file-names:
 	fi

 # Make sure hydra.gnu.org has the important binaries.
-assert-binaries-available:
+assert-binaries-available: $(GOBJECTS)
 	$(AM_V_at)$(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:
+assert-final-inputs-self-contained: $(GOBJECTS)
 	$(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)"			\
 	  "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm"

+# Compute the Hydra jobs and write them in the target file.
+hydra-jobs.scm: $(GOBJECTS)
+	$(AM_V_at)$(MKDIR_P) "`dirname "$@"`"
+	$(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)"		\
+	  "$(top_srcdir)/build-aux/hydra/evaluate.scm"			\
+	  "$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp"
+	$(AM_V_at)mv "$@.tmp" "$@"
+
 .PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go
 .PHONY: assert-no-store-file-names assert-binaries-available
 .PHONY: assert-final-inputs-self-contained
@@ -10,6 +10,370 @@ Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>

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

+* Changes in 0.11.0 (since 0.10.0)
+
+** Package management
+
+*** Substitute display adjusts to client locale and terminal width
+*** New ‘--free-space’ option for ‘guix gc’
+*** ‘guix gc’ shows the amount of disk space freed
+*** Source code downloads fall back to content-addressed mirrors
+*** ‘guix graph’ can now be passed a store file name
+*** Building the profile is faster, noticeably so on slow file systems
+*** Profiles now include XDG desktop and MIME databases
+*** ‘guix size’ can be passed more than one package
+*** ‘--check’ and ‘--rounds’ save the differing build output upon failure
+*** New Emacs interface for package locations: M-x guix-locations
+
+See “Package Source Locations” in the manual.
+*** Emacs modes show the full profile name in buffer names
+*** Emacs “Package Info” buffer now have a “Build Log” button
+*** ‘guix environment’ sets $GUIX_ENVIRONMENT to the environment’s profile
+*** New ‘--ttl’ option for ‘guix publish’
+*** New ‘--compression’ option for ‘guix publish’
+*** ‘guix publish’ serves source files over content-address “/file” URLs
+*** New ‘hackage’ updater for ‘guix refresh’
+*** ‘guix lint -c cve’ uses a faster caching method
+*** ‘guix lint -c cve’ now reports up to 3-year-old vulnerabilities
+*** ‘guix lint -c source,home-page’ reports suspiciously small HTTP replies
+*** ‘guix lint -c inputs-should-be-native’ makes more suggestions
+
+** Distribution
+
+*** New services
+
+urandom-seed-service, dicod-service, gc-root-service-type, mcron-service,
+rngd-service, dropbear-service, pam-limits-service (See “Services” in the
+manual for details.)
+
+*** ‘mapped-device’ can refer to partitions using a LUKS UUID
+*** New ‘raid-device-type’, for RAID devices using mdadm
+*** ‘console-keymap-service’ can be given several file names
+*** Java package names are now prefixed with “java-”
+*** New modular Qt packages, to replace the monolithic ‘qt’ package
+*** The ‘gnupg’ 2.0/2.1 packages provide the ‘gpg’ command instead of ‘gpg2’
+*** Packages whose build output were not bit-reproducible have been fixed
+
+fontforge, libxslt, nasm, openmpi, petsc, vlc
+
+*** 484 new packages
+
+4store, 4ti2, acpi, alot, amsynth, anthy, antiword, aqbanking, arc-icon-theme,
+arc-theme, argon2, aria-maestosa, asciinema, autoconf-archive, avr-binutils,
+avr-gcc, avr-gcc, avr-toolchain, avr-toolchain, awesome, bash-tap, beast,
+bits, brotli, c-graph, cabextract, cddlib, ceres-solver, certbot, cgit,
+chez-scheme, chromium-bsu, connman, cpupower, dfu-util, di, dia, diction,
+dillo, doc++, dstat, eigensoft, elixir, emacs-ace-window, emacs-avy,
+emacs-better-defaults, emacs-cider, emacs-clojure-mode, emacs-company,
+emacs-ebuild-mode, emacs-el-mock, emacs-elfeed, emacs-emms,
+emacs-emms-player-mpv, emacs-epl, emacs-eprime, emacs-espuds, emacs-ess,
+emacs-expand-region, emacs-ffap-rfc-space, emacs-fill-column-indicator,
+emacs-helm, emacs-hl-todo, emacs-hydra, emacs-ido-completing-read+,
+emacs-ido-ubiquitous, emacs-iedit, emacs-ivy, emacs-js2-mode, emacs-lispy,
+emacs-lua-mode, emacs-magit-popup, emacs-markdown-mode, emacs-minimal,
+emacs-multiple-cursors, emacs-org-bullets, emacs-page-break-lines,
+emacs-paren-face, emacs-perspective, emacs-pkg-info, emacs-projectile,
+emacs-queue, emacs-rainbow-delimiters, emacs-rainbow-identifiers,
+emacs-rfcview, emacs-rich-minority, emacs-seq, emacs-shell-switcher,
+emacs-shut-up, emacs-simple-httpd, emacs-skewer-mode, emacs-smart-mode-line,
+emacs-smartparens, emacs-smex, emacs-solarized-theme, emacs-spinner,
+emacs-tagedit, emacs-undercover, emacs-visual-fill-column, emacs-web-mode,
+emacs-writegood-mode, emacs-yaml-mode, emacs-zenburn-theme, emacs-znc, emboss,
+encfs, entr, envstore, erlang, filevercmp, folks, font-fantasque-sans,
+font-hack, fossil, gcc-ddc, gcc-ddc, gcide, geiser-next, gengetopt, gfbgraph,
+gflags, ghc-aeson-pretty, ghc-concatenative, ghc-indents, ghc-union-find,
+ghc-wl-pprint, ghmm, ghostscript-gs, ghostscript-gs-with-x, giac-xcas,
+gimp-fourier, glog, gmp-ecm, gnome-calendar, gnome-maps, gnome-mpv,
+gnome-shell-extensions, gnome-sudoku, gnome-tweak-tool, gnu-standards, go, go,
+googletest, gptfdisk, gtkspell3, guile-daemon, guile-dbd-sqlite3, guile-dbi,
+guile-gnome, guile-sqlite3, guile-xosd, gwenhywfar, h5check, haveged,
+hdf5-parallel-openmpi, hexedit, higan, hplip, httping, hurd-core-headers,
+hypre, hypre-openmpi, ibus-anthy, iodine, ipopt, java-hamcrest-core,
+java-htsjdk, java-jarjar, java-junit, java-ngs, java-qdox, java-swt, java-xz,
+jq, khmer, krona-tools, lbzip2, libbsd, libgames-support, libgnomekbd,
+libharu, libhilbert, libiax2, libiconv, libinput-minimal, librdkafka,
+libsmpeg, libzapojit, log4cpp, lrzip, macchanger, maim, marst, matio, mcron2,
+midicsv, milkytracker, mitlm, moc, moka-icon-theme, mpfi, msgpack, multiqc,
+muscle, nasm, netcdf, netcdf-parallel-openmpi, nlopt, nmap, ntfs-3g, ntl,
+oniguruma, opendht, openttd, orage, pardre, perceptualdiff, perl-config-ini,
+perl-db-file, perl-file-zglob, perl-guard, perl-io-captureoutput,
+perl-ipc-system-simple, perl-list-compare, perl-list-someutils, perl-log-any,
+perl-log-any-adapter-log4perl, perl-log-log4perl, perl-mixin-linewise,
+perl-perlio-utf8-strict, perl-test-class, perl-test-class-most, perltidy,
+pinentry-gtk2, pinentry-qt, pinentry-tty, piranha, poppler-qt5, portmidi,
+progress, ptpython, ptpython2, python-arrow, python-bz2file, python-chai,
+python-cleo, python-cysignals, python-dendropy, python-dnspython,
+python-email-validator, python-fake-factory, python-flexmock, python-gevent,
+python-greenlet, python-inflection, python-jedi, python-kazoo,
+python-lazy-object-proxy, python-magic, python-orator, python-pkgconfig,
+python-plastid, python-ply, python-prompt-toolkit, python-protobuf,
+python-py3status, python-pyaml, python-pygame, python-pykafka, python-pylev,
+python-pyportmidi, python-pyusb, python-screed, python-sqlparse,
+python-tables, python-tabulate, python-tblib, python-twisted,
+python-twobitreader, python-ukpostcodeparser, python-urwidtrees,
+python-wcwidth, python2-arrow, python2-bz2file, python2-chai, python2-cleo,
+python2-cysignals, python2-dendropy, python2-dnspython,
+python2-email-validator, python2-fake-factory, python2-flexmock,
+python2-gevent, python2-greenlet, python2-inflection, python2-ipaddr,
+python2-jedi, python2-jsonrpclib, python2-kazoo, python2-lazy-object-proxy,
+python2-magic, python2-orator, python2-pkgconfig, python2-plastid,
+python2-ply, python2-prompt-toolkit, python2-protobuf, python2-pyaml,
+python2-pykafka, python2-pylev, python2-pytest-cache, python2-pyusb,
+python2-rope, python2-s3cmd, python2-screed, python2-shedskin,
+python2-sqlparse, python2-tables, python2-tabulate, python2-tblib,
+python2-twisted, python2-twobitreader, python2-ukpostcodeparser,
+python2-urwidtrees, python2-wcwidth, qqwing, qtbase, qtconnectivity,
+qtdeclarative, qtimageformats, qtlocation, qtmultimedia, qtscript, qtsensors,
+qtserialport, qtsvg, qttools, qtwayland, qtwebchannel, qtwebsockets,
+qtx11extras, qtxmlpatterns, quesoglc, r-acepack, r-ade4, r-biased-urn,
+r-bsgenome-celegans-ucsc-ce6, r-bsgenome-dmelanogaster-ucsc-dm3,
+r-bsgenome-hsapiens-ucsc-hg19, r-bsgenome-mmusculus-ucsc-mm10,
+r-bsgenome-mmusculus-ucsc-mm9, r-cluster, r-coda, r-domc, r-edger,
+r-estimability, r-foreign, r-formula, r-gdtools, r-genomationdata, r-glmnet,
+r-hexbin, r-igraph, r-irlba, r-knitrbootstrap, r-latticeextra, r-limma,
+r-locfit, r-mgcv, r-motifrg, r-multitaper, r-mvtnorm, r-nmf, r-nnet,
+r-openssl, r-permute, r-pkgmaker, r-pracma, r-praise, r-registry, r-rngtools,
+r-runit, r-seqinr, r-seqlogo, r-svglite, r-tidyr, r-variantannotation,
+r-vegan, r-withr, r-xnomial, r-xtable, r-zlibbioc, r-zoo, r-ztable, rapicorn,
+recordmydesktop, red-eclipse, reposurgeon, reptyr, ribotaper, ristretto,
+rlwrap, rng-tools, rofi, ruby-bio-kseq, ruby-concurrent, ruby-debug-inspector,
+ruby-hoe-git, ruby-minitest-hooks, ruby-pkg-config, ruby-puma, ruby-sequel,
+ruby-spring, ruby-timecop, ruby-tzinfo-data, s6, s6-dns, s6-linux-utils,
+s6-networking, s6-portable-utils, s6-rc, sbc, scrollkeeper, seek, seren, sicp,
+signify, singular, slop, slurm-drmaa, sparql-query, spice, spice-gtk,
+spice-protocol, spice-vdagent, ssdeep, sshpass, starfighter, stellarium,
+supertux, surf, synthv1, tcc, tcc-wrapper, teensy-loader-cli, termite,
+texmaker, thefuck, thinkfan, tmux-themepack, trash-cli, trio, ttf2eot,
+ttfautohint, tuxpaint, tuxpaint-config, tuxpaint-stamps, uhttpmock, usbredir,
+utfcpp, uwsgi, virglrenderer, virt-viewer, vte-ng, warzone2100, wiredtiger,
+wireshark, wmbattery, wmclock, wmcpuload, wmfire, wmnd, woff-tools, woff2,
+woof, xdelta, xdpyprobe, xf86-video-qxl, xfce4-taskmanager, xfd, xfontsel,
+xorg-rgb, xscreensaver, zimg
+
+*** 678 package updates
+
+abduco-0.6, abiword-3.0.1, adwaita-icon-theme-3.20, aisleriot-3.20.1,
+allegro-5.0.11, allegro-5.2.0, american-fuzzy-lop-2.15b, ansible-2.1.0.0,
+arandr-0.1.9, aria2-1.25.0, armadillo-6.700.6, armadillo-6.700.7,
+asymptote-2.38, at-spi2-atk-2.20.1, at-spi2-core-2.20.1, atk-2.20.0,
+autoconf-2.68, autoconf-2.69, autogen-5.18.10, avidemux-2.6.12,
+avr-libc-2.0.0, baobab-3.20.1, bdb-5.3.28, bdb-6.2.23, bedtools-2.26.0,
+beets-1.3.19, behave-1.2.5, bind-utils-9.10.4, bison-3.0.4,
+bitcoin-core-0.12.1, bitlbee-3.4.2, blast+-2.4.0, bluez-5.40, borg-1.0.6,
+btrfs-progs-4.6.1, bundler-1.12.5, busybox-1.25.0, cairo-1.14.6,
+calibre-2.63.0, caribou-0.4.20, ccache-3.2.5, ccl-1.11, cflow-1.5, cgal-4.8.1,
+check-0.10.0, chicken-4.11.0, clang-3.7.1, clang-3.8.1, clang-runtime-3.5.2,
+clang-runtime-3.6.2, clang-runtime-3.7.1, clang-runtime-3.8.1, clutter-1.26.0,
+clutter-gst-3.0.18, clutter-gtk-1.8.0, cmake-3.5.2, conky-1.10.3,
+coreutils-8.25, coreutils-minimal-8.25, dbus-1.10.8, dconf-0.26.0,
+dconf-editor-3.20.1, dealii-8.4.1, dealii-openmpi-8.4.1, devhelp-3.20.0,
+diamond-0.8.17, diffoscope-54, dmidecode-3.0, dnsmasq-2.76, docbook-xml-4.3,
+docbook-xml-4.4, docbook-xml-4.5, dosfstools-4.0, dovecot-2.2.25,
+dropbear-2016.73, dtach-0.9, ecl-16.1.2, ed-1.13, edirect-4.10, efl-1.17.2,
+eigen-3.2.8, elementary-1.17.1, elfutils-0.166, emacs-async-1.9,
+emacs-constants-2.6, emacs-flycheck-28, emacs-slime-2.18,
+emacs-with-editor-2.5.1, enblend-enfuse-4.2, enlightenment-0.21.1, eog-3.20.1,
+epiphany-3.20.1, evince-3.20.0, evolution-data-server-3.20.1,
+execline-2.1.5.0, exempi-2.3.0, exim-4.87, exiv2-0.25, expat-2.1.1,
+extra-cmake-modules-5.21.0, eyed3-0.7.9, fasttree-2.1.9, ffmpeg-2.8.7,
+ffmpeg-3.1.1, file-roller-3.20.1, fish-2.3.1, font-dejavu-2.35,
+font-gnu-freefont-ttf-20120503, font-gnu-unifont-9.0.01, fontforge-20160404,
+freefall-4.7, freeipmi-1.5.2, freetype-2.6.3, frescobaldi-2.19.0, fuse-2.9.6,
+fvwm-2.6.6, gcc-6.1.0, gcc-objc++-4.9.3, gcc-objc-4.9.3, gcc-toolchain-6.1.0,
+gcr-3.20.0, gd-2.2.3, gdb-7.11.1, gdbm-1.12, gdk-pixbuf+svg-2.34.0,
+gdk-pixbuf-2.34.0, gdm-3.20.1, geda-gaf-1.9.2, gedit-3.20.1, geeqie-1.3,
+geoclue-2.4.3, geocode-glib-3.20.1, getmail-4.49.0, gettext-0.19.8,
+ghc-memory-0.13, giflib-5.1.4, gimp-2.8.16, git-2.9.2, git-manpages-2.9.2,
+git-modes-1.2.2, glade-3.20.0, glib-2.48.0, glib-networking-2.48.1,
+glibc-2.23, glibc-hurd-2.19, glibc-hurd-headers-2.19, glibc-locales-2.23,
+glibc-stripped-tarball-2.23, glibc-utf8-locales-2.23, glibmm-2.48.1,
+global-6.5.4, glpk-4.60, gmp-6.1.0, gnome-3.20.1, gnome-backgrounds-3.20,
+gnome-bluetooth-3.18.3, gnome-control-center-3.20.1, gnome-desktop-3.20.1,
+gnome-keyring-3.20.0, gnome-klotski-3.20.1, gnome-mines-3.20.0,
+gnome-online-accounts-3.20.1, gnome-session-3.20.1,
+gnome-settings-daemon-3.20.1, gnome-shell-3.20.1, gnome-terminal-3.20.1,
+gnome-themes-standard-3.20, gnu-pw-mgr-2.0, gnucash-2.6.12,
+gnumach-headers-1.7, gnumeric-1.12.28, gnupg-2.1.13, gnuplot-5.0.4-1,
+gnurl-7.48.0, gnutls-3.5.2, gobject-introspection-1.48.0, goffice-0.10.28,
+gom-0.3.2, graphicsmagick-1.3.24, graphite2-1.3.8, grep-2.25, grilo-0.3.0,
+grilo-plugins-0.3.1, grub-2.02beta3, gsettings-desktop-schemas-3.20.0,
+gst-libav-1.8.2, gst-plugins-base-1.8.2, gst-plugins-good-1.8.2,
+gst-plugins-ugly-1.8.2, gstreamer-1.8.2, gtk+-2.24.30, gtk+-3.20.3,
+gtkmm-3.20.1, gtksourceview-3.20.2, guile-irregex-0.9.4, guile-ncurses-1.7,
+guile-next-2.1.3, guitarix-0.35.0, guix-0.10.0, guix-0.10.0-1.97c8,
+gvfs-1.28.1, gzip-1.8, harfbuzz-1.2.4, haunt-0.2, hdf5-1.8.17,
+help2man-1.47.4, hexchat-2.12.0, hoedown-3.0.7, htop-2.0.2, htslib-1.3.1,
+httpd-2.4.23, hurd-headers-0.8, hurd-minimal-0.8, hwloc-1.11.2, i3-wm-4.12,
+i3status-2.10, icecat-38.8.0-gnu2, icedtea-2.6.6, icedtea-3.0.1,
+imagemagick-6.9.5-4, imlib2-1.4.9, iniparser-4.0, iptables-1.4.21,
+irssi-0.8.19, isc-dhcp-4.3.4, iso-codes-3.67, iw-4.3, jemalloc-4.2.0,
+json-glib-1.2.0, julia-0.4.5, kbd-2.0.3, khard-0.9.0, kmod-22,
+kwindowsystem-5.21.0, ldb-1.1.26, ledger-3.1.1, letsencrypt-0.8.1,
+libarchive-3.2.1, libassuan-2.4.3, libbluray-0.9.3, libchamplain-0.12.13,
+libcroco-0.6.11, libcue-2.1.0, libdrm-2.4.67, libepoxy-1.3.1, libetpan-1.7.2,
+libfm-1.2.4, libfm-extra-1.2.4, libgc-7.4.2, libgcrypt-1.7.0, libgit2-0.24.1,
+libgpg-error-1.22, libgsf-1.14.36, libgtop-2.34.0, libgweather-3.20.0,
+libical-2.0.0, libinput-1.4.0, libjpeg-9a, libksba-1.3.4, libmbim-1.12.4,
+libmicrohttpd-0.9.50, libmtp-1.1.11, libndp-1.6, libpeas-1.18.0,
+libpsl-0.13.0, libqmi-1.14.2, librecad-2.1.1, libreoffice-5.1.4.2,
+libressl-2.4.2, librsvg-2.40.15, libsecret-0.18.5, libsigc++-2.8.0,
+libsodium-1.0.10, libsoup-2.54.1, libsrtp-1.5.4, libtar-1.2.20, libtasn1-4.8,
+libuv-1.9.0, libva-1.7.0, libwnck-3.14.1, libxkbcommon-0.6.1, libxml2-2.9.4,
+libxslt-1.1.29, libyaml-0.1.6, linux-libre-4.1.29, linux-libre-4.4.16,
+linux-libre-4.7, linux-libre-headers-4.1.18, lirc-0.9.4, llvm-3.7.1,
+llvm-3.8.1, love-0.10.1, lua-5.2.4, luajit-2.0.4, lxappearance-0.6.2,
+lxrandr-0.3.1, lxtask-0.1.7, mafft-7.299, magit-2.7.0, make-4.2, man-db-2.7.5,
+man-pages-4.06, manaplus-1.6.6.4, mariadb-10.1.16, mc-4.8.16, mdadm-3.4,
+menu-cache-1.0.1, mercurial-3.8.4, mesa-utils-8.3.0, metabat-0.26.3,
+microscheme-0.9.3, mig-1.7, minetest-0.4.14, mit-krb5-1.14.2, mlt-6.2.0,
+moreutils-0.58, mozjs-24.2.0, mpd-0.19.17, mpfr-3.1.4, mplayer-1.3.0,
+mpv-0.18.0, msmtp-1.6.5, mtdev-1.1.5, mu-0.9.16, munge-0.5.12,
+muparser-2.2.5-2, mutt-1.6.2, mutter-3.20.1, mysql-5.7.13, nautilus-3.20.1,
+ncmpcpp-0.7.4, network-manager-1.2.0, network-manager-applet-1.2.0,
+nginx-1.10.1, ninja-1.7.1, node-6.0.0, nspr-4.12, nss-3.23, nss-certs-3.23,
+ntp-4.2.8p8, obs-0.15.1, octave-4.0.2, offlineimap-7.0.0, openimageio-1.6.15,
+openjpeg-2.1.0, openldap-2.4.44, openlibm-0.5.1, openmpi-1.10.3,
+openntpd-6.0p1, openspecfun-0.5.2, openssh-7.3p1, openssl-1.0.2h,
+openvpn-2.3.9, opus-1.1.3, orcus-0.9.2, owncloud-client-2.2.2,
+oxygen-icons-5.21.0, pango-1.40.1, pangomm-2.40.0, parallel-20160722,
+pari-gp-2.7.6, pciutils-3.5.1, pcmanfm-1.2.4, pcre2-10.21, perf-4.7,
+perl-dbd-mysql-4.035, perl-dbi-1.636, perl-devel-symdump-2.17,
+perl-exporter-lite-0.08, perl-image-exiftool-10.20, perl-io-socket-ssl-2.033,
+perl-test-deep-1.120, perl-test-harness-3.36, perl-test-simple-1.302026,
+perl-text-diff-1.44, perl-uri-1.71, perl-xml-libxml-2.0128,
+perl-xml-simple-2.22, petsc-3.7.2, petsc-complex-3.7.2,
+petsc-complex-openmpi-3.7.2, petsc-openmpi-3.7.2, pidgin-2.11.0,
+pinentry-0.9.7, pixman-0.34.0, poppler-0.43.0, poppler-qt4-0.43.0,
+postgresql-9.5.3, potrace-1.13, protobuf-2.6.1, pspp-0.10.2, pugixml-1.7,
+python-2.7.11, python-3.4.3, python-acme-0.8.1, python-alembic-0.8.7,
+python-atomicwrites-1.1.0, python-babel-2.3.2, python-beautifulsoup4-4.5.0,
+python-ccm-2.1.6, python-click-6.6, python-click-threading-0.2.0,
+python-coverage-4.1, python-cryptography-1.3.4,
+python-cryptography-vectors-1.3.4, python-cssselect-0.9.2, python-cython-0.24,
+python-dateutil-2.5.2, python-flake8-2.5.4, python-gst-1.8.2,
+python-h5py-2.6.0, python-httplib2-0.9.2, python-iso8601-0.1.11,
+python-keyring-8.7, python-libxml2-2.9.4, python-llfuse-1.1,
+python-lockfile-0.12.2, python-lxml-3.6.0, python-ly-0.9.4,
+python-mccabe-0.4.0, python-mox3-0.14.0, python-numexpr-2.6.0,
+python-oslosphinx-4.3.0, python-pandas-0.18.1, python-paramiko-1.16.0,
+python-parse-1.6.6, python-parsedatetime-2.1, python-pbr-1.8.1,
+python-psutil-4.3.0, python-pygobject-3.20.0, python-pyopenssl-16.0.0,
+python-pyqt-5.5, python-pyqt-5.6, python-pyquery-1.2.13, python-pytest-2.7.3,
+python-pytest-cov-2.2.1, python-pytz-2016.3, python-requests-2.9.1,
+python-requests-toolbelt-0.6.2, python-seaborn-0.7.0,
+python-setuptools-scm-1.11.1, python-simplejson-3.8.2, python-sip-4.18,
+python-sphinx-repoze-autointerface-0.8, python-stevedore-1.12.0,
+python-terminado-0.6, python-tzlocal-1.2.2, python-vobject-0.9.2,
+python-waf-1.9.1, python-websocket-client-0.37.0, python-werkzeug-0.11.5,
+python-wsgi-intercept-1.2.2, python2-acme-0.8.1, python2-alembic-0.8.7,
+python2-atomicwrites-1.1.0, python2-babel-2.3.2, python2-beautifulsoup4-4.5.0,
+python2-ccm-2.1.6, python2-click-6.6, python2-coverage-4.1,
+python2-cryptography-1.3.4, python2-cryptography-vectors-1.3.4,
+python2-cssselect-0.9.2, python2-cssutils-1.0.1, python2-cython-0.24,
+python2-dateutil-2.5.2, python2-gst-1.8.2, python2-h5py-2.6.0,
+python2-httplib2-0.9.2, python2-iso8601-0.1.11, python2-keyring-8.7,
+python2-libxml2-2.9.4, python2-llfuse-1.1, python2-lockfile-0.12.2,
+python2-lxml-3.6.0, python2-mccabe-0.4.0, python2-mox3-0.14.0,
+python2-numexpr-2.6.0, python2-oslosphinx-4.3.0, python2-pandas-0.18.1,
+python2-paramiko-1.16.0, python2-parsedatetime-2.1, python2-pbcore-1.2.8,
+python2-pbr-1.8.1, python2-psutil-4.3.0, python2-pygobject-3.20.0,
+python2-pyopenssl-16.0.0, python2-pyqt-5.6, python2-pyquery-1.2.13,
+python2-pysnptools-0.3.9, python2-pytest-2.7.3, python2-pytest-cov-2.2.1,
+python2-pythondialog-3.4.0, python2-pytz-2016.3, python2-seaborn-0.7.0,
+python2-setuptools-scm-1.11.1, python2-simplejson-3.8.2, python2-sip-4.18,
+python2-sphinx-repoze-autointerface-0.8, python2-stevedore-1.12.0,
+python2-terminado-0.6, python2-vobject-0.9.2, python2-waf-1.9.1,
+python2-websocket-client-0.37.0, python2-werkzeug-0.11.5, qemu-2.6.0,
+qemu-minimal-2.6.0, qsynth-0.4.1, qtkeychain-0.7.0, qtractor-0.7.7,
+quassel-0.12.4, r-3.3.0, r-acsnminer-0.16.01.29, r-annotationdbi-1.34.4,
+r-bh-1.60.0-2, r-biobase-2.32.0, r-biocgenerics-0.18.0, r-biocparallel-1.6.3,
+r-biomart-2.28.0, r-biostrings-2.40.2, r-bsgenome-1.40.1, r-curl-0.9.7,
+r-dbi-0.4-1, r-devtools-1.11.1, r-digest-0.6.9, r-dnacopy-1.46.0,
+r-evaluate-0.9, r-formatr-1.4, r-genomation-1.4.2, r-genomeinfodb-1.8.3,
+r-genomicalignments-1.8.4, r-genomicfeatures-1.24.5, r-genomicranges-1.24.2,
+r-ggplot2-2.1.0, r-git2r-0.15.0, r-graph-1.50.0, r-gridextra-2.2.1,
+r-gtable-0.2.0, r-highr-0.6, r-htmltools-0.3.5, r-htmlwidgets-0.6,
+r-httr-1.1.0, r-impute-1.46.0, r-iranges-2.6.1, r-jsonlite-0.9.20,
+r-knitr-1.13, r-matrixstats-0.50.2, r-memoise-1.0.0, r-microbenchmark-1.4-2.1,
+r-munsell-0.4.3, r-plotly-3.6.0, r-plotrix-3.6-2, r-qtl-1.39-5,
+r-r-methodss3-1.7.1, r-r-oo-1.20.0, r-r-rsp-0.30.0, r-r-utils-2.3.0,
+r-r6-2.1.2, r-rcpp-0.12.5, r-rcpparmadillo-0.6.700.6.0, r-rmarkdown-0.9.6,
+r-roxygen2-5.0.1, r-rsamtools-1.24.0, r-rstudioapi-0.5, r-rtracklayer-1.32.2,
+r-s4vectors-0.10.2, r-scales-0.4.0, r-seqpattern-1.4.0, r-servr-0.4,
+r-stringi-1.0-1, r-summarizedexperiment-1.2.3, r-testthat-1.0.2,
+r-topgo-2.24.0, r-viridis-0.3.4, r-xml-3.98-1.4, r-xvector-0.12.1, racket-6.5,
+readline-6.3, redis-3.2.0, rest-0.8.0, retroarch-1.3.4, rpm-4.12.0.1,
+ruby-2.2.5, ruby-2.3.1, ruby-bio-commandeer-0.1.3,
+ruby-domain-name-0.5.20160310, ruby-ffi-1.9.14, ruby-hashery-2.1.2,
+ruby-mime-types-3.1, ruby-mime-types-data-3.2016.0221,
+ruby-mini-portile-2.1.0, ruby-nokogiri-1.6.8, ruby-nokogumbo-1.4.7-1.fb51ff29,
+ruby-rspec-3.2.0, ruby-rspec-core-3.2.3, ruby-rspec-mocks-3.2.1,
+ruby-shoulda-matchers-3.1.1, ruby-slop-4.1.0, rxvt-unicode-9.22, samba-4.3.11,
+samtools-1.3.1, sbcl-1.3.7, scheme48-1.9.2, screen-4.4.0, seahorse-3.20.0,
+setbfree-0.8.1, shared-mime-info-1.6, shotwell-0.23.1, skalibs-2.3.10.0,
+slepc-3.7.1, slepc-complex-3.7.1, slepc-complex-openmpi-3.7.1,
+slepc-openmpi-3.7.1, smartmontools-6.5, sortmerna-2.1b, sqlite-3.12.2,
+sshfs-fuse-2.8, st-0.6, stalonetray-0.8.3, star-2.5.2a, starman-0.4014,
+subversion-1.8.16, sudo-1.8.17p1, superlu-5.2.1, sxhkd-0.5.6, synergy-1.7.6,
+talloc-2.1.7, tar-1.29, taskwarrior-2.5.1, tdb-1.3.9, tesseract-ocr-3.04.01,
+testdisk-7.0, tevent-0.9.28, texinfo-6.1, texlive-2016, texlive-minimal-2016,
+the-silver-searcher-0.32.0, tiled-0.16.1, tinc-1.0.28, tinyproxy-1.8.4,
+tmux-2.2, totem-3.20.1, totem-pl-parser-3.10.6, tvtime-1.0.10, udisks-2.1.7,
+units-2.13, unixodbc-2.3.4, v4l-utils-1.10.1, vala-0.32.0, vapoursynth-32,
+vcftools-0.1.14, vdirsyncer-0.11.3, vlc-2.2.4, vsearch-2.0.1, vte-0.36.5,
+vte-0.44.1, wayland-1.11.0, webkitgtk-2.12.3, webkitgtk-2.4.11,
+webkitgtk-gtk2-2.4.11, weechat-1.5, wesnoth-1.12.6, wget-1.18, wicd-1.7.4,
+wine-1.9.15, wireless-regdb-2016.05.02, wxmaxima-16.04.2, xboard-4.9.0,
+xlockmore-5.47, xorriso-1.4.4, yelp-3.20.1, yelp-xsl-3.20.1,
+youtube-dl-2016.07.22, zenity-3.20.0, zeromq-4.0.7, znc-1.6.3, zsh-5.2,
+zynaddsubfx-2.5.4
+
+** Programming interfaces
+
+*** New ‘with-imported-modules’ form provided by (guix gexp)
+
+It supersedes the #:modules parameter of ‘gexp->derivation’, ‘compute-file’,
+‘gexp->script’, ‘program-file’, etc, as well as the ‘imported-modules’ fields
+of <origin> and <shepherd-service>.  See “G-Expressions” in the manual.
+
+*** New (gnu tests) and (gnu build marionette) modules for system tests
+
+See <http://savannah.gnu.org/forum/forum.php?forum_id=8605> for background.
+
+*** New (guix zlib) module
+*** New (guix hg-download) module, for Mercurial checkouts
+*** (guix download) supports HTTP basic authentication
+*** (guix svn-download) supports authentication
+*** The ‘source’ of packages can be a ‘local-file’ or any lowerable object
+*** Part of (guix utils) moved to the new (guix combinators)
+*** GNU updater honors the ‘ftp-server’ and ‘ftp-directory’ package properties
+*** CVE linter honors the ‘cpe-name’ and ‘cpe-version’ package properties
+*** ‘add-to-store’ and ‘local-file’ have a new #:select? parameter
+
+** Noteworthy bug fixes
+
+*** Perl no longer references GCC (<http://bugs.gnu.org/23077>)
+*** Grafting now fails upon I/O errors (<http://bugs.gnu.org/23581>)
+*** GuixSD random source is now properly seeded (<http://bugs.gnu.org/23605>)
+*** ‘call-with-container’ gracefully reports mount errors
+    (<http://bugs.gnu.org/23306>)
+*** ‘herd start cow-store’ now bind-mounts the target /tmp
+*** ‘guix environment’ now honors ‘--system’ (<http://bugs.gnu.org/23682>)
+*** ‘guix publish’ properly encodes archive URIs (<http://bugs.gnu.org/21888>)
+*** ‘NIX_CONF_DIR’ is now ignored (<http://bugs.gnu.org/22459>)
+*** The shell of user ‘nobody’ is ‘nologin’ (<http://bugs.gnu.org/23971>)
+*** Source code location is more precise in error messages involving records
+    (<http://bugs.gnu.org/23969>)
+*** ‘guix --version’ is correct in the presence of ‘guix pull’
+    (<http://bugs.gnu.org/19278>)
+*** Git commits are now signed, for eventual authentication by ‘guix pull’
+    (in preparation of a fix for <http://bugs.gnu.org/22883>)
+
+** Native language support
+
+*** New translation: zh_CN (Simplified Chinese)
+*** Updated translations: fr
+
 * Changes in 0.10.0 (since 0.9.0)

 ** Community
@@ -14,6 +14,7 @@ infrastructure help:
 	Alexandru Cojocaru <xojoc@gmx.com>
 	    Aleix Conchillo Flaqué <aconchillo@gmail.com>
          Malcolm Cook <MEC@stowers.org>
+           Thomas Danckaert <thomas.danckaert@gmail.com>
 	   Rafael Ferreira <rafael.f.f1@gmail.com>
 	Christian Grothoff <christian@grothoff.org>
             Eric Hanchrow <eric.hanchrow@gmail.com>
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,7 +19,9 @@
 (define-module (build-self)
  #:use-module (gnu)
  #:use-module (guix)
+  #:use-module (guix config)
  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-19)
  #:export (build))

 ;;; Commentary:
@@ -44,6 +46,18 @@
 (define libgcrypt
  (first (find-best-packages-by-name "libgcrypt" #f)))

+(define zlib
+  (first (find-best-packages-by-name "zlib" #f)))
+
+(define gzip
+  (first (find-best-packages-by-name "gzip" #f)))
+
+(define bzip2
+  (first (find-best-packages-by-name "bzip2" #f)))
+
+(define xz
+  (first (find-best-packages-by-name "xz" #f)))
+
 (define guile-json
  (first (find-best-packages-by-name "guile-json" #f)))

@@ -57,12 +71,33 @@
         (lambda (file)
           (string-append (dirname file) "/.."))))

+
+(define (date-version-string)
+  "Return the current date and hour in UTC timezone, for use as a poor
+person's version identifier."
+  ;; XXX: Replace with a Git commit id.
+  (date->string (current-date 0) "~Y~m~d.~H"))
+
 ;; The procedure below is our return value.
-(define* (build source #:key verbose?
+(define* (build source
+                #:key verbose? (version (date-version-string))
                #:allow-other-keys
                #:rest rest)
  "Return a derivation that unpacks SOURCE into STORE and compiles Scheme
 files."
+  ;; The '%xxxdir' variables were added to (guix config) in July 2016 so we
+  ;; cannot assume that they are defined.  Try to guess their value when
+  ;; they're undefined (XXX: we get an incorrect guess when environment
+  ;; variables such as 'NIX_STATE_DIR' are defined!).
+  (define storedir
+    (if (defined? '%storedir) %storedir %store-directory))
+  (define localstatedir
+    (if (defined? '%localstatedir) %localstatedir (dirname %state-directory)))
+  (define sysconfdir
+    (if (defined? '%sysconfdir) %sysconfdir (dirname %config-directory)))
+  (define sbindir
+    (if (defined? '%sbindir) %sbindir (dirname %guix-register-program)))
+
  (define builder
    #~(begin
        (use-modules (guix build pull))
@@ -73,12 +108,28 @@ files."

        (build-guix #$output #$source

+                    #:system #$%system
+                    #:storedir #$storedir
+                    #:localstatedir #$localstatedir
+                    #:sysconfdir #$sysconfdir
+                    #:sbindir #$sbindir
+
+                    #:package-name #$%guix-package-name
+                    #:package-version #$version
+                    #:bug-report-address #$%guix-bug-report-address
+                    #:home-page-url #$%guix-home-page-url
+
+                    #:libgcrypt #$libgcrypt
+                    #:zlib #$zlib
+                    #:gzip #$gzip
+                    #:bzip2 #$bzip2
+                    #:xz #$xz
+
                    ;; XXX: This is not perfect, enabling VERBOSE? means
                    ;; building a different derivation.
                    #:debug-port (if #$verbose?
                                     (current-error-port)
-                                     (%make-void-port "w"))
-                    #:gcrypt #$libgcrypt)))
+                                     (%make-void-port "w")))))

  (gexp->derivation "guix-latest" builder
                    #:modules '((guix build pull)
@@ -46,8 +46,9 @@
             (available (substitutable-paths store total))
             (missing   (lset-difference string=? total available)))
        (if (null? missing)
-            (format (current-error-port) "~a packages found substitutable~%"
-                    (length total))
+            (format (current-error-port)
+                    "~a packages found substitutable on~{ ~a~}~%"
+                    (length total) %hydra-supported-systems)
            (format (current-error-port)
                    "~a packages are not substitutable:~%~{  ~a~%~}~%"
                    (length missing) missing))
@@ -0,0 +1,111 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; 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/>.
+
+;;; This program replicates the behavior of Hydra's 'hydra-eval-guile-job'.
+;;; It evaluates the Hydra job defined by the program passed as its first
+;;; arguments and outputs an sexp of the jobs on standard output.
+
+(use-modules (guix store)
+             (srfi srfi-19)
+             (ice-9 match)
+             (ice-9 pretty-print)
+             (ice-9 format))
+
+(define %user-module
+  ;; Hydra user module.
+  (let ((m (make-module)))
+    (beautify-user-module! m)
+    m))
+
+(define (call-with-time thunk kont)
+  "Call THUNK and pass KONT the elapsed time followed by THUNK's return
+values."
+  (let* ((start  (current-time time-monotonic))
+         (result (call-with-values thunk list))
+         (end    (current-time time-monotonic)))
+    (apply kont (time-difference end start) result)))
+
+(define (call-with-time-display thunk)
+  "Call THUNK and write to the current output port its duration."
+  (call-with-time thunk
+    (lambda (time . results)
+      (format #t "~,3f seconds~%"
+              (+ (time-second time)
+                 (/ (time-nanosecond time) 1e9)))
+      (apply values results))))
+
+(define (assert-valid-job job thing)
+  "Raise an error if THING is not an alist with a valid 'derivation' entry.
+Otherwise return THING."
+  (unless (and (list? thing)
+               (and=> (assoc-ref thing 'derivation)
+                      (lambda (value)
+                        (and (string? value)
+                             (string-suffix? ".drv" value)))))
+    (error "job did not produce a valid alist" job thing))
+  thing)
+
+
+;; Without further ado...
+(match (command-line)
+  ((command file)
+   ;; Load FILE, a Scheme file that defines Hydra jobs.
+   (let ((port (current-output-port)))
+     (save-module-excursion
+      (lambda ()
+        (set-current-module %user-module)
+        (primitive-load file)))
+
+     (with-store store
+       ;; Make sure we don't resort to substitutes.
+       (set-build-options store
+                          #:use-substitutes? #f
+                          #:substitute-urls '())
+
+       ;; Grafts can trigger early builds.  We do not want that to happen
+       ;; during evaluation, so use a sledgehammer to catch such problems.
+       (set! build-things
+         (lambda (store . args)
+           (format (current-error-port)
+                   "error: trying to build things during evaluation!~%")
+           (format (current-error-port)
+                   "'build-things' arguments: ~s~%" args)
+           (exit 1)))
+
+       ;; Call the entry point of FILE and print the resulting job sexp.
+       (pretty-print
+        (match ((module-ref %user-module 'hydra-jobs) store '())
+          (((names . thunks) ...)
+           (map (lambda (job thunk)
+                  (format (current-error-port) "evaluating '~a'... " job)
+                  (force-output (current-error-port))
+                  (cons job
+                        (assert-valid-job job
+                                          (call-with-time-display thunk))))
+                names thunks)))
+        port))))
+  ((command _ ...)
+   (format (current-error-port) "Usage: ~a FILE
+Evaluate the Hydra jobs defined in FILE.~%"
+           command)
+   (exit 1)))
+
+;;; Local Variables:
+;;; eval: (put 'call-with-time 'scheme-indent-function 1)
+;;; End:
+
@@ -59,6 +59,7 @@
             (gnu system)
             (gnu system vm)
             (gnu system install)
+             (gnu tests)
             (srfi srfi-1)
             (srfi srfi-26)
             (ice-9 match))
@@ -71,19 +72,20 @@
 (define* (package->alist store package system
                         #:optional (package-derivation package-derivation))
  "Convert PACKAGE to an alist suitable for Hydra."
-  `((derivation . ,(derivation-file-name
-                    (package-derivation store package system
-                                        #:graft? #f)))
-    (description . ,(package-synopsis package))
-    (long-description . ,(package-description package))
-    (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
+  (parameterize ((%graft? #f))
+    `((derivation . ,(derivation-file-name
+                      (package-derivation store package system
+                                          #:graft? #f)))
+      (description . ,(package-synopsis package))
+      (long-description . ,(package-description package))
+      (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

 (define (package-job store job-name package system)
  "Return a job called JOB-NAME that builds PACKAGE on SYSTEM."
@@ -128,6 +130,9 @@ SYSTEM."
         (file (string-append dir "/demo-os.scm")))
    (read-operating-system file)))

+(define %guixsd-supported-systems
+  '("x86_64-linux" "i686-linux"))
+
 (define (qemu-jobs store system)
  "Return a list of jobs that build QEMU images for SYSTEM."
  (define (->alist drv)
@@ -142,12 +147,14 @@ system.")
  (define (->job name drv)
    (let ((name (symbol-append name (string->symbol ".")
                               (string->symbol system))))
-      `(,name . ,(cut ->alist drv))))
+      `(,name . ,(lambda ()
+                   (parameterize ((%graft? #f))
+                     (->alist drv))))))

  (define MiB
    (expt 2 20))

-  (if (member system '("x86_64-linux" "i686-linux"))
+  (if (member system %guixsd-supported-systems)
      (list (->job 'qemu-image
                   (run-with-store store
                     (mbegin %store-monad
@@ -164,6 +171,36 @@ system.")
                                          (* 1024 MiB))))))
      '()))

+(define (system-test-jobs store system)
+  "Return a list of jobs for the system tests."
+  (define (test->thunk test)
+    (lambda ()
+      (define drv
+        (run-with-store store
+          (mbegin %store-monad
+            (set-current-system system)
+            (set-grafting #f)
+            (set-guile-for-build (default-guile))
+            (system-test-value test))))
+
+      `((derivation . ,(derivation-file-name drv))
+        (description . ,(format #f "GuixSD '~a' system test"
+                                (system-test-name test)))
+        (long-description . ,(system-test-description test))
+        (license . ,gpl3+)
+        (home-page . ,%guix-home-page-url)
+        (maintainers . ("bug-guix@gnu.org")))))
+
+  (define (->job test)
+    (let ((name (string->symbol
+                 (string-append "test." (system-test-name test)
+                                "." system))))
+      (cons name (test->thunk test))))
+
+  (if (member system %guixsd-supported-systems)
+      (map ->job (all-system-tests))
+      '()))
+
 (define (tarball-jobs store system)
  "Return Hydra jobs to build the self-contained Guix binary tarball."
  (define (->alist drv)
@@ -178,7 +215,9 @@ all its dependencies, and ready to be installed on non-GuixSD distributions.")
  (define (->job name drv)
    (let ((name (symbol-append name (string->symbol ".")
                               (string->symbol system))))
-      `(,name . ,(cut ->alist drv))))
+      `(,name . ,(lambda ()
+                   (parameterize ((%graft? #f))
+                     (->alist drv))))))

  ;; XXX: Add a job for the stable Guix?
  (list (->job 'binary-tarball
@@ -269,6 +308,7 @@ valid."
                                                system))))
                       (append (filter-map job all)
                               (qemu-jobs store system)
+                               (system-test-jobs store system)
                               (tarball-jobs store system)
                               (cross-jobs system))))
                    ((core)
@@ -0,0 +1,85 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; 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/>.
+
+(define-module (run-system-tests)
+  #:use-module (gnu tests)
+  #:use-module (guix store)
+  #:use-module (guix monads)
+  #:use-module (guix derivations)
+  #:use-module (guix ui)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-34)
+  #:use-module (ice-9 match)
+  #:export (run-system-tests))
+
+(define (built-derivations* drv)
+  (lambda (store)
+    (guard (c ((nix-protocol-error? c)
+               (values #f store)))
+      (values (build-derivations store drv) store))))
+
+(define (filterm mproc lst)                       ;XXX: move to (guix monads)
+  (with-monad %store-monad
+    (>>= (foldm %store-monad
+                (lambda (item result)
+                  (mlet %store-monad ((keep? (mproc item)))
+                    (return (if keep?
+                                (cons item result)
+                                result))))
+                '()
+                lst)
+         (lift1 reverse %store-monad))))
+
+(define (run-system-tests . args)
+  (define tests
+    ;; Honor the 'TESTS' environment variable so that one can select a subset
+    ;; of tests to run in the usual way:
+    ;;
+    ;;   make check-system TESTS=installed-os
+    (match (getenv "TESTS")
+      (#f
+       (all-system-tests))
+      ((= string-tokenize (tests ...))
+       (filter (lambda (test)
+                 (member (system-test-name test) tests))
+               (all-system-tests)))))
+
+  (format (current-error-port) "Running ~a system tests...~%"
+          (length tests))
+
+  (with-store store
+    (run-with-store store
+      (mlet* %store-monad ((drv (mapm %store-monad system-test-value tests))
+                           (out -> (map derivation->output-path drv)))
+        (mbegin %store-monad
+          (show-what-to-build* drv)
+          (set-build-options* #:keep-going? #t #:keep-failed? #t)
+          (built-derivations* drv)
+          (mlet %store-monad ((valid  (filterm (store-lift valid-path?)
+                                               out))
+                              (failed (filterm (store-lift
+                                                (negate valid-path?))
+                                               out)))
+            (format #t "TOTAL: ~a\n" (length drv))
+            (for-each (lambda (item)
+                        (format #t "PASS: ~a~%" item))
+                      valid)
+            (for-each (lambda (item)
+                        (format #t "FAIL: ~a~%" item))
+                      failed)
+            (exit (null? failed))))))))
@@ -0,0 +1,189 @@
+;;;; test-driver.scm - Guile test driver for Automake testsuite harness
+
+(define script-version "2016-04-03.12") ;UTC
+
+;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
+;;;
+;;; This program 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.
+;;;
+;;; This program 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 script provides a Guile test driver using the SRFI-64 Scheme API for
+;;; test suites.  SRFI-64 is distributed with Guile since version 2.0.9.
+;;;
+;;;; Code:
+
+(use-modules (ice-9 getopt-long)
+             (ice-9 pretty-print)
+             (srfi srfi-26)
+             (srfi srfi-64))
+
+(define (show-help)
+  (display "Usage:
+   test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+               [--expect-failure={yes|no}] [--color-tests={yes|no}]
+               [--enable-hard-errors={yes|no}] [--brief={yes|no}}] [--]
+               TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.\n"))
+
+(define %options
+  '((test-name                 (value #t))
+    (log-file                  (value #t))
+    (trs-file                  (value #t))
+    (color-tests               (value #t))
+    (expect-failure            (value #t)) ;XXX: not implemented yet
+    (enable-hard-errors        (value #t)) ;not implemented in SRFI-64
+    (brief                     (value #t))
+    (help    (single-char #\h) (value #f))
+    (version (single-char #\V) (value #f))))
+
+(define (option->boolean options key)
+  "Return #t if the value associated with KEY in OPTIONS is \"yes\"."
+  (and=> (option-ref options key #f) (cut string=? <> "yes")))
+
+(define* (test-display field value  #:optional (port (current-output-port))
+                       #:key pretty?)
+  "Display \"FIELD: VALUE\\n\" on PORT."
+  (if pretty?
+      (begin
+        (format port "~A:~%" field)
+        (pretty-print value port #:per-line-prefix "+ "))
+      (format port "~A: ~A~%" field value)))
+
+(define* (result->string symbol #:key colorize?)
+  "Return SYMBOL as an upper case string.  Use colors when COLORIZE is #t."
+  (let ((result (string-upcase (symbol->string symbol))))
+    (if colorize?
+        (string-append (case symbol
+                         ((pass)       "[0;32m")  ;green
+                         ((xfail)      "[1;32m")  ;light green
+                         ((skip)       "[1;34m")  ;blue
+                         ((fail xpass) "[0;31m")  ;red
+                         ((error)      "[0;35m")) ;magenta
+                       result
+                       "[m")          ;no color
+        result)))
+
+(define* (test-runner-gnu test-name #:key color? brief? out-port trs-port)
+  "Return an custom SRFI-64 test runner.  TEST-NAME is a string specifying the
+file name of the current the test.  COLOR? specifies whether to use colors,
+and BRIEF?, well, you know.  OUT-PORT and TRS-PORT must be output ports.  The
+current output port is supposed to be redirected to a '.log' file."
+
+  (define (test-on-test-begin-gnu runner)
+    ;; Procedure called at the start of an individual test case, before the
+    ;; test expression (and expected value) are evaluated.
+    (let ((result (cute assq-ref (test-result-alist runner) <>)))
+      (test-display "test-name" (result 'test-name))
+      (test-display "location"
+                    (string-append (result 'source-file) ":"
+                                   (number->string (result 'source-line))))
+      (test-display "source" (result 'source-form) #:pretty? #t)))
+
+  (define (test-on-test-end-gnu runner)
+    ;; Procedure called at the end of an individual test case, when the result
+    ;; of the test is available.
+    (let* ((results (test-result-alist runner))
+           (result? (cut assq <> results))
+           (result  (cut assq-ref results <>)))
+      (unless brief?
+        ;; Display the result of each test case on the console.
+        (test-display
+         (result->string (test-result-kind runner) #:colorize? color?)
+         (string-append test-name " - " (test-runner-test-name runner))
+         out-port))
+      (when (result? 'expected-value)
+        (test-display "expected-value" (result 'expected-value)))
+      (when (result? 'expected-error)
+        (test-display "expected-error" (result 'expected-error) #:pretty? #t))
+      (when (result? 'actual-value)
+        (test-display "actual-value" (result 'actual-value)))
+      (when (result? 'actual-error)
+        (test-display "actual-error" (result 'actual-error) #:pretty? #t))
+      (test-display "result" (result->string (result 'result-kind)))
+      (newline)
+      (test-display ":test-result"
+                    (string-append (result->string (test-result-kind runner))
+                                   " " (test-runner-test-name runner))
+                    trs-port)))
+
+  (define (test-on-group-end-gnu runner)
+    ;; Procedure called by a 'test-end', including at the end of a test-group.
+    (let ((fail (or (positive? (test-runner-fail-count runner))
+                    (positive? (test-runner-xpass-count runner))))
+          (skip (or (positive? (test-runner-skip-count runner))
+                    (positive? (test-runner-xfail-count runner)))))
+      ;; XXX: The global results need some refinements for XPASS.
+      (test-display ":global-test-result"
+                    (if fail "FAIL" (if skip "SKIP" "PASS"))
+                    trs-port)
+      (test-display ":recheck"
+                    (if fail "yes" "no")
+                    trs-port)
+      (test-display ":copy-in-global-log"
+                    (if (or fail skip) "yes" "no")
+                    trs-port)
+      (when brief?
+        ;; Display the global test group result on the console.
+        (test-display (result->string (if fail 'fail (if skip 'skip 'pass))
+                                      #:colorize? color?)
+                      test-name
+                      out-port))
+      #f))
+
+  (let ((runner (test-runner-null)))
+    (test-runner-on-test-begin! runner test-on-test-begin-gnu)
+    (test-runner-on-test-end! runner test-on-test-end-gnu)
+    (test-runner-on-group-end! runner test-on-group-end-gnu)
+    (test-runner-on-bad-end-name! runner test-on-bad-end-name-simple)
+    runner))
+
+
+;;;
+;;; Entry point.
+;;;
+
+(define (main . args)
+  (let* ((opts   (getopt-long (command-line) %options))
+         (option (cut option-ref opts <> <>)))
+    (cond
+     ((option 'help #f)    (show-help))
+     ((option 'version #f) (format #t "test-driver.scm ~A" script-version))
+     (else
+      (let ((log (open-file (option 'log-file "") "w0"))
+            (trs (open-file (option 'trs-file "") "wl"))
+            (out (duplicate-port (current-output-port) "wl")))
+        (redirect-port log (current-output-port))
+        (redirect-port log (current-warning-port))
+        (redirect-port log (current-error-port))
+        (test-with-runner
+            (test-runner-gnu (option 'test-name #f)
+                             #:color? (option->boolean opts 'color-tests)
+                             #:brief? (option->boolean opts 'brief)
+                             #:out-port out #:trs-port trs)
+          (load-from-path (option 'test-name #f)))
+        (close-port log)
+        (close-port trs)
+        (close-port out))))
+    (exit 0)))
+
+;;; Local Variables:
+;;; eval: (add-hook 'write-file-functions 'time-stamp)
+;;; time-stamp-start: "(define script-version \""
+;;; time-stamp-format: "%:y-%02m-%02d.%02H"
+;;; time-stamp-time-zone: "UTC"
+;;; time-stamp-end: "\") ;UTC"
+;;; End:
+
+;;;; test-driver.scm ends here.
@@ -29,6 +29,16 @@
 # stdout.
 unset CDPATH

+case "$1" in
+    --quiet-stderr)
+	# Silence the daemon's output, which is often useless, as well as that
+	# of Bash (such as "Terminated" messages when 'guix-daemon' is
+	# killed.)
+	exec 2> /dev/null
+	shift
+	;;
+esac
+
 if [ -x "@abs_top_builddir@/guix-daemon" ]
 then
    NIX_STORE_DIR="@GUIX_TEST_ROOT@/store"
@@ -59,16 +69,16 @@ then
    fi

    # The configuration directory, for import/export signing keys.
-    NIX_CONF_DIR="@GUIX_TEST_ROOT@/etc"
-    if [ ! -d "$NIX_CONF_DIR" ]
+    GUIX_CONFIGURATION_DIRECTORY="@GUIX_TEST_ROOT@/etc"
+    if [ ! -d "$GUIX_CONFIGURATION_DIRECTORY" ]
    then
 	# Copy the keys so that the secret key has the right permissions (the
 	# daemon errors out when this is not the case.)
-	mkdir -p "$NIX_CONF_DIR"
+	mkdir -p "$GUIX_CONFIGURATION_DIRECTORY"
 	cp "@abs_top_srcdir@/tests/signing-key.sec"	\
 	    "@abs_top_srcdir@/tests/signing-key.pub"	\
-	    "$NIX_CONF_DIR"
-	chmod 400 "$NIX_CONF_DIR/signing-key.sec"
+	    "$GUIX_CONFIGURATION_DIRECTORY"
+	chmod 400 "$GUIX_CONFIGURATION_DIRECTORY/signing-key.sec"
    fi

    # A place to store data of the substituter.
@@ -90,7 +100,7 @@ then
 	NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR	\
 	NIX_ROOT_FINDER GUIX_BINARY_SUBSTITUTE_URL		\
        GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES			\
-        NIX_CONF_DIR XDG_CACHE_HOME NIXPKGS
+        GUIX_CONFIGURATION_DIRECTORY XDG_CACHE_HOME NIXPKGS

    # Launch the daemon without chroot support because is may be
    # unavailable, for instance if we're not running as root.
@@ -113,10 +113,10 @@ if test "x$guix_build_daemon" = "xyes"; then
  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"
+    guix_substitute_urls="https://mirror.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"
+    guix_substitute_urls="http://mirror.hydra.gnu.org"
  fi
  AC_MSG_CHECKING([for default substitute URLs])
  AC_MSG_RESULT([$guix_substitute_urls])
@@ -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.11.0], [bug-guix@gnu.org], [guix],
  [http://www.gnu.org/software/guix/])
 AC_CONFIG_AUX_DIR([build-aux])

@@ -86,11 +86,6 @@ dnl Check whether (srfi srfi-37) works, and provide our own if it doesn't.
 GUIX_CHECK_SRFI_37
 AM_CONDITIONAL([INSTALL_SRFI_37], [test "x$ac_cv_guix_srfi_37_broken" = xyes])

-dnl Check whether (guix build syscalls) can be built.
-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])
@@ -194,6 +189,17 @@ AC_SUBST([LIBGCRYPT_LIBDIR])

 GUIX_ASSERT_LIBGCRYPT_USABLE

+dnl Library name of zlib suitable for 'dynamic-link'.
+GUIX_LIBZ_LIBDIR([libz_libdir])
+if test "x$libz_libdir" = "x"; then
+  LIBZ="libz"
+else
+  LIBZ="$libz_libdir/libz"
+fi
+AC_MSG_CHECKING([for zlib's shared library name])
+AC_MSG_RESULT([$LIBZ])
+AC_SUBST([LIBZ])
+
 AC_CACHE_SAVE

 m4_include([config-daemon.ac])
@@ -211,8 +217,9 @@ AC_CONFIG_FILES([Makefile
 		 guix/config.scm])

 AC_CONFIG_FILES([scripts/guix], [chmod +x scripts/guix])
-AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
-AC_CONFIG_FILES([test-env],     [chmod +x test-env])
+AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
+AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
+  [chmod +x pre-inst-env])

 dnl Emacs interface.
 AC_PATH_PROG([DOT_USER_PROGRAM], [dot], [dot])
@@ -15,6 +15,10 @@ 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.

+Contributors are not required to use their legal name in patches and
+on-line communication; they can use any name or pseudonym of their
+choice.
+
@menu
 * Building from Git::           The latest and greatest.
 * Running Guix Before It Is Installed::  Hacker tricks.
@@ -78,9 +82,13 @@ export ACLOCAL_PATH=/usr/share/aclocal
@xref{Macro Search Path,,, automake, The GNU Automake Manual}, for
 more information.

-Then, run @command{./configure} as usual.
+Then, run @command{./configure} as usual.  Make sure to pass
+@code{--localstatedir=@var{directory}} where @var{directory} is the
+@code{localstatedir} value used by your current installation (@pxref{The
+Store}, for information about this).

-Finally, you have to invoke @code{make check} to run tests.  If anything
+Finally, you have to invoke @code{make check} to run tests
+(@pxref{Running the Test Suite}).  If anything
 fails, take a look at installation instructions (@pxref{Installation})
 or send a message to the @email{guix-devel@@gnu.org, mailing list}.

@@ -280,6 +288,20 @@ name of the new or modified package, and fix any errors it reports
 Make sure the package builds on your platform, using @code{guix build
@var{package}}.

+@item
+@cindex bundling
+Make sure the package does not use bundled copies of software already
+available as separate packages.
+
+Sometimes, packages include copies of the source code of their
+dependencies as a convenience for users.  However, as a distribution, we
+want to make sure that such packages end up using the copy we already
+have in the distribution, if there is one.  This improves resource usage
+(the dependency is built and stored only once), and allows the
+distribution to make transverse changes such as applying security
+updates for a given software package in a single place and have them
+affect the whole system---something that bundled copies prevent.
+
@item
 Take a look at the profile reported by @command{guix size}
 (@pxref{Invoking guix size}).  This will allow you to notice references
@@ -292,6 +314,13 @@ For important changes, check that dependent package (if applicable) are
 not affected by the change; @code{guix refresh --list-dependent
@var{package}} will help you do that (@pxref{Invoking guix refresh}).

+Packages with roughly 100 dependents or more usually have to be
+committed to a separate branch.  That branch can then be built
+separately by our build farm, and later merged into @code{master} once
+everything has been successfully built.  This allows us to fix issues
+before they hit users, and to reduce the window during which pre-built
+binaries are not available.
+
@item
@cindex determinism, of build processes
@cindex reproducible builds, checking
@@ -319,8 +348,24 @@ 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.

+@item
+When writing documentation, please use gender-neutral wording when
+referring to people, such as
+@uref{https://en.wikipedia.org/wiki/Singular_they, singular
+``they''@comma{} ``their''@comma{} ``them''}, and so forth.
+
+@item
+Verify that your patch contains only one set of related changes.
+Bundling unrelated changes together makes reviewing harder and slower.
+
+Examples of unrelated changes include the addition of several packages,
+or a package update along with fixes to that package.
+
@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.
+send-email} command.  We prefer to get patches in plain text messages,
+either inline or as MIME attachments.  You are advised to pay attention if
+your email client changes anything like line breaks or indentation which
+could could potentially break the patches.
@@ -10,6 +10,7 @@ Guix convenient and fun.
 * 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.
+* Package Source Locations: Emacs Package Locations.	Interface for package location files.
 * 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.
@@ -160,6 +161,16 @@ 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-packages-by-location
+Display package(s) located in the specified file.  These files usually
+have the following form: @file{gnu/packages/emacs.scm}, but don't type
+them manually!  Press @key{TAB} to complete the file name.
+
+@item M-x guix-package-from-file
+Display package that the code within the specified file evaluates to.
+@xref{Invoking guix package, @code{--install-from-file}}, for an example
+of what such a file may look like.
+
@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
@@ -217,30 +228,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
@@ -562,9 +549,57 @@ 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}).

+@item M-x guix-find-license-definition
+Open @file{@dots{}/guix/licenses.scm} and move to the specified license.
+
@end table


+@node Emacs Package Locations
+@section Package Source Locations
+
+As you know, package definitions are placed in Guile files, also known
+as @dfn{package locations}.  The following commands should help you not
+get lost in these locations:
+
+@table @kbd
+
+@item M-x guix-locations
+Display a list of package locations.  You can press @key{RET} there to
+display packages placed in the current location in the same way as
+@kbd{M-x guix-packages-by-location} would do (@pxref{Emacs Commands}).
+Note that when the point is on a location button, @key{RET} will open
+this location file.
+
+@item M-x guix-find-location
+Open the given package definition source file (press @key{TAB} to choose
+a location from a completion list).
+
+@item M-x guix-edit
+Find location of a specified package.  This is an Emacs analog of
+@command{guix edit} command (@pxref{Invoking 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-find-location} and @kbd{M-x guix-edit} to open locations from your
+Git checkout.  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-find-location} or @kbd{M-x guix-edit}
+command.
+
+
@node Emacs Popup Interface
@section Popup Interface

@@ -1,7 +1,7 @@
 # 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
+htmlxrefversion=2016-03-30.07; # UTC

 # Copyright 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
 # 
@@ -324,7 +324,7 @@ 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
+gnutls-guile	node	http://gnutls.org/manual/gnutls-guile/

 gperf		mono	${GS}/gperf/manual/gperf.html
 gperf		node	${GS}/gperf/manual/html_node/
@@ -20,49 +20,49 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

-info_TEXINFOS = doc/guix.texi
+info_TEXINFOS = %D%/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
+  %D%/images/bootstrap-graph.dot		\
+  %D%/images/bootstrap-packages.dot		\
+  %D%/images/coreutils-graph.dot		\
+  %D%/images/coreutils-bag-graph.dot		\
+  %D%/images/service-graph.dot			\
+  %D%/images/shepherd-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				\
+  %D%/htmlxref.cnf				\
+  %D%/contributing.texi				\
+  %D%/emacs.texi				\
+  %D%/fdl-1.3.texi				\
  $(DOT_FILES)					\
  $(DOT_VECTOR_GRAPHICS)			\
-  doc/images/coreutils-size-map.eps		\
-  doc/environment-gdb.scm			\
-  doc/package-hello.scm
+  %D%/images/coreutils-size-map.eps		\
+  %D%/environment-gdb.scm			\
+  %D%/package-hello.scm

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

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

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

 infoimagedir = $(infodir)/images
 dist_infoimage_DATA =				\
  $(DOT_FILES:%.dot=%.png)			\
-  doc/images/coreutils-size-map.png
+  %D%/images/coreutils-size-map.png

 # Try hard to obtain an image size and aspect that's reasonable for inclusion
 # in an Info or PDF document.
@@ -86,13 +86,13 @@ DOT_OPTIONS =					\
 	$(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
 	mv "$@-tmp.eps" "$@"

-# We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake)
+# We cannot add new dependencies to `%D%/guix.pdf' & co. (info "(automake)
 # Extending").  Using the `-local' rules is imperfect, because they may be
 # triggered after the main rule.  Oh, well.
 pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
 info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
 ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps)		\
-	  $(top_srcdir)/doc/images/coreutils-size-map.eps
+	  $(top_srcdir)/%D%/images/coreutils-size-map.eps
 dvi-local: ps-local

 ## ----------- ##
@@ -106,25 +106,25 @@ dvi-local: ps-local
 # They are built in $(srcdir) like info manuals.

 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
+  $(srcdir)/%D%/guix-archive.1			\
+  $(srcdir)/%D%/guix-build.1			\
+  $(srcdir)/%D%/guix-challenge.1		\
+  $(srcdir)/%D%/guix-download.1			\
+  $(srcdir)/%D%/guix-edit.1			\
+  $(srcdir)/%D%/guix-environment.1		\
+  $(srcdir)/%D%/guix-gc.1			\
+  $(srcdir)/%D%/guix-hash.1			\
+  $(srcdir)/%D%/guix-import.1			\
+  $(srcdir)/%D%/guix-lint.1			\
+  $(srcdir)/%D%/guix-package.1			\
+  $(srcdir)/%D%/guix-publish.1			\
+  $(srcdir)/%D%/guix-pull.1			\
+  $(srcdir)/%D%/guix-refresh.1			\
+  $(srcdir)/%D%/guix-size.1			\
+  $(srcdir)/%D%/guix-system.1

 dist_man1_MANS =				\
-  $(srcdir)/doc/guix.1				\
+  $(srcdir)/%D%/guix.1				\
  $(sub_commands_mans)

 gen_man =						\
@@ -133,14 +133,14 @@ gen_man =						\

 HELP2MANFLAGS = --source=GNU --info-page=$(PACKAGE_TARNAME)

-$(srcdir)/doc/guix.1: scripts/guix.in $(sub_commands_mans)
+$(srcdir)/%D%/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)
+$(srcdir)/%D%/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
 	-@case '$?' in \
 	  *$<*) $(AM_V_P) && set -x || echo "  HELP2MAN $@"; \
 	        $(gen_man) --output="$@" "guix $*";; \
@@ -149,9 +149,9 @@ $(srcdir)/doc/guix-%.1: guix/scripts/%.scm $(GOBJECTS)

 if BUILD_DAEMON

-dist_man1_MANS += $(srcdir)/doc/guix-daemon.1
+dist_man1_MANS += $(srcdir)/%D%/guix-daemon.1

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

 endif
@@ -0,0 +1,37 @@
+;;; guix-about.el --- Various info about Guix
+
+;; 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 Location as published by
+;; the Free Software Foundation, either version 3 of the Location, 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 Location for more details.
+
+;; You should have received a copy of the GNU General Public Location
+;; along with this program.  If not, see <http://www.gnu.org/locations/>.
+
+;;; Commentary:
+
+;; This file provides the code to display various info about Guix (e.g., its
+;; version).
+
+;;; Code:
+
+(require 'guix-config)
+
+;;;###autoload
+(defun guix-version ()
+  "Display Guix version in the echo area."
+  (interactive)
+  (message "%s %s" guix-config-name guix-config-version))
+
+(provide 'guix-about)
+
+;;; guix-about.el ends here
@@ -82,7 +82,7 @@ If you have a slow system, try to increase this time."
  :type 'string
  :group 'guix-repl)

-(defcustom guix-after-start-repl-hook ()
+(defcustom guix-after-start-repl-hook '(guix-set-directory)
  "Hook called after Guix REPL is started."
  :type 'hook
  :group 'guix-repl)
@@ -336,6 +336,28 @@ additional internal REPL if it exists."
  (interactive "P")
  (geiser-repl--switch-to-buffer (guix-get-repl-buffer internal)))

+
+;;; Guix directory
+
+(defvar guix-directory nil
+  "Default directory with Guix source.
+If it is not set by a user, it is set after starting Guile REPL.
+This directory is used to define package locations.")
+
+(defun guix-read-directory ()
+  "Return `guix-directory' or prompt for it.
+This function is intended for using in `interactive' forms."
+  (if current-prefix-arg
+      (read-directory-name "Directory with Guix modules: "
+                           guix-directory)
+    guix-directory))
+
+(defun guix-set-directory ()
+  "Set `guix-directory' if needed."
+  (or guix-directory
+      (setq guix-directory
+            (guix-eval-read "%guix-dir"))))
+

 ;;; Evaluating expressions

@@ -48,53 +48,7 @@
          (when output (concat ":" output))))


-;;; Location of packages, profiles and manifests
-
-(defvar guix-directory nil
-  "Default Guix directory.
-If it is not set by a user, it is set after starting Guile REPL.
-This directory is used to define location of the packages.")
-
-(defun guix-read-directory ()
-  "Return `guix-directory' or prompt for it.
-This function is intended for using in `interactive' forms."
-  (if current-prefix-arg
-      (read-directory-name "Directory with Guix modules: "
-                           guix-directory)
-    guix-directory))
-
-(defun guix-set-directory ()
-  "Set `guix-directory' if needed."
-  (or guix-directory
-      (setq guix-directory
-            (guix-eval-read "%guix-dir"))))
-
-(add-hook 'guix-after-start-repl-hook 'guix-set-directory)
-
-(defun guix-find-location (location &optional directory)
-  "Go to LOCATION of a package.
-LOCATION is a string of the form:
-
-  \"PATH:LINE:COLUMN\"
-
-If PATH is relative, it is considered to be relative to
-DIRECTORY (`guix-directory' by default)."
-  (cl-multiple-value-bind (path line col)
-      (split-string location ":")
-    (let ((file (expand-file-name path (or directory guix-directory)))
-          (line (string-to-number line))
-          (col  (string-to-number col)))
-      (find-file file)
-      (goto-char (point-min))
-      (forward-line (- line 1))
-      (move-to-column col)
-      (recenter 1))))
-
-(defun guix-package-location (id-or-name)
-  "Return location of a package with ID-OR-NAME.
-For the meaning of location, see `guix-find-location'."
-  (guix-eval-read (guix-make-guile-expression
-                   'package-location-string id-or-name)))
+;;; Location of profiles and manifests

 (defun guix-generation-file (profile generation)
  "Return the file name of a PROFILE's GENERATION."
@@ -120,20 +74,6 @@ See `guix-packages-profile'."
  (expand-file-name "manifest"
                    (guix-packages-profile profile generation system?)))

-;;;###autoload
-(defun guix-edit (id-or-name &optional directory)
-  "Edit (go to location of) package with ID-OR-NAME.
-See `guix-find-location' for the meaning of package location and
-DIRECTORY.
-Interactively, with prefix argument, prompt for DIRECTORY."
-  (interactive
-   (list (guix-read-package-name)
-         (guix-read-directory)))
-  (let ((loc (guix-package-location id-or-name)))
-    (if loc
-        (guix-find-location loc directory)
-      (message "Couldn't find package location."))))
-

 ;;; Actions on packages and generations

@@ -267,6 +207,13 @@ Ask a user with PROMPT for continuing an operation."
   (guix-make-guile-expression
    'package-source-path package-id)))

+(defun guix-package-store-path (package-id)
+  "Return a list of store directories of outputs of package PACKAGE-ID."
+  (message "Calculating the package derivation ...")
+  (guix-eval-read
+   (guix-make-guile-expression
+    'package-store-path package-id)))
+
 (defvar guix-after-source-download-hook nil
  "Hook run after successful performing a 'source-download' operation.")

@@ -284,6 +231,20 @@ Ask a user with PROMPT for continuing an operation."
      :dry-run? (or guix-dry-run 'f))
     nil 'source-download)))

+(defun guix-build-package (package-id &optional prompt)
+  "Build package with PACKAGE-ID.
+Ask a user with PROMPT for continuing the build operation."
+  (when (or (not guix-operation-confirm)
+            (guix-operation-prompt (or prompt "Build package?")))
+    (guix-eval-in-repl
+     (format (concat ",run-in-store "
+                     "(build-package (package-by-id %d)"
+                     " #:use-substitutes? %s"
+                     " #:dry-run? %s)")
+             package-id
+             (guix-guile-boolean guix-use-substitutes)
+             (guix-guile-boolean guix-dry-run)))))
+
 ;;;###autoload
 (defun guix-apply-manifest (profile file &optional operation-buffer)
  "Apply manifest from FILE to PROFILE.
@@ -1,7 +1,7 @@
 ;;; guix-config.el --- Compile-time configuration of Guix.

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

 ;; This file is part of GNU Guix.

@@ -20,11 +20,17 @@

 ;;; Code:

+(defconst guix-config-name "@PACKAGE_NAME@"
+  "Guix full name.")
+
+(defconst guix-config-version "@PACKAGE_VERSION@"
+  "Guix version.")
+
 (defconst guix-config-emacs-interface-directory
  (replace-regexp-in-string "${prefix}" "@prefix@" "@emacsuidir@"))

 (defconst guix-config-state-directory
-  ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'.
+  ;; This must match `NIX_STATE_DIR' as defined in `nix/local.mk'.
  (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix"))

 (defconst guix-config-guile-program "@GUILE@"
@@ -216,6 +216,7 @@ to find 'modify-phases' keywords."
    "with-derivation-substitute"
    "with-directory-excursion"
    "with-error-handling"
+    "with-imported-modules"
    "with-monad"
    "with-mutex"
    "with-store"))
@@ -306,6 +307,7 @@ Each rule should have a form (SYMBOL VALUE).  See `put' for details."
  (with-derivation-substitute 2)
  (with-directory-excursion 1)
  (with-error-handling 0)
+  (with-imported-modules 1)
  (with-monad 1)
  (with-mutex 1)
  (with-store 1)
@@ -57,7 +57,7 @@ Return nil, if current buffer does not define a module."
 (defun guix-guile-boolean (arg)
  "Return a string with guile boolean value.
 Transform elisp ARG (nil or non-nil) to the guile boolean (#f or #t)."
-  (concat "#" (prin1-to-string (if arg 't 'f))))
+  (if arg "#t" "#f"))

 (defun guix-guile-keyword-regexp (keyword)
  "Return regexp to find guile KEYWORD."
@@ -23,14 +23,15 @@

 ;;; 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-license-file (&optional directory)
+  "Return name of the file with license definitions.
+DIRECTORY is a directory with Guix source (`guix-directory' by default)."
+  (expand-file-name "guix/licenses.scm"
+                    (or directory guix-directory)))

 (defun guix-lookup-license-url (license)
  "Return URL of a LICENSE."
@@ -38,80 +39,20 @@
                       '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-find-license-definition (license &optional directory)
+  "Open licenses file from DIRECTORY and move to the LICENSE definition.
+See `guix-license-file' for the meaning of DIRECTORY.
+Interactively, with prefix argument, prompt for DIRECTORY."
+  (interactive
+   (list (guix-read-license-name)
+         (guix-read-directory)))
+  (find-file (guix-license-file directory))
+  (goto-char (point-min))
+  (when (re-search-forward (concat "\"" (regexp-quote license) "\"")
+                           nil t)
+    (beginning-of-defun)
+    (recenter 1)))

 ;;;###autoload
 (defun guix-browse-license-url (license)
@@ -119,12 +60,6 @@ SEARCH-TYPE may be one of the following symbols: `all', `id', `name'."
  (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
@@ -0,0 +1,79 @@
+;;; guix-location.el --- Package locations
+
+;; 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 Location as published by
+;; the Free Software Foundation, either version 3 of the Location, 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 Location for more details.
+
+;; You should have received a copy of the GNU General Public Location
+;; along with this program.  If not, see <http://www.gnu.org/locations/>.
+
+;;; Commentary:
+
+;; This file provides the code to work with locations of Guix packages.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'guix-backend)
+(require 'guix-read)
+(require 'guix-guile)
+
+(defun guix-package-location (id-or-name)
+  "Return location of a package with ID-OR-NAME.
+For the meaning of location, see `guix-find-location'."
+  (guix-eval-read (guix-make-guile-expression
+                   'package-location-string id-or-name)))
+
+;;;###autoload
+(defun guix-find-location (location &optional directory)
+  "Go to LOCATION of a package.
+LOCATION is a string of the form:
+
+  \"FILE:LINE:COLUMN\"
+
+If FILE is relative, it is considered to be relative to
+DIRECTORY (`guix-directory' by default).
+
+Interactively, prompt for LOCATION.  With prefix argument, prompt
+for DIRECTORY as well."
+  (interactive
+   (list (guix-read-package-location)
+         (guix-read-directory)))
+  (cl-multiple-value-bind (file line column)
+      (split-string location ":")
+    (find-file (expand-file-name file (or directory guix-directory)))
+    (when (and line column)
+      (let ((line   (string-to-number line))
+            (column (string-to-number column)))
+        (goto-char (point-min))
+        (forward-line (- line 1))
+        (move-to-column column)
+        (recenter 1)))))
+
+;;;###autoload
+(defun guix-edit (id-or-name &optional directory)
+  "Edit (go to location of) package with ID-OR-NAME.
+See `guix-find-location' for the meaning of package location and
+DIRECTORY.
+Interactively, with prefix argument, prompt for DIRECTORY."
+  (interactive
+   (list (guix-read-package-name)
+         (guix-read-directory)))
+  (let ((loc (guix-package-location id-or-name)))
+    (if loc
+        (guix-find-location loc directory)
+      (message "Couldn't find package location."))))
+
+(provide 'guix-location)
+
+;;; guix-location.el ends here
@@ -32,14 +32,6 @@
 ;; still "name-version" string.  So ‘id’ package parameter in the code
 ;; below is either an object-address number or a full-name string.

-;; To speed-up the process of getting information, the following
-;; auxiliary variables are used:
-;;
-;; - `%packages' - VHash of "package address"/"package" pairs.
-;;
-;; - `%package-table' - Hash table of
-;;   "name+version key"/"list of packages" pairs.
-
 ;;; Code:

 (use-modules
@@ -52,15 +44,16 @@
 (srfi srfi-19)
 (srfi srfi-26)
 (guix)
+ (guix combinators)
 (guix git-download)
+ (guix grafts)
 (guix packages)
 (guix profiles)
 (guix licenses)
 (guix utils)
 (guix ui)
- (guix scripts lint)
+ (guix scripts)
 (guix scripts package)
- (guix scripts pull)
 (gnu packages)
 (gnu system))

@@ -102,28 +95,6 @@ return two values: name and version.  For example, for SPEC
        (string-append full-name ":" output)
        full-name)))

-(define name+version->key cons)
-(define key->name+version car+cdr)
-
-(define %packages
-  (fold-packages (lambda (pkg res)
-                   (vhash-consq (object-address pkg) pkg res))
-                 vlist-null))
-
-(define %package-table
-  (let ((table (make-hash-table (vlist-length %packages))))
-    (vlist-for-each
-     (lambda (elem)
-       (match elem
-         ((address . pkg)
-          (let* ((key (name+version->key (package-name pkg)
-                                         (package-version pkg)))
-                 (ref (hash-ref table key)))
-            (hash-set! table key
-                       (if ref (cons pkg ref) (list pkg)))))))
-     %packages)
-    table))
-
 (define (manifest-entry->name+version+output entry)
  (values
   (manifest-entry-name    entry)
@@ -293,8 +264,10 @@ Example:

 (define (package-unique? package)
  "Return #t if PACKAGE is a single package with such name/version."
-  (null? (cdr (packages-by-name (package-name package)
-                                (package-version package)))))
+  (match (packages-by-name (package-name package)
+                           (package-version package))
+    ((package) #t)
+    (_ #f)))

 (define %package-param-alist
  `((id                . ,object-address)
@@ -329,14 +302,39 @@ Example:

 ;;; Finding packages.

-(define (package-by-address address)
-  (and=> (vhash-assq address %packages)
-         cdr))
+(define-values (package-by-address
+                register-package)
+  (let ((table (delay (fold-packages
+                       (lambda (package table)
+                         (vhash-consq (object-address package)
+                                      package table))
+                       vlist-null))))
+    (values
+     (lambda (address)
+       "Return package by its object ADDRESS."
+       (match (vhash-assq address (force table))
+         ((_ . package) package)
+         (_ #f)))
+     (lambda (package)
+       "Register PACKAGE by its 'object-address', so that later
+'package-by-address' can be used to access it."
+       (let ((table* (force table)))
+         (set! table
+               (delay (vhash-consq (object-address package)
+                                   package table*))))))))

-(define (packages-by-name+version name version)
-  (or (hash-ref %package-table
-                (name+version->key name version))
-      '()))
+(define packages-by-name+version
+  (let ((table (delay (fold-packages
+                       (lambda (package table)
+                         (let ((file (location-file
+                                      (package-location package))))
+                           (vhash-cons (cons (package-name package)
+                                             (package-version package))
+                                       package table)))
+                       vlist-null))))
+    (lambda (name version)
+      "Return packages matching NAME and VERSION."
+      (vhash-fold* cons '() (cons name version) (force table)))))

 (define (packages-by-full-name full-name)
  (call-with-values
@@ -423,6 +421,15 @@ MATCH-PARAMS is a list of parameters that REGEXP can match."
              '()
              (find-newest-available-packages)))

+(define (packages-from-file file)
+  "Return a list of packages from FILE."
+  (let ((package (load (canonicalize-path file))))
+    (if (package? package)
+        (begin
+          (register-package package)
+          (list package))
+        '())))
+

 ;;; Making package/output patterns.

@@ -673,6 +680,10 @@ ENTRIES is a list of installed manifest entries."
         (license-proc          (lambda (_ license-name)
                                  (packages-by-license
                                   (lookup-license license-name))))
+         (location-proc         (lambda (_ location)
+                                  (packages-by-location-file location)))
+         (file-proc             (lambda (_ file)
+                                  (packages-from-file file)))
         (all-proc              (lambda _ (all-available-packages)))
         (newest-proc           (lambda _ (newest-available-packages))))
    `((package
@@ -682,6 +693,8 @@ ENTRIES is a list of installed manifest entries."
       (obsolete         . ,(apply-to-first obsolete-package-patterns))
       (regexp           . ,regexp-proc)
       (license          . ,license-proc)
+       (location         . ,location-proc)
+       (from-file        . ,file-proc)
       (all-available    . ,all-proc)
       (newest-available . ,newest-proc))
      (output
@@ -691,6 +704,8 @@ ENTRIES is a list of installed manifest entries."
       (obsolete         . ,(apply-to-first obsolete-output-patterns))
       (regexp           . ,regexp-proc)
       (license          . ,license-proc)
+       (location         . ,location-proc)
+       (from-file        . ,file-proc)
       (all-available    . ,all-proc)
       (newest-available . ,newest-proc)))))

@@ -916,35 +931,16 @@ OUTPUTS is a list of package outputs (may be an empty list)."
         (new-manifest (manifest-perform-transaction
                        manifest transaction)))
    (unless (and (null? install) (null? remove))
-      (with-store store
-        (let* ((derivation (run-with-store store
-                             (mbegin %store-monad
-                               (set-guile-for-build (default-guile))
-                               (profile-derivation new-manifest))))
-               (derivations (list derivation))
-               (new-profile (derivation->output-path derivation)))
+      (parameterize ((%graft? (not dry-run?)))
+        (with-store store
          (set-build-options store
                             #:print-build-trace #f
                             #:use-substitutes? use-substitutes?)
          (show-manifest-transaction store manifest transaction
                                     #:dry-run? dry-run?)
-          (show-what-to-build store derivations
-                              #:use-substitutes? use-substitutes?
-                              #:dry-run? dry-run?)
-          (unless dry-run?
-            (let ((name (generation-file-name
-                         profile
-                         (+ 1 (generation-number profile)))))
-              (and (build-derivations store derivations)
-                   (let* ((entries (manifest-entries new-manifest))
-                          (count   (length entries)))
-                     (switch-symlinks name new-profile)
-                     (switch-symlinks profile name)
-                     (format #t (N_ "~a package in profile~%"
-                                    "~a packages in profile~%"
-                                    count)
-                             count)
-                     (display-search-paths entries (list profile)))))))))))
+          (build-and-use-profile store profile new-manifest
+                                 #:use-substitutes? use-substitutes?
+                                 #:dry-run? dry-run?))))))

 (define (delete-generations* profile generations)
  "Delete GENERATIONS from PROFILE.
@@ -960,6 +956,17 @@ GENERATIONS is a list of generation numbers."
               ((package _ ...) package)))
         (compose location->string package-location)))

+(define (package-store-path package-id)
+  "Return a list of store directories of outputs of package PACKAGE-ID."
+  (match (package-by-id package-id)
+    (#f '())
+    (package
+      (with-store store
+        (map (match-lambda
+               ((_ . drv)
+                (derivation-output-path drv)))
+             (derivation-outputs (package-derivation store package)))))))
+
 (define (package-source-derivation->store-path derivation)
  "Return a store path of the package source DERIVATION."
  (match (derivation-outputs derivation)
@@ -995,6 +1002,16 @@ GENERATIONS is a list of generation numbers."
        (format #t "The source store path: ~a~%"
                (package-source-derivation->store-path derivation))))))

+(define (package-build-log-file package-id)
+  "Return the build log file of a package PACKAGE-ID.
+Return #f if the build log is not found."
+  (and-let* ((package (package-by-id package-id)))
+    (with-store store
+      (let* ((derivation (package-derivation store package))
+             (file       (derivation-file-name derivation)))
+        (or (log-file store file)
+            ((@@ (guix scripts build) log-url) store file))))))
+

 ;;; Executing guix commands

@@ -1040,8 +1057,9 @@ Return #t if the shell command was executed successfully."
 (define (lint-checker-names)
  "Return a list of names of available lint checkers."
  (map (lambda (checker)
-         (symbol->string (lint-checker-name checker)))
-       %checkers))
+         (symbol->string ((@ (guix scripts lint) lint-checker-name)
+                          checker)))
+       (@ (guix scripts lint) %checkers)))

 (define (package-names)
  "Return a list of names of available packages."
@@ -1105,3 +1123,41 @@ Return #t if the shell command was executed successfully."
 (define (license-entries search-type . search-values)
  (map license->sexp
       (apply find-licenses search-type search-values)))
+
+
+;;; Package locations
+
+(define-values (packages-by-location-file
+                package-location-files)
+  (let* ((table (delay (fold-packages
+                        (lambda (package table)
+                          (let ((file (location-file
+                                       (package-location package))))
+                            (vhash-cons file package table)))
+                        vlist-null)))
+         (files (delay (vhash-fold
+                        (lambda (file _ result)
+                          (if (member file result)
+                              result
+                              (cons file result)))
+                        '()
+                        (force table)))))
+    (values
+     (lambda (file)
+       "Return the (possibly empty) list of packages defined in location FILE."
+       (vhash-fold* cons '() file (force table)))
+     (lambda ()
+       "Return the list of file names of all package locations."
+       (force files)))))
+
+(define %package-location-param-alist
+  `((id       . ,identity)
+    (location . ,identity)
+    (number-of-packages . ,(lambda (location)
+                             (length (packages-by-location-file location))))))
+
+(define package-location->sexp
+  (object-transformer %package-location-param-alist))
+
+(define (package-location-entries)
+  (map package-location->sexp (package-location-files)))
@@ -40,6 +40,13 @@
      ,(lambda (_ entries licenses)
         (apply #'guix-message-packages-by-license
                entries 'package licenses)))
+     (location
+      ,(lambda (_ entries locations)
+         (apply #'guix-message-packages-by-location
+                entries 'package locations)))
+     (from-file
+      (0 "No package in file '%s'." val)
+      (1 "Package from file '%s'." val))
     (regexp
      (0 "No packages matching '%s'." val)
      (1 "A single package matching '%s'." val)
@@ -72,6 +79,14 @@
      ,(lambda (_ entries licenses)
         (apply #'guix-message-packages-by-license
                entries 'output licenses)))
+     (location
+      ,(lambda (_ entries locations)
+         (apply #'guix-message-packages-by-location
+                entries 'output locations)))
+     (from-file
+      (0 "No package in file '%s'." val)
+      (1 "Package from file '%s'." val)
+      (many "Package outputs from file '%s'." val))
     (regexp
      (0 "No package outputs matching '%s'." val)
      (1 "A single package output matching '%s'." val)
@@ -174,6 +189,13 @@ Try \"M-x guix-search-by-name\"."
         (str-end (format "with license '%s'" license)))
    (message "%s %s." str-beg str-end)))

+(defun guix-message-packages-by-location (entries entry-type location)
+  "Display a message for packages or outputs searched by LOCATION."
+  (let* ((count   (length entries))
+         (str-beg (guix-message-string-entries count entry-type))
+         (str-end (format "placed in '%s'" location)))
+    (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))
@@ -62,6 +62,12 @@
  "Return a list of names of available licenses."
  (guix-eval-read (guix-make-guile-expression 'license-names)))

+(guix-memoized-defun guix-package-locations ()
+  "Return a list of available package locations."
+  (sort (guix-eval-read (guix-make-guile-expression
+                         'package-location-files))
+        #'string<))
+

 ;;; Readers

@@ -131,6 +137,11 @@
 :single-reader guix-read-license-name
 :single-prompt "License: ")

+(guix-define-readers
+ :completions-getter guix-package-locations
+ :single-reader guix-read-package-location
+ :single-prompt "Location: ")
+
 (provide 'guix-read)

 ;;; guix-read.el ends here
@@ -0,0 +1,150 @@
+;;; guix-ui-license.el --- Interface for displaying 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 'list'/'info' interface for displaying licenses of
+;; Guix packages.
+
+;;; Code:
+
+(require 'guix-buffer)
+(require 'guix-list)
+(require 'guix-info)
+(require 'guix-backend)
+(require 'guix-guile)
+(require 'guix-license)
+
+(guix-define-entry-type 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))
+
+(defun guix-license-message (entries search-type &rest args)
+  "Display a message after showing license ENTRIES."
+  ;; Some objects in (guix licenses) module are procedures (e.g.,
+  ;; 'non-copyleft' or 'x11-style').  Such licenses cannot be "described".
+  (when (null entries)
+    (if (cdr args)
+        (message "Unknown licenses.")
+      (message "Unknown license."))))
+
+
+;;; License 'info'
+
+(guix-info-define-interface license
+  :buffer-name "*Guix License Info*"
+  :get-entries-function 'guix-license-get-entries
+  :message-function 'guix-license-message
+  :format '((name ignore (simple guix-info-heading))
+            ignore
+            guix-license-insert-packages-button
+            (url ignore (simple guix-url))
+            guix-license-insert-comment
+            ignore
+            guix-license-insert-file)
+  :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."
+  (let ((license (guix-entry-value entry 'name)))
+    (guix-info-insert-action-button
+     "Packages"
+     (lambda (btn)
+       (guix-packages-by-license (button-get btn 'license)))
+     (format "Display packages with license '%s'" license)
+     'license license)))
+
+(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))))
+
+(defun guix-license-insert-file (entry)
+  "Insert button to open license definition."
+  (let ((license (guix-entry-value entry 'name)))
+    (guix-insert-button
+     (guix-license-file) 'guix-file
+     'help-echo (format "Open definition of license '%s'" license)
+     'action (lambda (btn)
+               (guix-find-license-definition (button-get btn 'license)))
+     'license license)))
+
+
+;;; License 'list'
+
+(guix-list-define-interface license
+  :buffer-name "*Guix Licenses*"
+  :get-entries-function 'guix-license-get-entries
+  :describe-function 'guix-license-list-describe
+  :message-function 'guix-license-message
+  :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 "e")   'guix-license-list-edit)
+  (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)))
+
+(defun guix-license-list-edit (&optional directory)
+  "Go to the location of the current license definition.
+See `guix-license-file' for the meaning of DIRECTORY."
+  (interactive (list (guix-read-directory)))
+  (guix-find-license-definition (guix-list-current-id) directory))
+
+
+;;; Interactive commands
+
+;;;###autoload
+(defun guix-licenses ()
+  "Display licenses of the Guix packages."
+  (interactive)
+  (guix-license-get-display 'all))
+
+(provide 'guix-ui-license)
+
+;;; guix-ui-license.el ends here
@@ -0,0 +1,83 @@
+;;; guix-ui-location.el --- Interface for displaying package locations
+
+;; 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 Location as published by
+;; the Free Software Foundation, either version 3 of the Location, 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 Location for more details.
+
+;; You should have received a copy of the GNU General Public Location
+;; along with this program.  If not, see <http://www.gnu.org/locations/>.
+
+;;; Commentary:
+
+;; This file provides a 'list' interface for displaying locations of Guix
+;; packages.
+
+;;; Code:
+
+(require 'guix-buffer)
+(require 'guix-list)
+(require 'guix-location)
+(require 'guix-backend)
+
+(guix-define-entry-type location)
+
+(defun guix-location-get-entries ()
+  "Receive 'package location' entries."
+  (guix-eval-read "(package-location-entries)"))
+
+
+;;; Location 'list'
+
+(guix-list-define-interface location
+  :buffer-name "*Guix Package Locations*"
+  :get-entries-function 'guix-location-get-entries
+  :format '((location guix-location-list-file-name-specification 50 t)
+            (number-of-packages nil 10 guix-list-sort-numerically-1
+                                :right-align t))
+  :sort-key '(location))
+
+(let ((map guix-location-list-mode-map))
+  (define-key map (kbd "RET") 'guix-location-list-show-packages)
+  ;; "Location Info" buffer is not defined (it would be useless), so
+  ;; unbind "i" key (by default, it is used to display Info buffer).
+  (define-key map (kbd "i") nil))
+
+(defun guix-location-list-file-name-specification (location &optional _)
+  "Return LOCATION button specification for `tabulated-list-entries'."
+  (list location
+        'face 'guix-list-file-name
+        'action (lambda (btn)
+                  (guix-find-location (button-get btn 'location)))
+        'follow-link t
+        'help-echo (concat "Find location: " location)
+        'location location))
+
+(declare-function guix-packages-by-location "guix-ui-package")
+
+(defun guix-location-list-show-packages ()
+  "Display packages placed in the location at point."
+  (interactive)
+  (guix-packages-by-location (guix-list-current-id)))
+
+
+;;; Interactive commands
+
+;;;###autoload
+(defun guix-locations ()
+  "Display locations of the Guix packages."
+  (interactive)
+  (guix-list-get-display-entries 'location))
+
+(provide 'guix-ui-location)
+
+;;; guix-ui-location.el ends here
@@ -1,6 +1,6 @@
 ;;; guix-ui-package.el --- Interface for displaying packages  -*- lexical-binding: t -*-

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

 ;; This file is part of GNU Guix.

@@ -38,6 +38,7 @@
 (require 'guix-hydra-build)
 (require 'guix-read)
 (require 'guix-license)
+(require 'guix-location)
 (require 'guix-profiles)

 (guix-ui-define-entry-type package)
@@ -110,6 +111,19 @@ is found and `guix-package-list-single' is nil."
      (list (if (= 0 package-id) package-id-str package-id)
            output))))

+(defun guix-package-build-log-file (id)
+  "Return build log file name of a package defined by ID."
+  (guix-eval-read
+   (guix-make-guile-expression 'package-build-log-file id)))
+
+(defun guix-package-find-build-log (id)
+  "Show build log of a package defined by ID."
+  (require 'guix-build-log)
+  (let ((file (guix-package-build-log-file id)))
+    (if file
+        (guix-build-log-find-file file)
+      (message "Couldn't find the package build log."))))
+

 ;;; Processing package actions

@@ -221,8 +235,9 @@ ENTRIES is a list of package entries to get info about packages."
            (description ignore (simple guix-package-info-description))
            ignore
            (outputs simple guix-package-info-insert-outputs)
+            guix-package-info-insert-misc
            (source simple guix-package-info-insert-source)
-            (location format (format guix-package-location))
+            (location simple guix-package-info-insert-location)
            (home-url format (format guix-url))
            (license format (format guix-package-license))
            (systems format guix-package-info-insert-systems)
@@ -308,9 +323,15 @@ ENTRIES is a list of package entries to get info about packages."
  "Face used if a package is obsolete."
  :group 'guix-package-info-faces)

+(defcustom guix-package-info-auto-find-package t
+  "If non-nil, open store directory after pressing \"Show\" package button.
+If nil, just display the store directory (or directories) without finding."
+  :type 'boolean
+  :group 'guix-package-info)
+
 (defcustom guix-package-info-auto-find-source nil
-  "If non-nil, find a source file after pressing a \"Show\" button.
-If nil, just display the source file path without finding."
+  "If non-nil, open source file after pressing \"Show\" source button.
+If nil, just display the source file name without finding."
  :type 'boolean
  :group 'guix-package-info)

@@ -324,6 +345,14 @@ prompt depending on `guix-operation-confirm' variable)."
  :type 'boolean
  :group 'guix-package-info)

+(defcustom guix-package-info-button-functions
+  '(guix-package-info-insert-build-button
+    guix-package-info-insert-build-log-button)
+  "List of functions used to insert package buttons in Info buffer.
+Each function is called with 2 arguments: package ID and full name."
+  :type '(repeat function)
+  :group 'guix-package-info)
+
 (defvar guix-package-info-download-buffer nil
  "Buffer from which a current download operation was performed.")

@@ -345,9 +374,13 @@ formatted with this string, an action button is inserted.")
 (define-button-type 'guix-package-license
  :supertype 'guix
  'face 'guix-package-info-license
-  'help-echo "Browse license URL"
+  'help-echo "Display license info"
  'action (lambda (btn)
-            (guix-browse-license-url (button-label btn))))
+            (require 'guix-ui-license)
+            (guix-buffer-get-display-entries
+             'info 'license
+             (list 'name (button-label btn))
+             'add)))

 (define-button-type 'guix-package-name
  :supertype 'guix
@@ -382,6 +415,24 @@ formatted with this string, an action button is inserted.")
   'guix-package-heading
   'spec (guix-package-entry->name-specification entry)))

+(defun guix-package-info-insert-location (location &optional _)
+  "Insert package LOCATION at point."
+  (if (null location)
+      (guix-format-insert nil)
+    (let ((location-file (car (split-string location ":"))))
+      (guix-info-insert-value-indent location 'guix-package-location)
+      ;; Do not show "Packages" button if a package 'from file' is displayed.
+      (unless (eq (guix-ui-current-search-type) 'from-file)
+        (guix-info-insert-indent)
+        (guix-info-insert-action-button
+         "Packages"
+         (lambda (btn)
+           (guix-package-get-display (guix-ui-current-profile)
+                                     'location
+                                     (button-get btn 'location)))
+         (format "Display packages from location '%s'" location-file)
+         'location location-file)))))
+
 (defun guix-package-info-insert-systems (systems entry)
  "Insert supported package SYSTEMS at point."
  (guix-info-insert-value-format
@@ -498,6 +549,78 @@ ENTRY is an alist with package info."
             (guix-entry-id entry))
     'output output)))

+(defun guix-package-info-show-store-path (entry-id package-id)
+  "Show store directories of the package outputs in the current buffer.
+ENTRY-ID is an ID of the current entry (package or output).
+PACKAGE-ID is an ID of the package which store path to show."
+  (let* ((entries (guix-buffer-current-entries))
+         (entry   (guix-entry-by-id entry-id entries))
+         (dirs    (guix-package-store-path package-id)))
+    (or dirs
+        (error "Couldn't define store directory of the package"))
+    (let* ((new-entry (cons (cons 'store-path dirs)
+                            entry))
+           (new-entries (guix-replace-entry entry-id new-entry entries)))
+      (setf (guix-buffer-item-entries guix-buffer-item)
+            new-entries)
+      (guix-buffer-redisplay-goto-button)
+      (let ((dir (car dirs)))
+        (if (file-exists-p dir)
+            (if guix-package-info-auto-find-package
+                (find-file dir)
+              (message nil))
+          (message "'%s' does not exist.\nTry to build this package."
+                   dir))))))
+
+(defun guix-package-info-insert-misc (entry)
+  "Insert various buttons and other info for package ENTRY at point."
+  (if (guix-entry-value entry 'obsolete)
+      (guix-format-insert nil)
+    (let* ((entry-id   (guix-entry-id entry))
+           (package-id (or (guix-entry-value entry 'package-id)
+                           entry-id))
+           (full-name  (guix-package-entry->name-specification entry))
+           (store-path (guix-entry-value entry 'store-path)))
+      (guix-info-insert-title-simple "Package")
+      (if store-path
+          (guix-info-insert-value-indent store-path 'guix-file)
+        (guix-info-insert-action-button
+         "Show"
+         (lambda (btn)
+           (guix-package-info-show-store-path
+            (button-get btn 'entry-id)
+            (button-get btn 'package-id)))
+         "Show the store directory of the current package"
+         'entry-id entry-id
+         'package-id package-id))
+      (when guix-package-info-button-functions
+        (insert "\n")
+        (guix-mapinsert (lambda (fun)
+                          (funcall fun package-id full-name))
+                        guix-package-info-button-functions
+                        (guix-info-get-indent)
+                        :indent guix-info-indent
+                        :column (guix-info-fill-column))))))
+
+(defun guix-package-info-insert-build-button (id full-name)
+  "Insert button to build a package defined by ID."
+  (guix-info-insert-action-button
+   "Build"
+   (lambda (btn)
+     (guix-build-package (button-get btn 'id)
+                         (format "Build '%s' package?" full-name)))
+   (format "Build the current package")
+   'id id))
+
+(defun guix-package-info-insert-build-log-button (id _name)
+  "Insert button to show build log of a package defined by ID."
+  (guix-info-insert-action-button
+   "Build Log"
+   (lambda (btn)
+     (guix-package-find-build-log (button-get btn 'id)))
+   "View build log of the current package"
+   'id id))
+
 (defun guix-package-info-show-source (entry-id package-id)
  "Show file name of a package source in the current info buffer.
 Find the file if needed (see `guix-package-info-auto-find-source').
@@ -794,10 +917,11 @@ for all ARGS."
            (version format guix-output-info-insert-version)
            (output format guix-output-info-insert-output)
            (synopsis simple (indent guix-package-info-synopsis))
+            guix-package-info-insert-misc
            (source simple guix-package-info-insert-source)
            (path simple (indent guix-file))
            (dependencies simple (indent guix-file))
-            (location format (format guix-package-location))
+            (location simple guix-package-info-insert-location)
            (home-url format (format guix-url))
            (license format (format guix-package-license))
            (systems format guix-package-info-insert-systems)
@@ -969,6 +1093,29 @@ Interactively with prefix, prompt for PROFILE."
         (guix-ui-read-profile)))
  (guix-package-get-display profile 'license license))

+;;;###autoload
+(defun guix-packages-by-location (location &optional profile)
+  "Display Guix packages placed in LOCATION file.
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (guix-read-package-location)
+         (guix-ui-read-profile)))
+  (guix-package-get-display profile 'location location))
+
+;;;###autoload
+(defun guix-package-from-file (file &optional profile)
+  "Display Guix package that the code from FILE evaluates to.
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (read-file-name "File with package: ")
+         (guix-ui-read-profile)))
+  (guix-buffer-get-display-entries
+   'info 'package
+   (list (or profile guix-current-profile) 'from-file file)
+   'add))
+
 ;;;###autoload
 (defun guix-search-by-regexp (regexp &optional params profile)
  "Search for Guix packages by REGEXP.
@@ -1,6 +1,6 @@
 ;;; guix-ui.el --- Common code for Guix package management interface  -*- lexical-binding: t -*-

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

 ;; This file is part of GNU Guix.

@@ -105,10 +105,11 @@ If `all', update all Guix buffers (not recommended)."
  :group 'guix-ui)

 (defcustom guix-ui-buffer-name-function
-  #'guix-ui-buffer-name-default
+  #'guix-ui-buffer-name-full
  "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)
+  :type '(choice (function-item guix-ui-buffer-name-full)
+                 (function-item guix-ui-buffer-name-short)
                 (function-item guix-ui-buffer-name-simple)
                 (function :tag "Other function"))
  :group 'guix-ui)
@@ -117,26 +118,14 @@ The function is called with 2 arguments: BASE-NAME and PROFILE."
  "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)
+(defun guix-ui-buffer-name-short (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)))))
+  (guix-compose-buffer-name base-name
+                            (file-name-base (directory-file-name profile))))
+
+(defun guix-ui-buffer-name-full (base-name profile)
+  "Return buffer name by appending BASE-NAME and PROFILE's full name."
+  (guix-compose-buffer-name base-name profile))

 (defun guix-ui-buffer-name (base-name profile)
  "Return Guix buffer name based on BASE-NAME and profile.
@@ -1,6 +1,6 @@
 ;;; guix-utils.el --- General utility functions  -*- lexical-binding: t -*-

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

 ;; This file is part of GNU Guix.

@@ -84,16 +84,33 @@ If FORMAT is non-nil, format VAL with FORMAT."
                (format format str)
              str))))

-(defun guix-mapinsert (function sequence separator)
+(cl-defun guix-mapinsert (function sequence separator &key indent column)
  "Like `mapconcat' but for inserting text.
 Apply FUNCTION to each element of SEQUENCE, and insert SEPARATOR
-at point between each FUNCTION call."
-  (when sequence
-    (funcall function (car sequence))
-    (mapc (lambda (obj)
-            (insert separator)
-            (funcall function obj))
-          (cdr sequence))))
+at point between each FUNCTION call.
+
+If INDENT is non-nil, it should be a number of spaces used to
+indent each line of the inserted text.
+
+If COLUMN is non-nil, it should be a column number which
+shouldn't be exceeded by the inserted text."
+  (pcase sequence
+    (`(,first . ,rest)
+     (let* ((indent (or indent 0))
+            (max-column (and column (- column indent))))
+       (guix-with-indent indent
+         (funcall function first)
+         (dolist (element rest)
+           (let ((before-sep-pos (and column (point))))
+             (insert separator)
+             (let ((after-sep-pos (and column (point))))
+               (funcall function element)
+               (when (and column
+                          (> (current-column) max-column))
+                 (save-excursion
+                   (delete-region before-sep-pos after-sep-pos)
+                   (goto-char before-sep-pos)
+                   (insert "\n")))))))))))

 (defun guix-insert-button (label &optional type &rest properties)
  "Make button of TYPE with LABEL and insert it at point.
@@ -223,6 +240,32 @@ 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-compose-buffer-name (base-name postfix)
+  "Return buffer name by appending BASE-NAME and POSTFIX.
+
+In a simple case the result is:
+
+  BASE-NAME: POSTFIX
+
+If BASE-NAME is wrapped by '*', then the result is:
+
+  *BASE-NAME: POSTFIX*"
+  (let ((re (rx string-start
+                (group (? "*"))
+                (group (*? any))
+                (group (? "*"))
+                string-end)))
+    (or (string-match re base-name)
+        (error "Unexpected error in defining 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 ": " postfix "*")
+        (concat base-name ": " postfix)))))
+
 (defun guix-completing-read (prompt table &optional predicate
                             require-match initial-input
                             hist def inherit-input-method)
@@ -17,47 +17,51 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

-AUTOLOADS = emacs/guix-autoloads.el
+AUTOLOADS = %D%/guix-autoloads.el

 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			\
-  emacs/guix-popup.el				\
-  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
+  %D%/guix-about.el				\
+  %D%/guix-backend.el				\
+  %D%/guix-base.el				\
+  %D%/guix-build-log.el				\
+  %D%/guix-buffer.el				\
+  %D%/guix-command.el				\
+  %D%/guix-devel.el				\
+  %D%/guix-emacs.el				\
+  %D%/guix-entry.el				\
+  %D%/guix-external.el				\
+  %D%/guix-geiser.el				\
+  %D%/guix-guile.el				\
+  %D%/guix-help-vars.el				\
+  %D%/guix-history.el				\
+  %D%/guix-hydra.el				\
+  %D%/guix-hydra-build.el			\
+  %D%/guix-hydra-jobset.el			\
+  %D%/guix-info.el				\
+  %D%/guix-init.el				\
+  %D%/guix-license.el				\
+  %D%/guix-list.el				\
+  %D%/guix-location.el				\
+  %D%/guix-messages.el				\
+  %D%/guix-pcomplete.el				\
+  %D%/guix-popup.el				\
+  %D%/guix-prettify.el				\
+  %D%/guix-profiles.el				\
+  %D%/guix-read.el				\
+  %D%/guix-ui.el				\
+  %D%/guix-ui-license.el			\
+  %D%/guix-ui-location.el			\
+  %D%/guix-ui-package.el			\
+  %D%/guix-ui-generation.el			\
+  %D%/guix-ui-system-generation.el		\
+  %D%/guix-utils.el

 if HAVE_EMACS

 dist_lisp_DATA = $(ELFILES)

 nodist_lisp_DATA = 		\
-  emacs/guix-config.el		\
+  %D%/guix-config.el		\
  $(AUTOLOADS)

 $(AUTOLOADS): $(ELFILES)
@@ -7,9 +7,13 @@ Description=Build daemon for GNU Guix

 [Service]
 ExecStart=@bindir@/guix-daemon --build-users-group=guixbuild
+Environment=GUIX_LOCPATH=/root/.guix-profile/lib/locale
 RemainAfterExit=yes
 StandardOutput=syslog
 StandardError=syslog

+# See <https://lists.gnu.org/archive/html/guix-devel/2016-04/msg00608.html>.
+TasksMax=1024
+
 [Install]
 WantedBy=multi-user.target
@@ -1,884 +0,0 @@
-# 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>
-#
-# 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/>.
-
-# Definitions for the GNU System: package modules, patches, bootstrap
-# binaries.
-
-GNU_SYSTEM_MODULES =				\
-  gnu.scm					\
-  gnu/artwork.scm				\
-  gnu/packages.scm				\
-  gnu/packages/abduco.scm			\
-  gnu/packages/abiword.scm			\
-  gnu/packages/acct.scm				\
-  gnu/packages/acl.scm				\
-  gnu/packages/admin.scm			\
-  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			\
-  gnu/packages/aspell.scm			\
-  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			\
-  gnu/packages/avr.scm				\
-  gnu/packages/backup.scm			\
-  gnu/packages/base.scm				\
-  gnu/packages/bash.scm				\
-  gnu/packages/bdw-gc.scm			\
-  gnu/packages/bioinformatics.scm		\
-  gnu/packages/bittorrent.scm			\
-  gnu/packages/bison.scm			\
-  gnu/packages/boost.scm			\
-  gnu/packages/bootstrap.scm			\
-  gnu/packages/busybox.scm			\
-  gnu/packages/calcurse.scm			\
-  gnu/packages/ccache.scm			\
-  gnu/packages/cdrom.scm			\
-  gnu/packages/certs.scm			\
-  gnu/packages/check.scm			\
-  gnu/packages/ci.scm				\
-  gnu/packages/cmake.scm			\
-  gnu/packages/code.scm				\
-  gnu/packages/commencement.scm			\
-  gnu/packages/compression.scm			\
-  gnu/packages/conkeror.scm			\
-  gnu/packages/conky.scm			\
-  gnu/packages/cook.scm				\
-  gnu/packages/cpio.scm				\
-  gnu/packages/cppi.scm				\
-  gnu/packages/cross-base.scm			\
-  gnu/packages/crypto.scm			\
-  gnu/packages/cryptsetup.scm			\
-  gnu/packages/cups.scm				\
-  gnu/packages/curl.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				\
-  gnu/packages/ebook.scm			\
-  gnu/packages/ed.scm				\
-  gnu/packages/elf.scm				\
-  gnu/packages/emacs.scm			\
-  gnu/packages/enchant.scm			\
-  gnu/packages/engineering.scm			\
-  gnu/packages/enlightenment.scm		\
-  gnu/packages/fcitx.scm			\
-  gnu/packages/feh.scm                          \
-  gnu/packages/figlet.scm			\
-  gnu/packages/file.scm				\
-  gnu/packages/finance.scm			\
-  gnu/packages/firmware.scm			\
-  gnu/packages/fish.scm				\
-  gnu/packages/flashing-tools.scm		\
-  gnu/packages/flex.scm				\
-  gnu/packages/fltk.scm				\
-  gnu/packages/fonts.scm			\
-  gnu/packages/fontutils.scm			\
-  gnu/packages/freedesktop.scm			\
-  gnu/packages/freeipmi.scm			\
-  gnu/packages/ftp.scm				\
-  gnu/packages/fribidi.scm			\
-  gnu/packages/fvwm.scm				\
-  gnu/packages/game-development.scm		\
-  gnu/packages/games.scm			\
-  gnu/packages/gawk.scm				\
-  gnu/packages/gcal.scm				\
-  gnu/packages/gcc.scm				\
-  gnu/packages/gd.scm				\
-  gnu/packages/gdb.scm				\
-  gnu/packages/geeqie.scm			\
-  gnu/packages/gettext.scm			\
-  gnu/packages/ghostscript.scm			\
-  gnu/packages/gimp.scm				\
-  gnu/packages/gkrellm.scm			\
-  gnu/packages/gl.scm				\
-  gnu/packages/glib.scm				\
-  gnu/packages/gnome.scm			\
-  gnu/packages/gnucash.scm			\
-  gnu/packages/gnunet.scm			\
-  gnu/packages/gnupg.scm			\
-  gnu/packages/gnustep.scm			\
-  gnu/packages/gnuzilla.scm			\
-  gnu/packages/gnu-pw-mgr.scm			\
-  gnu/packages/gperf.scm			\
-  gnu/packages/gprolog.scm			\
-  gnu/packages/gps.scm				\
-  gnu/packages/graphics.scm			\
-  gnu/packages/graphviz.scm			\
-  gnu/packages/groff.scm			\
-  gnu/packages/grub.scm				\
-  gnu/packages/grue-hunter.scm			\
-  gnu/packages/gsasl.scm			\
-  gnu/packages/gstreamer.scm			\
-  gnu/packages/gtk.scm				\
-  gnu/packages/guile.scm			\
-  gnu/packages/guile-wm.scm			\
-  gnu/packages/gv.scm				\
-  gnu/packages/gxmessage.scm			\
-  gnu/packages/haskell.scm			\
-  gnu/packages/hugs.scm				\
-  gnu/packages/hurd.scm				\
-  gnu/packages/ibus.scm				\
-  gnu/packages/icu4c.scm			\
-  gnu/packages/idutils.scm			\
-  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/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-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			\
-  gnu/packages/libdaemon.scm			\
-  gnu/packages/libedit.scm			\
-  gnu/packages/libevent.scm			\
-  gnu/packages/libffcall.scm			\
-  gnu/packages/libffi.scm			\
-  gnu/packages/libftdi.scm			\
-  gnu/packages/calendar.scm			\
-  gnu/packages/libidn.scm			\
-  gnu/packages/libphidget.scm			\
-  gnu/packages/libreoffice.scm			\
-  gnu/packages/libsigsegv.scm			\
-  gnu/packages/libunistring.scm			\
-  gnu/packages/libusb.scm			\
-  gnu/packages/libunwind.scm			\
-  gnu/packages/libupnp.scm			\
-  gnu/packages/lightning.scm			\
-  gnu/packages/links.scm			\
-  gnu/packages/linux.scm			\
-  gnu/packages/lirc.scm				\
-  gnu/packages/lisp.scm				\
-  gnu/packages/llvm.scm				\
-  gnu/packages/lout.scm				\
-  gnu/packages/lsh.scm				\
-  gnu/packages/lsof.scm				\
-  gnu/packages/lua.scm				\
-  gnu/packages/lxde.scm				\
-  gnu/packages/lxqt.scm				\
-  gnu/packages/lynx.scm				\
-  gnu/packages/m4.scm				\
-  gnu/packages/machine-learning.scm		\
-  gnu/packages/man.scm				\
-  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			\
-  gnu/packages/messaging.scm			\
-  gnu/packages/mg.scm				\
-  gnu/packages/miscfiles.scm			\
-  gnu/packages/mit-krb5.scm			\
-  gnu/packages/moe.scm				\
-  gnu/packages/moreutils.scm			\
-  gnu/packages/mpd.scm				\
-  gnu/packages/mp3.scm				\
-  gnu/packages/mpi.scm				\
-  gnu/packages/multiprecision.scm		\
-  gnu/packages/music.scm			\
-  gnu/packages/mtools.scm			\
-  gnu/packages/nano.scm				\
-  gnu/packages/ncdu.scm				\
-  gnu/packages/ncurses.scm			\
-  gnu/packages/netpbm.scm			\
-  gnu/packages/nettle.scm			\
-  gnu/packages/networking.scm			\
-  gnu/packages/ninja.scm			\
-  gnu/packages/node.scm				\
-  gnu/packages/noweb.scm			\
-  gnu/packages/ntp.scm				\
-  gnu/packages/nutrition.scm			\
-  gnu/packages/nvi.scm				\
-  gnu/packages/ocaml.scm			\
-  gnu/packages/ocr.scm				\
-  gnu/packages/onc-rpc.scm			\
-  gnu/packages/openbox.scm			\
-  gnu/packages/openldap.scm			\
-  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		\
-  gnu/packages/patchutils.scm			\
-  gnu/packages/pciutils.scm			\
-  gnu/packages/pcre.scm				\
-  gnu/packages/pdf.scm				\
-  gnu/packages/pem.scm				\
-  gnu/packages/perl.scm				\
-  gnu/packages/photo.scm			\
-  gnu/packages/pkg-config.scm			\
-  gnu/packages/plotutils.scm			\
-  gnu/packages/polkit.scm			\
-  gnu/packages/popt.scm				\
-  gnu/packages/pth.scm				\
-  gnu/packages/pulseaudio.scm			\
-  gnu/packages/pumpio.scm			\
-  gnu/packages/pretty-print.scm			\
-  gnu/packages/protobuf.scm			\
-  gnu/packages/pv.scm				\
-  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			\
-  gnu/packages/rdf.scm				\
-  gnu/packages/readline.scm			\
-  gnu/packages/rrdtool.scm			\
-  gnu/packages/rsync.scm			\
-  gnu/packages/ruby.scm				\
-  gnu/packages/rush.scm				\
-  gnu/packages/samba.scm			\
-  gnu/packages/sawfish.scm			\
-  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			\
-  gnu/packages/skribilo.scm			\
-  gnu/packages/slang.scm			\
-  gnu/packages/slim.scm				\
-  gnu/packages/smalltalk.scm			\
-  gnu/packages/ssh.scm				\
-  gnu/packages/stalonetray.scm			\
-  gnu/packages/statistics.scm			\
-  gnu/packages/suckless.scm			\
-  gnu/packages/swig.scm				\
-  gnu/packages/sxiv.scm				\
-  gnu/packages/synergy.scm			\
-  gnu/packages/task-management.scm		\
-  gnu/packages/tbb.scm				\
-  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			\
-  gnu/packages/time.scm				\
-  gnu/packages/tls.scm				\
-  gnu/packages/tmux.scm				\
-  gnu/packages/tor.scm				\
-  gnu/packages/tre.scm				\
-  gnu/packages/tv.scm				\
-  gnu/packages/unrtf.scm			\
-  gnu/packages/upnp.scm				\
-  gnu/packages/uucp.scm				\
-  gnu/packages/valgrind.scm			\
-  gnu/packages/version-control.scm		\
-  gnu/packages/video.scm			\
-  gnu/packages/vim.scm				\
-  gnu/packages/vpn.scm				\
-  gnu/packages/vtk.scm				\
-  gnu/packages/w3m.scm				\
-  gnu/packages/wdiff.scm			\
-  gnu/packages/web.scm				\
-  gnu/packages/webkit.scm			\
-  gnu/packages/wget.scm				\
-  gnu/packages/wicd.scm				\
-  gnu/packages/wine.scm				\
-  gnu/packages/wm.scm				\
-  gnu/packages/wordnet.scm			\
-  gnu/packages/wv.scm				\
-  gnu/packages/wxwidgets.scm			\
-  gnu/packages/xfig.scm				\
-  gnu/packages/xiph.scm				\
-  gnu/packages/xml.scm				\
-  gnu/packages/xnee.scm				\
-  gnu/packages/xdisorg.scm			\
-  gnu/packages/xorg.scm				\
-  gnu/packages/xfce.scm				\
-  gnu/packages/yasm.scm				\
-  gnu/packages/yubico.scm			\
-  gnu/packages/zile.scm				\
-  gnu/packages/zip.scm				\
-  gnu/packages/zsh.scm				\
-						\
-  gnu/services.scm				\
-  gnu/services/avahi.scm			\
-  gnu/services/base.scm				\
-  gnu/services/databases.scm			\
-  gnu/services/dbus.scm				\
-  gnu/services/desktop.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				\
-						\
-  gnu/system.scm				\
-  gnu/system/file-systems.scm			\
-  gnu/system/grub.scm				\
-  gnu/system/install.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				\
-						\
-  gnu/build/activation.scm			\
-  gnu/build/file-systems.scm			\
-  gnu/build/install.scm				\
-  gnu/build/linux-boot.scm			\
-  gnu/build/linux-container.scm			\
-  gnu/build/linux-initrd.scm			\
-  gnu/build/linux-modules.scm			\
-  gnu/build/vm.scm
-
-
-patchdir = $(guilemoduledir)/gnu/packages/patches
-dist_patch_DATA =						\
-  gnu/packages/patches/abiword-explictly-cast-bools.patch	\
-  gnu/packages/patches/abiword-link-plugins-against-backend.patch	\
-  gnu/packages/patches/abiword-no-include-glib-internal-headers.patch	\
-  gnu/packages/patches/abiword-pass-no-undefined-to-linker.patch	\
-  gnu/packages/patches/abiword-use-proper-png-api.patch		\
-  gnu/packages/patches/abiword-wmf-version-lookup-fix.patch	\
-  gnu/packages/patches/acl-hurd-path-max.patch			\
-  gnu/packages/patches/aegis-constness-error.patch         	\
-  gnu/packages/patches/aegis-perl-tempdir1.patch           	\
-  gnu/packages/patches/aegis-perl-tempdir2.patch           	\
-  gnu/packages/patches/aegis-test-fixup-1.patch            	\
-  gnu/packages/patches/aegis-test-fixup-2.patch            	\
-  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/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/calibre-drop-unrar.patch			\
-  gnu/packages/patches/calibre-no-updates-dialog.patch		\
-  gnu/packages/patches/cdparanoia-fpic.patch			\
-  gnu/packages/patches/chmlib-inttypes.patch			\
-  gnu/packages/patches/clang-libc-search-path.patch		\
-  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/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/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		\
-  gnu/packages/patches/fastcap-mulGlobal.patch			\
-  gnu/packages/patches/fastcap-mulSetup.patch			\
-  gnu/packages/patches/fasthenry-spAllocate.patch		\
-  gnu/packages/patches/fasthenry-spBuild.patch			\
-  gnu/packages/patches/fasthenry-spUtils.patch			\
-  gnu/packages/patches/fasthenry-spSolve.patch			\
-  gnu/packages/patches/fasthenry-spFactor.patch			\
-  gnu/packages/patches/findutils-localstatedir.patch		\
-  gnu/packages/patches/findutils-test-xargs.patch		\
-  gnu/packages/patches/flashrom-use-libftdi1.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/gawk-shell.patch				\
-  gnu/packages/patches/gcc-arm-link-spec-fix.patch		\
-  gnu/packages/patches/gcc-cross-environment-variables.patch	\
-  gnu/packages/patches/gcc-libvtv-runpath.patch			\
-  gnu/packages/patches/gcc-5.0-libvtv-runpath.patch		\
-  gnu/packages/patches/geoclue-config.patch			\
-  gnu/packages/patches/ghostscript-CVE-2015-3228.patch		\
-  gnu/packages/patches/ghostscript-runpath.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	\
-  gnu/packages/patches/glibc-o-largefile.patch			\
-  gnu/packages/patches/glibc-versioned-locpath.patch		\
-  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/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/grub-gets-undeclared.patch		\
-  gnu/packages/patches/grub-freetype.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			\
-  gnu/packages/patches/guile-linux-syscalls.patch		\
-  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/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/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/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/libunwind-CVE-2015-3239.patch		\
-  gnu/packages/patches/libwmf-CAN-2004-0941.patch		\
-  gnu/packages/patches/libwmf-CVE-2006-3376.patch		\
-  gnu/packages/patches/libwmf-CVE-2007-0455.patch		\
-  gnu/packages/patches/libwmf-CVE-2007-2756.patch		\
-  gnu/packages/patches/libwmf-CVE-2007-3472.patch		\
-  gnu/packages/patches/libwmf-CVE-2007-3473.patch		\
-  gnu/packages/patches/libwmf-CVE-2007-3477.patch		\
-  gnu/packages/patches/libwmf-CVE-2009-1364.patch		\
-  gnu/packages/patches/libwmf-CVE-2009-3546.patch		\
-  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				\
-  gnu/packages/patches/m4-gets-undeclared.patch			\
-  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/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/mutt-store-references.patch		\
-  gnu/packages/patches/net-tools-bitrot.patch			\
-  gnu/packages/patches/ngircd-handle-zombies.patch		\
-  gnu/packages/patches/ngircd-no-dns-in-tests.patch		\
-  gnu/packages/patches/ninja-tests.patch			\
-  gnu/packages/patches/ninja-zero-mtime.patch			\
-  gnu/packages/patches/nss-pkgconfig.patch			\
-  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/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-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/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/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/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		\
-  gnu/packages/patches/sdl-libx11-1.6.patch			\
-  gnu/packages/patches/serf-comment-style-fix.patch		\
-  gnu/packages/patches/serf-deflate-buckets-test-fix.patch	\
-  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			\
-  gnu/packages/patches/tvtime-xmltv.patch			\
-  gnu/packages/patches/unzip-CVE-2014-8139.patch		\
-  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-format-secure.patch		\
-  gnu/packages/patches/unzip-initialize-symlink-flag.patch	\
-  gnu/packages/patches/unzip-overflow-long-fsize.patch		\
-  gnu/packages/patches/unzip-remove-build-date.patch		\
-  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/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	\
-  gnu/packages/patches/xf86-video-glint-remove-mibstore.patch	\
-  gnu/packages/patches/xf86-video-i128-remove-mibstore.patch	\
-  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-nv-remove-mibstore.patch	\
-  gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch	\
-  gnu/packages/patches/xf86-video-tga-remove-mibstore.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
-
-MISC_DISTRO_FILES =				\
-  gnu/packages/ld-wrapper.in
-
-bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
-bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
-bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
-bootstrap_armhf_linuxdir = $(bootstrapdir)/armhf-linux
-bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux
-
-dist_bootstrap_x86_64_linux_DATA =		\
-  gnu/packages/bootstrap/x86_64-linux/bash	\
-  gnu/packages/bootstrap/x86_64-linux/mkdir	\
-  gnu/packages/bootstrap/x86_64-linux/tar	\
-  gnu/packages/bootstrap/x86_64-linux/xz
-
-dist_bootstrap_i686_linux_DATA =		\
-  gnu/packages/bootstrap/i686-linux/bash	\
-  gnu/packages/bootstrap/i686-linux/mkdir	\
-  gnu/packages/bootstrap/i686-linux/tar		\
-  gnu/packages/bootstrap/i686-linux/xz
-
-dist_bootstrap_armhf_linux_DATA =		\
-  gnu/packages/bootstrap/armhf-linux/bash	\
-  gnu/packages/bootstrap/armhf-linux/mkdir	\
-  gnu/packages/bootstrap/armhf-linux/tar	\
-  gnu/packages/bootstrap/armhf-linux/xz
-
-dist_bootstrap_mips64el_linux_DATA =		\
-  gnu/packages/bootstrap/mips64el-linux/bash	\
-  gnu/packages/bootstrap/mips64el-linux/mkdir	\
-  gnu/packages/bootstrap/mips64el-linux/tar	\
-  gnu/packages/bootstrap/mips64el-linux/xz
-
-# Big bootstrap binaries are not included in the tarball.  Instead, they
-# are downloaded.
-nodist_bootstrap_x86_64_linux_DATA =					\
-  gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz
-nodist_bootstrap_i686_linux_DATA =					\
-  gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz
-nodist_bootstrap_armhf_linux_DATA =					\
-  gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz
-nodist_bootstrap_mips64el_linux_DATA =					\
-  gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz
-
-# Those files must remain executable, so they remain executable once
-# imported into the store.
-set-bootstrap-executable-permissions:
-	chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}
-
-DISTCLEANFILES =				\
-  $(nodist_bootstrap_x86_64_linux_DATA)		\
-  $(nodist_bootstrap_i686_linux_DATA)		\
-  $(nodist_bootstrap_armhf_linux_DATA)		\
-  $(nodist_bootstrap_mips64el_linux_DATA)
-
-# Method to download a file from an external source.
-DOWNLOAD_FILE =								\
-  GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH"	\
-  $(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)"	\
-           "$(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"
-gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz:
-	$(AM_V_DL)$(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"
-gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz:
-	$(AM_V_DL)$(MKDIR_P) `dirname "$@"`;	\
-	$(DOWNLOAD_FILE) "$@" 			\
-	  "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Joshua S. Grant <jgrant@parenthetical.io>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -32,6 +32,7 @@
  (begin
    (define %public-modules
      '((gnu system)
+        (gnu system mapped-devices)
        (gnu system file-systems)
        (gnu system grub)                         ; 'grub-configuration'
        (gnu system pam)
@@ -32,8 +32,10 @@
  #:export (disk-partitions
            partition-label-predicate
            partition-uuid-predicate
+            partition-luks-uuid-predicate
            find-partition-by-label
            find-partition-by-uuid
+            find-partition-by-luks-uuid
            canonicalize-device-spec

            uuid->string
@@ -79,6 +81,11 @@
  "Bind-mount SOURCE at TARGET."
  (mount source target "" MS_BIND))

+
+;;;
+;;; Ext2 file systems.
+;;;
+
 (define-syntax %ext2-endianness
  ;; Endianness of ext2 file systems.
  (identifier-syntax (endianness little)))
@@ -136,6 +143,63 @@ if DEVICE does not contain an ext2 file system."
          #f
          (list->string (map integer->char bytes))))))

+
+;;;
+;;; LUKS encrypted devices.
+;;;
+
+;; The LUKS header format is described in "LUKS On-Disk Format Specification":
+;; <http://wiki.cryptsetup.googlecode.com/git/LUKS-standard/>.  We follow
+;; version 1.2.1 of this document.
+
+(define-syntax %luks-endianness
+  ;; Endianness of LUKS headers.
+  (identifier-syntax (endianness big)))
+
+(define-syntax %luks-header-size
+  ;; Size in bytes of the LUKS header, including key slots.
+  (identifier-syntax 592))
+
+(define %luks-magic
+  ;; The 'LUKS_MAGIC' constant.
+  (u8-list->bytevector (append (map char->integer (string->list "LUKS"))
+                               (list #xba #xbe))))
+
+(define (sub-bytevector bv start size)
+  "Return a copy of the SIZE bytes of BV starting from offset START."
+  (let ((result (make-bytevector size)))
+    (bytevector-copy! bv start result 0 size)
+    result))
+
+(define (read-luks-header file)
+  "Read a LUKS header from FILE.  Return the raw header on success, and #f if
+not valid header was found."
+  (call-with-input-file file
+    (lambda (port)
+      (let ((header (make-bytevector %luks-header-size)))
+        (match (get-bytevector-n! port header 0 (bytevector-length header))
+          ((? eof-object?)
+           #f)
+          ((? number? len)
+           (and (= len (bytevector-length header))
+                (let ((magic   (sub-bytevector header 0 6)) ;XXX: inefficient
+                      (version (bytevector-u16-ref header 6 %luks-endianness)))
+                  (and (bytevector=? magic %luks-magic)
+                       (= version 1)
+                       header)))))))))
+
+(define (luks-header-uuid header)
+  "Return the LUKS UUID from HEADER, as a 16-byte bytevector."
+  ;; 40 bytes are reserved for the UUID, but in practice, it contains the 36
+  ;; bytes of its ASCII representation.
+  (let ((uuid (sub-bytevector header 168 36)))
+    (string->uuid (utf8->string uuid))))
+
+
+;;;
+;;; Partition lookup.
+;;;
+
 (define (disk-partitions)
  "Return the list of device names corresponding to valid disk partitions."
  (define (partition? major minor)
@@ -167,42 +231,53 @@ if DEVICE does not contain an ext2 file system."
                     (loop (cons name parts))
                     (loop parts))))))))))

-(define (read-ext2-superblock* device)
-  "Like 'read-ext2-superblock', but return #f when DEVICE does not exist
-instead of throwing an exception."
-  (catch 'system-error
-    (lambda ()
-      (read-ext2-superblock device))
-    (lambda args
-      ;; When running on the hand-made /dev,
-      ;; 'disk-partitions' could return partitions for which
-      ;; we have no /dev node.  Handle that gracefully.
-      (if (= ENOENT (system-error-errno args))
-          (begin
-            (format (current-error-port)
-                    "warning: device '~a' not found~%" device)
-            #f)
-          (apply throw args)))))
+(define (ENOENT-safe proc)
+  "Wrap the one-argument PROC such that ENOENT errors are caught and lead to a
+warning and #f as the result."
+  (lambda (device)
+    (catch 'system-error
+      (lambda ()
+        (proc device))
+      (lambda args
+        ;; When running on the hand-made /dev,
+        ;; 'disk-partitions' could return partitions for which
+        ;; we have no /dev node.  Handle that gracefully.
+        (if (= ENOENT (system-error-errno args))
+            (begin
+              (format (current-error-port)
+                      "warning: device '~a' not found~%" device)
+              #f)
+            (apply throw args))))))

-(define (partition-predicate field =)
-  "Return a predicate that returns true if the FIELD of an ext2 superblock is
-= to the given value."
-  (lambda (expected)
-    "Return a procedure that, when applied to a partition name such as \"sda1\",
+(define (partition-predicate read field =)
+  "Return a predicate that returns true if the FIELD of partition header that
+was READ is = to the given value."
+  (let ((read (ENOENT-safe read)))
+    (lambda (expected)
+      "Return a procedure that, when applied to a partition name such as \"sda1\",
 returns #t if that partition's volume name is LABEL."
-    (lambda (part)
-      (let* ((device (string-append "/dev/" part))
-             (sblock (read-ext2-superblock* device)))
-        (and sblock
-             (let ((actual (field sblock)))
-               (and actual
-                    (= actual expected))))))))
+      (lambda (part)
+        (let* ((device (string-append "/dev/" part))
+               (sblock (read device)))
+          (and sblock
+               (let ((actual (field sblock)))
+                 (and actual
+                      (= actual expected)))))))))

 (define partition-label-predicate
-  (partition-predicate ext2-superblock-volume-name string=?))
+  (partition-predicate read-ext2-superblock
+                       ext2-superblock-volume-name
+                       string=?))

 (define partition-uuid-predicate
-  (partition-predicate ext2-superblock-uuid bytevector=?))
+  (partition-predicate read-ext2-superblock
+                       ext2-superblock-uuid
+                       bytevector=?))
+
+(define partition-luks-uuid-predicate
+  (partition-predicate read-luks-header
+                       luks-header-uuid
+                       bytevector=?))

 (define (find-partition-by-label label)
  "Return the first partition found whose volume name is LABEL, or #f if none
@@ -218,6 +293,13 @@ or #f if none was found."
               (disk-partitions))
         (cut string-append "/dev/" <>)))

+(define (find-partition-by-luks-uuid uuid)
+  "Return the first LUKS partition whose unique identifier is UUID (a bytevector),
+or #f if none was found."
+  (and=> (find (partition-luks-uuid-predicate uuid)
+               (disk-partitions))
+         (cut string-append "/dev/" <>)))
+

 ;;;
 ;;; UUIDs.
@@ -205,32 +205,53 @@ host user identifiers to map into the user namespace."
  ;; The parent process must initialize the user namespace for the child
  ;; before it can boot.  To negotiate this, a pipe is used such that the
  ;; child process blocks until the parent writes to it.
-  (match (pipe)
-    ((in . out)
+  (match (socketpair PF_UNIX SOCK_STREAM 0)
+    ((child . parent)
     (let ((flags (namespaces->bit-mask namespaces)))
       (match (clone flags)
         (0
          (call-with-clean-exit
           (lambda ()
-             (close out)
+             (close-port parent)
             ;; Wait for parent to set things up.
-             (read in)
-             (close in)
-             (purify-environment)
-             (when (memq 'mnt namespaces)
-               (mount-file-systems root mounts
-                                   #:mount-/proc? (memq 'pid namespaces)
-                                   #:mount-/sys?  (memq 'net namespaces)))
-             ;; TODO: Manage capabilities.
-             (thunk))))
+             (match (read child)
+               ('ready
+                (purify-environment)
+                (when (memq 'mnt namespaces)
+                  (catch #t
+                    (lambda ()
+                      (mount-file-systems root mounts
+                                          #:mount-/proc? (memq 'pid namespaces)
+                                          #:mount-/sys?  (memq 'net
+                                                               namespaces)))
+                    (lambda args
+                      ;; Forward the exception to the parent process.
+                      (write args child)
+                      (primitive-exit 3))))
+                ;; TODO: Manage capabilities.
+                (write 'ready child)
+                (close-port child)
+                (thunk))
+               (_                                 ;parent died or something
+                (primitive-exit 2))))))
         (pid
+          (close-port child)
          (when (memq 'user namespaces)
            (initialize-user-namespace pid host-uids))
          ;; TODO: Initialize cgroups.
-          (close in)
-          (write 'ready out)
-          (close out)
-          pid))))))
+          (write 'ready parent)
+          (newline parent)
+
+          ;; Check whether the child process' setup phase succeeded.
+          (let ((message (read parent)))
+            (close-port parent)
+            (match message
+              ('ready                             ;success
+               pid)
+              (((? symbol? key) args ...)         ;exception
+               (apply throw key args))
+              (_                                  ;unexpected termination
+               #f)))))))))

 (define* (call-with-container mounts thunk #:key (namespaces %namespaces)
                              (host-uids 1))
@@ -0,0 +1,206 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; 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/>.
+
+(define-module (gnu build marionette)
+  #:use-module (srfi srfi-9)
+  #:use-module (srfi srfi-26)
+  #:use-module (rnrs io ports)
+  #:use-module (ice-9 match)
+  #:export (marionette?
+            make-marionette
+            marionette-eval
+            marionette-control
+            %qwerty-us-keystrokes
+            marionette-type))
+
+;;; Commentary:
+;;;
+;;; Instrumentation tools for QEMU virtual machines (VMs).  A "marionette" is
+;;; essentially a VM (a QEMU instance) with its monitor connected to a
+;;; Unix-domain socket, and with a REPL inside the guest listening on a
+;;; virtual console, which is itself connected to the host via a Unix-domain
+;;; socket--these are the marionette's strings, connecting it to the almighty
+;;; puppeteer.
+;;;
+;;; Code:
+
+(define-record-type <marionette>
+  (marionette command pid monitor repl)
+  marionette?
+  (command    marionette-command)                 ;list of strings
+  (pid        marionette-pid)                     ;integer
+  (monitor    marionette-monitor)                 ;port
+  (repl       marionette-repl))                   ;port
+
+(define* (wait-for-monitor-prompt port #:key (quiet? #t))
+  "Read from PORT until we have seen all of QEMU's monitor prompt.  When
+QUIET? is false, the monitor's output is written to the current output port."
+  (define full-prompt
+    (string->list "(qemu) "))
+
+  (let loop ((prompt full-prompt)
+             (matches '())
+             (prefix  '()))
+    (match prompt
+      (()
+       ;; It's useful to set QUIET? so we don't display the echo of our own
+       ;; commands.
+       (unless quiet?
+         (for-each (lambda (line)
+                     (format #t "qemu monitor: ~a~%" line))
+                   (string-tokenize (list->string (reverse prefix))
+                                    (char-set-complement (char-set #\newline))))))
+      ((chr rest ...)
+       (let ((read (read-char port)))
+         (cond ((eqv? read chr)
+                (loop rest (cons read matches) prefix))
+               ((eof-object? read)
+                (error "EOF while waiting for QEMU monitor prompt"
+                       (list->string (reverse prefix))))
+               (else
+                (loop full-prompt
+                      '()
+                      (cons read (append matches prefix))))))))))
+
+(define* (make-marionette command
+                          #:key (socket-directory "/tmp") (timeout 20))
+  "Return a QEMU marionette--i.e., a virtual machine with open connections to the
+QEMU monitor and to the guest's backdoor REPL."
+  (define (file->sockaddr file)
+    (make-socket-address AF_UNIX
+                         (string-append socket-directory "/" file)))
+
+  (define extra-options
+    (list "-nographic"
+          "-monitor" (string-append "unix:" socket-directory "/monitor")
+          "-chardev" (string-append "socket,id=repl,path=" socket-directory
+                                    "/repl")
+          "-device" "virtio-serial"
+          "-device" "virtconsole,chardev=repl"))
+
+  (let ((monitor (socket AF_UNIX SOCK_STREAM 0))
+        (repl    (socket AF_UNIX SOCK_STREAM 0)))
+    (bind monitor (file->sockaddr "monitor"))
+    (listen monitor 1)
+    (bind repl (file->sockaddr "repl"))
+    (listen repl 1)
+
+    (match (primitive-fork)
+      (0
+       (catch #t
+         (lambda ()
+           (close monitor)
+           (close repl)
+           (match command
+             ((program . args)
+              (apply execl program program
+                     (append args extra-options)))))
+         (lambda (key . args)
+           (print-exception (current-error-port)
+                            (stack-ref (make-stack #t) 1)
+                            key args)
+           (primitive-exit 1))))
+      (pid
+       (format #t "QEMU runs as PID ~a~%" pid)
+       (sigaction SIGALRM
+         (lambda (signum)
+           (display "time is up!\n")              ;FIXME: break
+           #t))
+       (alarm timeout)
+
+       (match (accept monitor)
+         ((monitor-conn . _)
+          (display "connected to QEMU's monitor\n")
+          (close-port monitor)
+          (wait-for-monitor-prompt monitor-conn)
+          (display "read QEMU monitor prompt\n")
+          (match (accept repl)
+            ((repl-conn . addr)
+             (display "connected to guest REPL\n")
+             (close-port repl)
+             (match (read repl-conn)
+               ('ready
+                (alarm 0)
+                (sigaction SIGALRM SIG_DFL)
+                (display "marionette is ready\n")
+                (marionette (append command extra-options) pid
+                            monitor-conn repl-conn)))))))))))
+
+(define (marionette-eval exp marionette)
+  "Evaluate EXP in MARIONETTE's backdoor REPL.  Return the result."
+  (match marionette
+    (($ <marionette> command pid monitor repl)
+     (write exp repl)
+     (newline repl)
+     (read repl))))
+
+(define (marionette-control command marionette)
+  "Run COMMAND in the QEMU monitor of MARIONETTE.  COMMAND is a string such as
+\"sendkey ctrl-alt-f1\" or \"screendump foo.ppm\" (info \"(qemu-doc)
+pcsys_monitor\")."
+  (match marionette
+    (($ <marionette> _ _ monitor)
+     (display command monitor)
+     (newline monitor)
+     (wait-for-monitor-prompt monitor))))
+
+(define %qwerty-us-keystrokes
+  ;; Maps "special" characters to their keystrokes.
+  '((#\newline . "ret")
+    (#\space . "spc")
+    (#\- . "minus")
+    (#\+ . "shift-equal")
+    (#\* . "shift-8")
+    (#\= . "equal")
+    (#\? . "shift-slash")
+    (#\[ . "bracket_left")
+    (#\] . "bracket_right")
+    (#\( . "shift-9")
+    (#\) . "shift-0")
+    (#\/ . "slash")
+    (#\< . "less")
+    (#\> . "shift-less")
+    (#\. . "dot")
+    (#\, . "comma")
+    (#\; . "semicolon")
+    (#\bs . "backspace")
+    (#\tab . "tab")))
+
+(define* (string->keystroke-commands str
+                                     #:optional
+                                     (keystrokes
+                                      %qwerty-us-keystrokes))
+  "Return a list of QEMU monitor commands to send the keystrokes corresponding
+to STR.  KEYSTROKES is an alist specifying a mapping from characters to
+keystrokes."
+  (string-fold-right (lambda (chr result)
+                       (cons (string-append "sendkey "
+                                            (or (assoc-ref keystrokes chr)
+                                                (string chr)))
+                             result))
+                     '()
+                     str))
+
+(define* (marionette-type str marionette
+                          #:key (keystrokes %qwerty-us-keystrokes))
+  "Type STR on MARIONETTE's keyboard, using the KEYSTROKES alist to map characters
+to actual keystrokes."
+  (for-each (cut marionette-control <> marionette)
+            (string->keystroke-commands str keystrokes)))
+
+;;; marionette.scm ends here
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;;
@@ -55,8 +55,8 @@

 (define* (qemu-command #:optional (system %host-type))
  "Return the default name of the QEMU command for SYSTEM."
-  (let ((cpu (substring %host-type 0
-                        (string-index %host-type #\-))))
+  (let ((cpu (substring system 0
+                        (string-index system #\-))))
    (string-append "qemu-system-"
                   (if (string-match "^i[3456]86$" cpu)
                       "i386"
@@ -0,0 +1,935 @@
+# 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 © 2016 Chris Marusich <cmmarusich@gmail.com>
+# Copyright © 2016 Kei Kebreau <kei@openmailbox.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/>.
+
+# Definitions for the GNU System: package modules, patches, bootstrap
+# binaries.
+
+GNU_SYSTEM_MODULES =				\
+  gnu.scm					\
+  %D%/artwork.scm				\
+  %D%/packages.scm				\
+  %D%/packages/abduco.scm			\
+  %D%/packages/abiword.scm			\
+  %D%/packages/acct.scm				\
+  %D%/packages/acl.scm				\
+  %D%/packages/admin.scm			\
+  %D%/packages/adns.scm				\
+  %D%/packages/algebra.scm			\
+  %D%/packages/aidc.scm				\
+  %D%/packages/animation.scm			\
+  %D%/packages/anthy.scm			\
+  %D%/packages/apl.scm				\
+  %D%/packages/apr.scm				\
+  %D%/packages/aspell.scm			\
+  %D%/packages/assembly.scm			\
+  %D%/packages/attr.scm				\
+  %D%/packages/audacity.scm			\
+  %D%/packages/audio.scm			\
+  %D%/packages/augeas.scm			\
+  %D%/packages/autogen.scm			\
+  %D%/packages/autotools.scm			\
+  %D%/packages/avahi.scm			\
+  %D%/packages/avr.scm				\
+  %D%/packages/backup.scm			\
+  %D%/packages/base.scm				\
+  %D%/packages/bash.scm				\
+  %D%/packages/bdw-gc.scm			\
+  %D%/packages/bioinformatics.scm		\
+  %D%/packages/bittorrent.scm			\
+  %D%/packages/bison.scm			\
+  %D%/packages/boost.scm			\
+  %D%/packages/bootstrap.scm			\
+  %D%/packages/busybox.scm			\
+  %D%/packages/c.scm				\
+  %D%/packages/calcurse.scm			\
+  %D%/packages/ccache.scm			\
+  %D%/packages/cdrom.scm			\
+  %D%/packages/certs.scm			\
+  %D%/packages/check.scm			\
+  %D%/packages/ci.scm				\
+  %D%/packages/cmake.scm			\
+  %D%/packages/code.scm				\
+  %D%/packages/commencement.scm			\
+  %D%/packages/compression.scm			\
+  %D%/packages/conkeror.scm			\
+  %D%/packages/conky.scm			\
+  %D%/packages/connman.scm			\
+  %D%/packages/cook.scm				\
+  %D%/packages/cpio.scm				\
+  %D%/packages/cppi.scm				\
+  %D%/packages/cross-base.scm			\
+  %D%/packages/crypto.scm			\
+  %D%/packages/cryptsetup.scm			\
+  %D%/packages/cups.scm				\
+  %D%/packages/curl.scm				\
+  %D%/packages/cyrus-sasl.scm			\
+  %D%/packages/databases.scm			\
+  %D%/packages/datamash.scm			\
+  %D%/packages/datastructures.scm		\
+  %D%/packages/dav.scm				\
+  %D%/packages/dc.scm				\
+  %D%/packages/debug.scm			\
+  %D%/packages/dejagnu.scm			\
+  %D%/packages/dico.scm				\
+  %D%/packages/dictionaries.scm			\
+  %D%/packages/dillo.scm			\
+  %D%/packages/disk.scm				\
+  %D%/packages/djvu.scm				\
+  %D%/packages/dns.scm				\
+  %D%/packages/docbook.scm			\
+  %D%/packages/docker.scm			\
+  %D%/packages/documentation.scm		\
+  %D%/packages/dunst.scm			\
+  %D%/packages/dvtm.scm				\
+  %D%/packages/ebook.scm			\
+  %D%/packages/ed.scm				\
+  %D%/packages/education.scm			\
+  %D%/packages/elf.scm				\
+  %D%/packages/elixir.scm			\
+  %D%/packages/emacs.scm			\
+  %D%/packages/enchant.scm			\
+  %D%/packages/engineering.scm			\
+  %D%/packages/enlightenment.scm		\
+  %D%/packages/entr.scm				\
+  %D%/packages/erlang.scm			\
+  %D%/packages/fcitx.scm			\
+  %D%/packages/feh.scm                          \
+  %D%/packages/figlet.scm			\
+  %D%/packages/file.scm				\
+  %D%/packages/finance.scm			\
+  %D%/packages/firmware.scm			\
+  %D%/packages/fish.scm				\
+  %D%/packages/flashing-tools.scm		\
+  %D%/packages/flex.scm				\
+  %D%/packages/fltk.scm				\
+  %D%/packages/fonts.scm			\
+  %D%/packages/fontutils.scm			\
+  %D%/packages/freedesktop.scm			\
+  %D%/packages/freeipmi.scm			\
+  %D%/packages/ftp.scm				\
+  %D%/packages/fribidi.scm			\
+  %D%/packages/fvwm.scm				\
+  %D%/packages/game-development.scm		\
+  %D%/packages/games.scm			\
+  %D%/packages/gawk.scm				\
+  %D%/packages/gcal.scm				\
+  %D%/packages/gcc.scm				\
+  %D%/packages/gd.scm				\
+  %D%/packages/gdb.scm				\
+  %D%/packages/geo.scm				\
+  %D%/packages/geeqie.scm			\
+  %D%/packages/gettext.scm			\
+  %D%/packages/ghostscript.scm			\
+  %D%/packages/gimp.scm				\
+  %D%/packages/gkrellm.scm			\
+  %D%/packages/gl.scm				\
+  %D%/packages/glib.scm				\
+  %D%/packages/gnome.scm			\
+  %D%/packages/gnu-doc.scm			\
+  %D%/packages/gnucash.scm			\
+  %D%/packages/gnunet.scm			\
+  %D%/packages/gnupg.scm			\
+  %D%/packages/gnustep.scm			\
+  %D%/packages/gnuzilla.scm			\
+  %D%/packages/gnu-pw-mgr.scm			\
+  %D%/packages/golang.scm			\
+  %D%/packages/gperf.scm			\
+  %D%/packages/gprolog.scm			\
+  %D%/packages/gps.scm				\
+  %D%/packages/graphics.scm			\
+  %D%/packages/graphviz.scm			\
+  %D%/packages/groff.scm			\
+  %D%/packages/grub.scm				\
+  %D%/packages/gsasl.scm			\
+  %D%/packages/gstreamer.scm			\
+  %D%/packages/gtk.scm				\
+  %D%/packages/guile.scm			\
+  %D%/packages/guile-wm.scm			\
+  %D%/packages/gv.scm				\
+  %D%/packages/gxmessage.scm			\
+  %D%/packages/haskell.scm			\
+  %D%/packages/hexedit.scm			\
+  %D%/packages/hugs.scm				\
+  %D%/packages/hurd.scm				\
+  %D%/packages/ibus.scm				\
+  %D%/packages/icu4c.scm			\
+  %D%/packages/idutils.scm			\
+  %D%/packages/image.scm			\
+  %D%/packages/imagemagick.scm			\
+  %D%/packages/indent.scm			\
+  %D%/packages/inklingreader.scm		\
+  %D%/packages/inkscape.scm			\
+  %D%/packages/irc.scm  			\
+  %D%/packages/iso-codes.scm			\
+  %D%/packages/java.scm				\
+  %D%/packages/jemalloc.scm			\
+  %D%/packages/jrnl.scm				\
+  %D%/packages/julia.scm			\
+  %D%/packages/kde.scm              \
+  %D%/packages/kde-frameworks.scm		\
+  %D%/packages/key-mon.scm			\
+  %D%/packages/kodi.scm				\
+  %D%/packages/language.scm			\
+  %D%/packages/ldc.scm				\
+  %D%/packages/lego.scm				\
+  %D%/packages/less.scm				\
+  %D%/packages/lesstif.scm			\
+  %D%/packages/libbsd.scm			\
+  %D%/packages/libcanberra.scm			\
+  %D%/packages/libdaemon.scm			\
+  %D%/packages/libedit.scm			\
+  %D%/packages/libevent.scm			\
+  %D%/packages/libffcall.scm			\
+  %D%/packages/libffi.scm			\
+  %D%/packages/libftdi.scm			\
+  %D%/packages/calendar.scm			\
+  %D%/packages/libidn.scm			\
+  %D%/packages/libphidget.scm			\
+  %D%/packages/libreoffice.scm			\
+  %D%/packages/libsigsegv.scm			\
+  %D%/packages/libunistring.scm			\
+  %D%/packages/libusb.scm			\
+  %D%/packages/libunwind.scm			\
+  %D%/packages/libupnp.scm			\
+  %D%/packages/links.scm			\
+  %D%/packages/linux.scm			\
+  %D%/packages/lirc.scm				\
+  %D%/packages/lisp.scm				\
+  %D%/packages/llvm.scm				\
+  %D%/packages/lout.scm				\
+  %D%/packages/logging.scm			\
+  %D%/packages/lsof.scm				\
+  %D%/packages/lua.scm				\
+  %D%/packages/lxde.scm				\
+  %D%/packages/lxqt.scm				\
+  %D%/packages/lynx.scm				\
+  %D%/packages/m4.scm				\
+  %D%/packages/machine-learning.scm		\
+  %D%/packages/man.scm				\
+  %D%/packages/mail.scm				\
+  %D%/packages/make-bootstrap.scm		\
+  %D%/packages/markdown.scm			\
+  %D%/packages/marst.scm			\
+  %D%/packages/mate.scm             \
+  %D%/packages/maths.scm			\
+  %D%/packages/mc.scm				\
+  %D%/packages/mcrypt.scm			\
+  %D%/packages/messaging.scm			\
+  %D%/packages/mg.scm				\
+  %D%/packages/mit-krb5.scm			\
+  %D%/packages/moe.scm				\
+  %D%/packages/moreutils.scm			\
+  %D%/packages/mpd.scm				\
+  %D%/packages/mp3.scm				\
+  %D%/packages/mpi.scm				\
+  %D%/packages/multiprecision.scm		\
+  %D%/packages/music.scm			\
+  %D%/packages/mtools.scm			\
+  %D%/packages/nano.scm				\
+  %D%/packages/ncdu.scm				\
+  %D%/packages/ncurses.scm			\
+  %D%/packages/netpbm.scm			\
+  %D%/packages/nettle.scm			\
+  %D%/packages/networking.scm			\
+  %D%/packages/ninja.scm			\
+  %D%/packages/node.scm				\
+  %D%/packages/noweb.scm			\
+  %D%/packages/ntp.scm				\
+  %D%/packages/nutrition.scm			\
+  %D%/packages/nvi.scm				\
+  %D%/packages/ocaml.scm			\
+  %D%/packages/ocr.scm				\
+  %D%/packages/onc-rpc.scm			\
+  %D%/packages/openbox.scm			\
+  %D%/packages/openldap.scm			\
+  %D%/packages/openstack.scm			\
+  %D%/packages/orpheus.scm			\
+  %D%/packages/ots.scm				\
+  %D%/packages/owncloud.scm			\
+  %D%/packages/package-management.scm		\
+  %D%/packages/parallel.scm			\
+  %D%/packages/password-utils.scm		\
+  %D%/packages/patchutils.scm			\
+  %D%/packages/pciutils.scm			\
+  %D%/packages/pcre.scm				\
+  %D%/packages/pdf.scm				\
+  %D%/packages/pem.scm				\
+  %D%/packages/perl.scm				\
+  %D%/packages/photo.scm			\
+  %D%/packages/pkg-config.scm			\
+  %D%/packages/plotutils.scm			\
+  %D%/packages/polkit.scm			\
+  %D%/packages/popt.scm				\
+  %D%/packages/pth.scm				\
+  %D%/packages/pulseaudio.scm			\
+  %D%/packages/pumpio.scm			\
+  %D%/packages/pretty-print.scm			\
+  %D%/packages/protobuf.scm			\
+  %D%/packages/pv.scm				\
+  %D%/packages/python.scm			\
+  %D%/packages/qemu.scm				\
+  %D%/packages/qt.scm				\
+  %D%/packages/ragel.scm			\
+  %D%/packages/rails.scm			\
+  %D%/packages/ratpoison.scm			\
+  %D%/packages/rc.scm				\
+  %D%/packages/rdesktop.scm			\
+  %D%/packages/rdf.scm				\
+  %D%/packages/readline.scm			\
+  %D%/packages/rrdtool.scm			\
+  %D%/packages/rsync.scm			\
+  %D%/packages/ruby.scm				\
+  %D%/packages/rush.scm				\
+  %D%/packages/samba.scm			\
+  %D%/packages/sawfish.scm			\
+  %D%/packages/scanner.scm			\
+  %D%/packages/scheme.scm			\
+  %D%/packages/screen.scm			\
+  %D%/packages/scribus.scm			\
+  %D%/packages/sdl.scm				\
+  %D%/packages/search.scm			\
+  %D%/packages/serialization.scm		\
+  %D%/packages/serveez.scm			\
+  %D%/packages/shellutils.scm			\
+  %D%/packages/shishi.scm			\
+  %D%/packages/skarnet.scm			\
+  %D%/packages/skribilo.scm			\
+  %D%/packages/slang.scm			\
+  %D%/packages/slim.scm				\
+  %D%/packages/smalltalk.scm			\
+  %D%/packages/speech.scm			\
+  %D%/packages/spice.scm			\
+  %D%/packages/ssh.scm				\
+  %D%/packages/stalonetray.scm			\
+  %D%/packages/statistics.scm			\
+  %D%/packages/suckless.scm			\
+  %D%/packages/swig.scm				\
+  %D%/packages/sxiv.scm				\
+  %D%/packages/synergy.scm			\
+  %D%/packages/task-management.scm		\
+  %D%/packages/tbb.scm				\
+  %D%/packages/tcl.scm				\
+  %D%/packages/tcsh.scm				\
+  %D%/packages/telephony.scm			\
+  %D%/packages/terminals.scm			\
+  %D%/packages/texinfo.scm			\
+  %D%/packages/tex.scm				\
+  %D%/packages/textutils.scm			\
+  %D%/packages/time.scm				\
+  %D%/packages/tls.scm				\
+  %D%/packages/tmux.scm				\
+  %D%/packages/tor.scm				\
+  %D%/packages/tre.scm				\
+  %D%/packages/tv.scm				\
+  %D%/packages/unrtf.scm			\
+  %D%/packages/upnp.scm				\
+  %D%/packages/uucp.scm				\
+  %D%/packages/valgrind.scm			\
+  %D%/packages/version-control.scm		\
+  %D%/packages/video.scm			\
+  %D%/packages/vim.scm				\
+  %D%/packages/vpn.scm				\
+  %D%/packages/vtk.scm				\
+  %D%/packages/w3m.scm				\
+  %D%/packages/wdiff.scm			\
+  %D%/packages/web.scm				\
+  %D%/packages/webkit.scm			\
+  %D%/packages/wget.scm				\
+  %D%/packages/wicd.scm				\
+  %D%/packages/wine.scm				\
+  %D%/packages/wm.scm				\
+  %D%/packages/wordnet.scm			\
+  %D%/packages/wv.scm				\
+  %D%/packages/wxwidgets.scm			\
+  %D%/packages/xfig.scm				\
+  %D%/packages/xiph.scm				\
+  %D%/packages/xml.scm				\
+  %D%/packages/xnee.scm				\
+  %D%/packages/xdisorg.scm			\
+  %D%/packages/xorg.scm				\
+  %D%/packages/xfce.scm				\
+  %D%/packages/yubico.scm			\
+  %D%/packages/zile.scm				\
+  %D%/packages/zip.scm				\
+  %D%/packages/zsh.scm				\
+						\
+  %D%/services.scm				\
+  %D%/services/avahi.scm			\
+  %D%/services/base.scm				\
+  %D%/services/databases.scm			\
+  %D%/services/dbus.scm				\
+  %D%/services/desktop.scm			\
+  %D%/services/dict.scm				\
+  %D%/services/lirc.scm				\
+  %D%/services/mail.scm				\
+  %D%/services/mcron.scm			\
+  %D%/services/networking.scm			\
+  %D%/services/shepherd.scm			\
+  %D%/services/herd.scm				\
+  %D%/services/ssh.scm				\
+  %D%/services/web.scm				\
+  %D%/services/xorg.scm				\
+						\
+  %D%/system.scm				\
+  %D%/system/file-systems.scm			\
+  %D%/system/grub.scm				\
+  %D%/system/install.scm			\
+  %D%/system/linux-container.scm		\
+  %D%/system/linux-initrd.scm			\
+  %D%/system/locale.scm				\
+  %D%/system/mapped-devices.scm			\
+  %D%/system/nss.scm				\
+  %D%/system/pam.scm				\
+  %D%/system/shadow.scm				\
+  %D%/system/vm.scm				\
+						\
+  %D%/build/activation.scm			\
+  %D%/build/file-systems.scm			\
+  %D%/build/install.scm				\
+  %D%/build/linux-boot.scm			\
+  %D%/build/linux-container.scm			\
+  %D%/build/linux-initrd.scm			\
+  %D%/build/linux-modules.scm			\
+  %D%/build/marionette.scm			\
+  %D%/build/vm.scm				\
+						\
+  %D%/tests.scm					\
+  %D%/tests/base.scm				\
+  %D%/tests/install.scm
+
+
+patchdir = $(guilemoduledir)/%D%/packages/patches
+dist_patch_DATA =						\
+  %D%/packages/patches/4store-fix-buildsystem.patch		\
+  %D%/packages/patches/a2ps-CVE-2001-1593.patch	\
+  %D%/packages/patches/a2ps-CVE-2014-0466.patch	\
+  %D%/packages/patches/abiword-explictly-cast-bools.patch	\
+  %D%/packages/patches/abiword-wmf-version-lookup-fix.patch	\
+  %D%/packages/patches/acl-hurd-path-max.patch			\
+  %D%/packages/patches/aegis-constness-error.patch         	\
+  %D%/packages/patches/aegis-perl-tempdir1.patch           	\
+  %D%/packages/patches/aegis-perl-tempdir2.patch           	\
+  %D%/packages/patches/aegis-test-fixup-1.patch            	\
+  %D%/packages/patches/aegis-test-fixup-2.patch            	\
+  %D%/packages/patches/agg-am_c_prototype.patch			\
+  %D%/packages/patches/alsa-lib-mips-atomic-fix.patch		\
+  %D%/packages/patches/antiword-CVE-2014-8123.patch			\
+  %D%/packages/patches/apr-skip-getservbyname-test.patch	\
+  %D%/packages/patches/arb-ldconfig.patch			\
+  %D%/packages/patches/ath9k-htc-firmware-binutils.patch	\
+  %D%/packages/patches/ath9k-htc-firmware-gcc.patch		\
+  %D%/packages/patches/ath9k-htc-firmware-objcopy.patch		\
+  %D%/packages/patches/audacity-fix-ffmpeg-binding.patch	\
+  %D%/packages/patches/automake-skip-amhello-tests.patch	\
+  %D%/packages/patches/automake-regexp-syntax.patch		\
+  %D%/packages/patches/automake-test-gzip-warning.patch		\
+  %D%/packages/patches/avahi-localstatedir.patch		\
+  %D%/packages/patches/avidemux-install-to-lib.patch		\
+  %D%/packages/patches/awesome-reproducible-png.patch		\
+  %D%/packages/patches/bash-completion-directories.patch	\
+  %D%/packages/patches/bigloo-gc-shebangs.patch			\
+  %D%/packages/patches/binutils-ld-new-dtags.patch		\
+  %D%/packages/patches/binutils-loongson-workaround.patch	\
+  %D%/packages/patches/byobu-writable-status.patch		\
+  %D%/packages/patches/calibre-drop-unrar.patch			\
+  %D%/packages/patches/calibre-no-updates-dialog.patch		\
+  %D%/packages/patches/cdparanoia-fpic.patch			\
+  %D%/packages/patches/chmlib-inttypes.patch			\
+  %D%/packages/patches/clang-libc-search-path.patch		\
+  %D%/packages/patches/clang-3.8-libc-search-path.patch		\
+  %D%/packages/patches/clucene-pkgconfig.patch			\
+  %D%/packages/patches/cmake-fix-tests.patch			\
+  %D%/packages/patches/cpio-gets-undeclared.patch		\
+  %D%/packages/patches/cpio-CVE-2016-2037.patch			\
+  %D%/packages/patches/cpufrequtils-fix-aclocal.patch		\
+  %D%/packages/patches/crda-optional-gcrypt.patch		\
+  %D%/packages/patches/crossmap-allow-system-pysam.patch	\
+  %D%/packages/patches/csound-header-ordering.patch		\
+  %D%/packages/patches/cssc-gets-undeclared.patch               \
+  %D%/packages/patches/cssc-missing-include.patch               \
+  %D%/packages/patches/clucene-contribs-lib.patch               \
+  %D%/packages/patches/cursynth-wave-rand.patch			\
+  %D%/packages/patches/dbus-helper-search-path.patch		\
+  %D%/packages/patches/devil-CVE-2009-3994.patch		\
+  %D%/packages/patches/devil-fix-libpng.patch			\
+  %D%/packages/patches/dico-idxgcide-bug.patch			\
+  %D%/packages/patches/dico-libtool-deterministic.patch		\
+  %D%/packages/patches/diffutils-gets-undeclared.patch		\
+  %D%/packages/patches/dfu-programmer-fix-libusb.patch		\
+  %D%/packages/patches/doc++-include-directives.patch		\
+  %D%/packages/patches/doc++-segfault-fix.patch			\
+  %D%/packages/patches/doxygen-test.patch			\
+  %D%/packages/patches/duplicity-piped-password.patch		\
+  %D%/packages/patches/duplicity-test_selection-tmp.patch	\
+  %D%/packages/patches/elfutils-tests-ptrace.patch		\
+  %D%/packages/patches/elixir-disable-failing-tests.patch	\
+  %D%/packages/patches/einstein-build.patch			\
+  %D%/packages/patches/emacs-exec-path.patch			\
+  %D%/packages/patches/emacs-fix-scheme-indent-function.patch	\
+  %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch	\
+  %D%/packages/patches/emacs-source-date-epoch.patch		\
+  %D%/packages/patches/eudev-rules-directory.patch		\
+  %D%/packages/patches/evilwm-lost-focus-bug.patch		\
+  %D%/packages/patches/expat-CVE-2012-6702-and-CVE-2016-5300.patch	\
+  %D%/packages/patches/expat-CVE-2015-1283-refix.patch		\
+  %D%/packages/patches/expat-CVE-2016-0718.patch		\
+  %D%/packages/patches/fastcap-mulGlobal.patch			\
+  %D%/packages/patches/fastcap-mulSetup.patch			\
+  %D%/packages/patches/fasthenry-spAllocate.patch		\
+  %D%/packages/patches/fasthenry-spBuild.patch			\
+  %D%/packages/patches/fasthenry-spUtils.patch			\
+  %D%/packages/patches/fasthenry-spSolve.patch			\
+  %D%/packages/patches/fasthenry-spFactor.patch			\
+  %D%/packages/patches/findutils-localstatedir.patch		\
+  %D%/packages/patches/findutils-test-xargs.patch		\
+  %D%/packages/patches/flashrom-use-libftdi1.patch		\
+  %D%/packages/patches/flint-ldconfig.patch			\
+  %D%/packages/patches/fltk-shared-lib-defines.patch		\
+  %D%/packages/patches/fltk-xfont-on-demand.patch		\
+  %D%/packages/patches/fontforge-svg-modtime.patch		\
+  %D%/packages/patches/fossil-test-fixes.patch			\
+  %D%/packages/patches/freeimage-CVE-2015-0852.patch		\
+  %D%/packages/patches/gawk-fts-test.patch			\
+  %D%/packages/patches/gawk-shell.patch				\
+  %D%/packages/patches/gcc-arm-link-spec-fix.patch		\
+  %D%/packages/patches/gcc-cross-environment-variables.patch	\
+  %D%/packages/patches/gcc-libvtv-runpath.patch			\
+  %D%/packages/patches/gcc-5.0-libvtv-runpath.patch		\
+  %D%/packages/patches/gd-fix-gd2-read-test.patch		\
+  %D%/packages/patches/gd-fix-tests-on-i686.patch		\
+  %D%/packages/patches/gegl-CVE-2012-4433.patch			\
+  %D%/packages/patches/geoclue-config.patch			\
+  %D%/packages/patches/ghostscript-CVE-2015-3228.patch		\
+  %D%/packages/patches/ghostscript-runpath.patch		\
+  %D%/packages/patches/gimp-CVE-2016-4994.patch			\
+  %D%/packages/patches/glib-networking-ssl-cert-file.patch	\
+  %D%/packages/patches/glib-tests-timer.patch			\
+  %D%/packages/patches/glibc-bootstrap-system.patch		\
+  %D%/packages/patches/glibc-ldd-x86_64.patch			\
+  %D%/packages/patches/glibc-locales.patch			\
+  %D%/packages/patches/glibc-o-largefile.patch			\
+  %D%/packages/patches/glibc-versioned-locpath.patch		\
+  %D%/packages/patches/gmp-arm-asm-nothumb.patch		\
+  %D%/packages/patches/gmp-faulty-test.patch			\
+  %D%/packages/patches/gnome-tweak-tool-search-paths.patch	\
+  %D%/packages/patches/gnucash-price-quotes-perl.patch		\
+  %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
+  %D%/packages/patches/gobject-introspection-cc.patch		\
+  %D%/packages/patches/gobject-introspection-girepository.patch	\
+  %D%/packages/patches/grep-timing-sensitive-test.patch		\
+  %D%/packages/patches/grub-CVE-2015-8370.patch			\
+  %D%/packages/patches/grub-gets-undeclared.patch		\
+  %D%/packages/patches/grub-freetype.patch			\
+  %D%/packages/patches/guile-1.8-cpp-4.5.patch			\
+  %D%/packages/patches/guile-arm-fixes.patch			\
+  %D%/packages/patches/guile-default-utf8.patch			\
+  %D%/packages/patches/guile-linux-syscalls.patch		\
+  %D%/packages/patches/guile-present-coding.patch		\
+  %D%/packages/patches/guile-relocatable.patch			\
+  %D%/packages/patches/guile-rsvg-pkgconfig.patch		\
+  %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch	\
+  %D%/packages/patches/gtk2-theme-paths.patch			\
+  %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch	\
+  %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
+  %D%/packages/patches/hdf5-config-date.patch			\
+  %D%/packages/patches/higan-remove-march-native-flag.patch	\
+  %D%/packages/patches/hop-bigloo-4.0b.patch			\
+  %D%/packages/patches/hop-linker-flags.patch			\
+  %D%/packages/patches/hydra-automake-1.15.patch		\
+  %D%/packages/patches/hydra-disable-darcs-test.patch		\
+  %D%/packages/patches/hypre-doc-tables.patch			\
+  %D%/packages/patches/hypre-ldflags.patch			\
+  %D%/packages/patches/icecat-avoid-bundled-includes.patch	\
+  %D%/packages/patches/icecat-CVE-2016-2818-pt1.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2818-pt2.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2818-pt3.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2818-pt4.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2818-pt5.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2818-pt6.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2818-pt7.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2818-pt8.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2818-pt9.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2819.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2821.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2824.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2828.patch		\
+  %D%/packages/patches/icecat-CVE-2016-2831.patch		\
+  %D%/packages/patches/icedtea-remove-overrides.patch		\
+  %D%/packages/patches/icu4c-CVE-2014-6585.patch		\
+  %D%/packages/patches/icu4c-CVE-2015-1270.patch		\
+  %D%/packages/patches/icu4c-CVE-2015-4760.patch		\
+  %D%/packages/patches/id3lib-CVE-2007-4460.patch			\
+  %D%/packages/patches/ilmbase-fix-tests.patch			\
+  %D%/packages/patches/inkscape-drop-wait-for-targets.patch	\
+  %D%/packages/patches/irrlicht-mesa-10.patch			\
+  %D%/packages/patches/jansson-CVE-2016-4425.patch		\
+  %D%/packages/patches/jasper-CVE-2007-2721.patch		\
+  %D%/packages/patches/jasper-CVE-2008-3520.patch		\
+  %D%/packages/patches/jasper-CVE-2008-3522.patch		\
+  %D%/packages/patches/jasper-CVE-2011-4516-and-CVE-2011-4517.patch \
+  %D%/packages/patches/jasper-CVE-2014-8137.patch		\
+  %D%/packages/patches/jasper-CVE-2014-8138.patch		\
+  %D%/packages/patches/jasper-CVE-2014-8157.patch		\
+  %D%/packages/patches/jasper-CVE-2014-8158.patch		\
+  %D%/packages/patches/jasper-CVE-2014-9029.patch		\
+  %D%/packages/patches/jasper-CVE-2016-1577.patch		\
+  %D%/packages/patches/jasper-CVE-2016-1867.patch		\
+  %D%/packages/patches/jasper-CVE-2016-2089.patch		\
+  %D%/packages/patches/jasper-CVE-2016-2116.patch		\
+  %D%/packages/patches/jbig2dec-ignore-testtest.patch		\
+  %D%/packages/patches/khmer-use-libraries.patch                \
+  %D%/packages/patches/kmod-module-directory.patch		\
+  %D%/packages/patches/ldc-disable-tests.patch			\
+  %D%/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
+  %D%/packages/patches/liba52-enable-pic.patch			\
+  %D%/packages/patches/liba52-link-with-libm.patch		\
+  %D%/packages/patches/liba52-set-soname.patch			\
+  %D%/packages/patches/liba52-use-mtune-not-mcpu.patch		\
+  %D%/packages/patches/libbonobo-activation-test-race.patch	\
+  %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
+  %D%/packages/patches/libcmis-fix-test-onedrive.patch		\
+  %D%/packages/patches/libdrm-symbol-check.patch		\
+  %D%/packages/patches/libevent-dns-tests.patch			\
+  %D%/packages/patches/libextractor-ffmpeg-3.patch		\
+  %D%/packages/patches/liboop-mips64-deplibs-fix.patch		\
+  %D%/packages/patches/libotr-test-auth-fix.patch		\
+  %D%/packages/patches/liblxqt-include.patch			\
+  %D%/packages/patches/libmad-armv7-thumb-pt1.patch		\
+  %D%/packages/patches/libmad-armv7-thumb-pt2.patch		\
+  %D%/packages/patches/libmad-frame-length.patch		\
+  %D%/packages/patches/libmad-mips-newgcc.patch			\
+  %D%/packages/patches/libssh-0.6.5-CVE-2016-0739.patch		\
+  %D%/packages/patches/libtar-CVE-2013-4420.patch \
+  %D%/packages/patches/libtheora-config-guess.patch		\
+  %D%/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch \
+  %D%/packages/patches/libtiff-oob-accesses-in-decode.patch	\
+  %D%/packages/patches/libtiff-oob-write-in-nextdecode.patch	\
+  %D%/packages/patches/libtool-skip-tests2.patch		\
+  %D%/packages/patches/libunwind-CVE-2015-3239.patch		\
+  %D%/packages/patches/libvpx-CVE-2016-2818.patch		\
+  %D%/packages/patches/libwmf-CAN-2004-0941.patch		\
+  %D%/packages/patches/libwmf-CVE-2006-3376.patch		\
+  %D%/packages/patches/libwmf-CVE-2007-0455.patch		\
+  %D%/packages/patches/libwmf-CVE-2007-2756.patch		\
+  %D%/packages/patches/libwmf-CVE-2007-3472.patch		\
+  %D%/packages/patches/libwmf-CVE-2007-3473.patch		\
+  %D%/packages/patches/libwmf-CVE-2007-3477.patch		\
+  %D%/packages/patches/libwmf-CVE-2009-1364.patch		\
+  %D%/packages/patches/libwmf-CVE-2009-3546.patch		\
+  %D%/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch	\
+  %D%/packages/patches/libwmf-CVE-2015-4695.patch		\
+  %D%/packages/patches/libwmf-CVE-2015-4696.patch		\
+  %D%/packages/patches/libxslt-generated-ids.patch		\
+  %D%/packages/patches/lirc-localstatedir.patch			\
+  %D%/packages/patches/lm-sensors-hwmon-attrs.patch		\
+  %D%/packages/patches/lua-CVE-2014-5461.patch                      \
+  %D%/packages/patches/lua-pkgconfig.patch                      \
+  %D%/packages/patches/lua51-liblua-so.patch                    \
+  %D%/packages/patches/lua52-liblua-so.patch                    \
+  %D%/packages/patches/luajit-no_ldconfig.patch			\
+  %D%/packages/patches/luajit-symlinks.patch			\
+  %D%/packages/patches/luit-posix.patch				\
+  %D%/packages/patches/m4-gets-undeclared.patch			\
+  %D%/packages/patches/make-impure-dirs.patch			\
+  %D%/packages/patches/mars-install.patch			\
+  %D%/packages/patches/mars-sfml-2.3.patch			\
+  %D%/packages/patches/matplotlib-setupext-tk.patch		\
+  %D%/packages/patches/maxima-defsystem-mkdir.patch		\
+  %D%/packages/patches/mcron-install.patch			\
+  %D%/packages/patches/mcrypt-CVE-2012-4409.patch			\
+  %D%/packages/patches/mcrypt-CVE-2012-4426.patch			\
+  %D%/packages/patches/mcrypt-CVE-2012-4527.patch			\
+  %D%/packages/patches/mhash-keygen-test-segfault.patch		\
+  %D%/packages/patches/mpc123-initialize-ao.patch		\
+  %D%/packages/patches/mplayer2-theora-fix.patch		\
+  %D%/packages/patches/module-init-tools-moduledir.patch	\
+  %D%/packages/patches/mumps-build-parallelism.patch		\
+  %D%/packages/patches/mupen64plus-ui-console-notice.patch	\
+  %D%/packages/patches/mutt-store-references.patch		\
+  %D%/packages/patches/mysql-fix-failing-test.patch		\
+  %D%/packages/patches/nasm-no-ps-pdf.patch			\
+  %D%/packages/patches/net-tools-bitrot.patch			\
+  %D%/packages/patches/netcdf-config-date.patch			\
+  %D%/packages/patches/ngircd-handle-zombies.patch		\
+  %D%/packages/patches/ngircd-no-dns-in-tests.patch		\
+  %D%/packages/patches/ninja-tests.patch			\
+  %D%/packages/patches/ninja-zero-mtime.patch			\
+  %D%/packages/patches/nss-pkgconfig.patch			\
+  %D%/packages/patches/nvi-assume-preserve-path.patch		\
+  %D%/packages/patches/nvi-dbpagesize-binpower.patch		\
+  %D%/packages/patches/nvi-db4.patch				\
+  %D%/packages/patches/ocaml-CVE-2015-8869.patch		\
+  %D%/packages/patches/ocaml-findlib-make-install.patch	\
+  %D%/packages/patches/openexr-missing-samples.patch		\
+  %D%/packages/patches/openjpeg-CVE-2015-6581.patch		\
+  %D%/packages/patches/openjpeg-use-after-free-fix.patch	\
+  %D%/packages/patches/openssl-runpath.patch			\
+  %D%/packages/patches/openssl-c-rehash-in.patch		\
+  %D%/packages/patches/openssl-CVE-2016-2177.patch		\
+  %D%/packages/patches/openssl-CVE-2016-2178.patch		\
+  %D%/packages/patches/orpheus-cast-errors-and-includes.patch	\
+  %D%/packages/patches/ots-no-include-missing-file.patch	\
+  %D%/packages/patches/patchelf-page-size.patch			\
+  %D%/packages/patches/patchelf-rework-for-arm.patch		\
+  %D%/packages/patches/patchutils-xfail-gendiff-tests.patch	\
+  %D%/packages/patches/patch-hurd-path-max.patch		\
+  %D%/packages/patches/pcre-CVE-2016-3191.patch			\
+  %D%/packages/patches/pcre2-CVE-2016-3191.patch		\
+  %D%/packages/patches/perl-CVE-2015-8607.patch			\
+  %D%/packages/patches/perl-CVE-2016-2381.patch			\
+  %D%/packages/patches/perl-autosplit-default-time.patch	\
+  %D%/packages/patches/perl-deterministic-ordering.patch	\
+  %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
+  %D%/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch \
+  %D%/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \
+  %D%/packages/patches/perl-net-amazon-s3-moose-warning.patch	\
+  %D%/packages/patches/perl-net-ssleay-disable-ede-test.patch	\
+  %D%/packages/patches/perl-no-build-time.patch			\
+  %D%/packages/patches/perl-no-sys-dirs.patch			\
+  %D%/packages/patches/perl-module-pluggable-search.patch	\
+  %D%/packages/patches/perl-source-date-epoch.patch		\
+  %D%/packages/patches/pidgin-add-search-path.patch		\
+  %D%/packages/patches/pinball-const-fix.patch			\
+  %D%/packages/patches/pinball-cstddef.patch			\
+  %D%/packages/patches/pinball-missing-separators.patch		\
+  %D%/packages/patches/pinball-src-deps.patch			\
+  %D%/packages/patches/pinball-system-ltdl.patch		\
+  %D%/packages/patches/pingus-sdl-libs-config.patch		\
+  %D%/packages/patches/plink-1.07-unclobber-i.patch		\
+  %D%/packages/patches/plotutils-libpng-jmpbuf.patch		\
+  %D%/packages/patches/polkit-drop-test.patch			\
+  %D%/packages/patches/portaudio-audacity-compat.patch		\
+  %D%/packages/patches/portmidi-modular-build.patch		\
+  %D%/packages/patches/procmail-ambiguous-getline-debian.patch  \
+  %D%/packages/patches/procmail-CVE-2014-3618.patch		\
+  %D%/packages/patches/procps-non-linux.patch			\
+  %D%/packages/patches/pt-scotch-build-parallelism.patch	\
+  %D%/packages/patches/pulseaudio-fix-mult-test.patch		\
+  %D%/packages/patches/pulseaudio-longer-test-timeout.patch	\
+  %D%/packages/patches/pycairo-wscript.patch			\
+  %D%/packages/patches/pybugz-encode-error.patch		\
+  %D%/packages/patches/pybugz-stty.patch			\
+  %D%/packages/patches/pygpgme-disable-problematic-tests.patch  \
+  %D%/packages/patches/pyqt-configure.patch			\
+  %D%/packages/patches/python-2-deterministic-build-info.patch	\
+  %D%/packages/patches/python-2.7-search-paths.patch		\
+  %D%/packages/patches/python-2.7-source-date-epoch.patch	\
+  %D%/packages/patches/python-3-deterministic-build-info.patch	\
+  %D%/packages/patches/python-3-search-paths.patch		\
+  %D%/packages/patches/python-dendropy-exclude-failing-tests.patch \
+  %D%/packages/patches/python-disable-ssl-test.patch		\
+  %D%/packages/patches/python-fix-tests.patch			\
+  %D%/packages/patches/python-ipython-inputhook-ctype.patch	\
+  %D%/packages/patches/python-rarfile-fix-tests.patch		\
+  %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch	\
+  %D%/packages/patches/python-configobj-setuptools.patch	\
+  %D%/packages/patches/python-paste-remove-website-test.patch	\
+  %D%/packages/patches/python-paste-remove-timing-test.patch	\
+  %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
+  %D%/packages/patches/qt4-ldflags.patch			\
+  %D%/packages/patches/rapicorn-isnan.patch			\
+  %D%/packages/patches/ratpoison-shell.patch			\
+  %D%/packages/patches/readline-link-ncurses.patch		\
+  %D%/packages/patches/ripperx-missing-file.patch		\
+  %D%/packages/patches/rpm-CVE-2014-8118.patch			\
+  %D%/packages/patches/rsem-makefile.patch			\
+  %D%/packages/patches/ruby-concurrent-ignore-broken-test.patch	\
+  %D%/packages/patches/ruby-puma-ignore-broken-test.patch       \
+  %D%/packages/patches/ruby-symlinkfix.patch                    \
+  %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
+  %D%/packages/patches/rush-CVE-2013-6889.patch			\
+  %D%/packages/patches/sed-hurd-path-max.patch			\
+  %D%/packages/patches/scheme48-tests.patch			\
+  %D%/packages/patches/scotch-test-threading.patch		\
+  %D%/packages/patches/sdl-libx11-1.6.patch			\
+  %D%/packages/patches/serf-comment-style-fix.patch		\
+  %D%/packages/patches/serf-deflate-buckets-test-fix.patch	\
+  %D%/packages/patches/slim-session.patch			\
+  %D%/packages/patches/slim-config.patch			\
+  %D%/packages/patches/slim-sigusr1.patch			\
+  %D%/packages/patches/slurm-configure-remove-nonfree-contribs.patch \
+  %D%/packages/patches/soprano-find-clucene.patch		\
+  %D%/packages/patches/superlu-dist-scotchmetis.patch		\
+  %D%/packages/patches/synfig-build-fix.patch			\
+  %D%/packages/patches/t1lib-CVE-2010-2642.patch		\
+  %D%/packages/patches/t1lib-CVE-2011-0764.patch		\
+  %D%/packages/patches/t1lib-CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.patch		\
+  %D%/packages/patches/tar-skip-unreliable-tests.patch		\
+  %D%/packages/patches/tcl-mkindex-deterministic.patch		\
+  %D%/packages/patches/tclxml-3.2-install.patch			\
+  %D%/packages/patches/tcsh-fix-autotest.patch			\
+  %D%/packages/patches/teensy-loader-cli-help.patch		\
+  %D%/packages/patches/texi2html-document-encoding.patch	\
+  %D%/packages/patches/texi2html-i18n.patch			\
+  %D%/packages/patches/tidy-CVE-2015-5522+5523.patch		\
+  %D%/packages/patches/tinyxml-use-stl.patch			\
+  %D%/packages/patches/tk-find-library.patch			\
+  %D%/packages/patches/ttf2eot-cstddef.patch			\
+  %D%/packages/patches/ttfautohint-source-date-epoch.patch	\
+  %D%/packages/patches/tophat-build-with-later-seqan.patch	\
+  %D%/packages/patches/torsocks-dns-test.patch			\
+  %D%/packages/patches/totem-debug-format-fix.patch		\
+  %D%/packages/patches/tuxpaint-stamps-path.patch		\
+  %D%/packages/patches/unzip-CVE-2014-8139.patch		\
+  %D%/packages/patches/unzip-CVE-2014-8140.patch		\
+  %D%/packages/patches/unzip-CVE-2014-8141.patch		\
+  %D%/packages/patches/unzip-CVE-2014-9636.patch		\
+  %D%/packages/patches/unzip-CVE-2015-7696.patch		\
+  %D%/packages/patches/unzip-CVE-2015-7697.patch		\
+  %D%/packages/patches/unzip-allow-greater-hostver-values.patch	\
+  %D%/packages/patches/unzip-attribs-overflow.patch		\
+  %D%/packages/patches/unzip-overflow-on-invalid-input.patch	\
+  %D%/packages/patches/unzip-format-secure.patch		\
+  %D%/packages/patches/unzip-initialize-symlink-flag.patch	\
+  %D%/packages/patches/unzip-overflow-long-fsize.patch		\
+  %D%/packages/patches/unzip-remove-build-date.patch		\
+  %D%/packages/patches/util-linux-tests.patch			\
+  %D%/packages/patches/upower-builddir.patch			\
+  %D%/packages/patches/valgrind-enable-arm.patch		\
+  %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch		\
+  %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch		\
+  %D%/packages/patches/vorbis-tools-CVE-2015-6749.patch		\
+  %D%/packages/patches/vpnc-script.patch			\
+  %D%/packages/patches/vte-CVE-2012-2738-pt1.patch			\
+  %D%/packages/patches/vte-CVE-2012-2738-pt2.patch			\
+  %D%/packages/patches/vtk-mesa-10.patch			\
+  %D%/packages/patches/w3m-libgc.patch				\
+  %D%/packages/patches/w3m-force-ssl_verify_server-on.patch	\
+  %D%/packages/patches/w3m-disable-sslv2-and-sslv3.patch	\
+  %D%/packages/patches/w3m-disable-weak-ciphers.patch		\
+  %D%/packages/patches/weechat-python.patch			\
+  %D%/packages/patches/weex-vacopy.patch			\
+  %D%/packages/patches/wicd-bitrate-none-fix.patch		\
+  %D%/packages/patches/wicd-get-selected-profile-fix.patch	\
+  %D%/packages/patches/wicd-urwid-1.3.patch			\
+  %D%/packages/patches/wicd-wpa2-ttls.patch			\
+  %D%/packages/patches/wmctrl-64-fix.patch			\
+  %D%/packages/patches/woff2-libbrotli.patch			\
+  %D%/packages/patches/wordnet-CVE-2008-2149.patch			\
+  %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch			\
+  %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch			\
+  %D%/packages/patches/wpa-supplicant-CVE-2015-5310.patch	\
+  %D%/packages/patches/wpa-supplicant-CVE-2015-5314.patch	\
+  %D%/packages/patches/wpa-supplicant-CVE-2015-5315.patch	\
+  %D%/packages/patches/wpa-supplicant-CVE-2015-5316.patch	\
+  %D%/packages/patches/wpa-supplicant-CVE-2016-4476.patch	\
+  %D%/packages/patches/wpa-supplicant-CVE-2016-4477-pt1.patch	\
+  %D%/packages/patches/wpa-supplicant-CVE-2016-4477-pt2.patch	\
+  %D%/packages/patches/wpa-supplicant-CVE-2016-4477-pt3.patch	\
+  %D%/packages/patches/wpa-supplicant-CVE-2016-4477-pt4.patch	\
+  %D%/packages/patches/xdotool-fix-makefile.patch               \
+  %D%/packages/patches/xf86-video-ark-remove-mibstore.patch	\
+  %D%/packages/patches/xf86-video-ast-remove-mibstore.patch	\
+  %D%/packages/patches/xf86-video-geode-glibc-2.20.patch	\
+  %D%/packages/patches/xf86-video-glint-remove-mibstore.patch	\
+  %D%/packages/patches/xf86-video-i128-remove-mibstore.patch	\
+  %D%/packages/patches/xf86-video-intel-compat-api.patch	\
+  %D%/packages/patches/xf86-video-intel-glibc-2.20.patch	\
+  %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch	\
+  %D%/packages/patches/xf86-video-nv-remove-mibstore.patch	\
+  %D%/packages/patches/xf86-video-openchrome-glibc-2.20.patch	\
+  %D%/packages/patches/xf86-video-tga-remove-mibstore.patch	\
+  %D%/packages/patches/xfce4-panel-plugins.patch		\
+  %D%/packages/patches/xfce4-session-fix-xflock4.patch		\
+  %D%/packages/patches/xfce4-settings-defaults.patch		\
+  %D%/packages/patches/xmodmap-asprintf.patch 			\
+  %D%/packages/patches/libyaml-CVE-2014-9130.patch 		\
+  %D%/packages/patches/zathura-plugindir-environment-variable.patch
+
+MISC_DISTRO_FILES =				\
+  %D%/packages/ld-wrapper.in
+
+bootstrapdir = $(guilemoduledir)/%D%/packages/bootstrap
+bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
+bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
+bootstrap_armhf_linuxdir = $(bootstrapdir)/armhf-linux
+bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux
+
+dist_bootstrap_x86_64_linux_DATA =		\
+  %D%/packages/bootstrap/x86_64-linux/bash	\
+  %D%/packages/bootstrap/x86_64-linux/mkdir	\
+  %D%/packages/bootstrap/x86_64-linux/tar	\
+  %D%/packages/bootstrap/x86_64-linux/xz
+
+dist_bootstrap_i686_linux_DATA =		\
+  %D%/packages/bootstrap/i686-linux/bash	\
+  %D%/packages/bootstrap/i686-linux/mkdir	\
+  %D%/packages/bootstrap/i686-linux/tar		\
+  %D%/packages/bootstrap/i686-linux/xz
+
+dist_bootstrap_armhf_linux_DATA =		\
+  %D%/packages/bootstrap/armhf-linux/bash	\
+  %D%/packages/bootstrap/armhf-linux/mkdir	\
+  %D%/packages/bootstrap/armhf-linux/tar	\
+  %D%/packages/bootstrap/armhf-linux/xz
+
+dist_bootstrap_mips64el_linux_DATA =		\
+  %D%/packages/bootstrap/mips64el-linux/bash	\
+  %D%/packages/bootstrap/mips64el-linux/mkdir	\
+  %D%/packages/bootstrap/mips64el-linux/tar	\
+  %D%/packages/bootstrap/mips64el-linux/xz
+
+# Big bootstrap binaries are not included in the tarball.  Instead, they
+# are downloaded.
+nodist_bootstrap_x86_64_linux_DATA =					\
+  %D%/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz
+nodist_bootstrap_i686_linux_DATA =					\
+  %D%/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz
+nodist_bootstrap_armhf_linux_DATA =					\
+  %D%/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz
+nodist_bootstrap_mips64el_linux_DATA =					\
+  %D%/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz
+
+# Those files must remain executable, so they remain executable once
+# imported into the store.
+set-bootstrap-executable-permissions:
+	chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}
+
+DISTCLEANFILES =				\
+  $(nodist_bootstrap_x86_64_linux_DATA)		\
+  $(nodist_bootstrap_i686_linux_DATA)		\
+  $(nodist_bootstrap_armhf_linux_DATA)		\
+  $(nodist_bootstrap_mips64el_linux_DATA)
+
+# Method to download a file from an external source.
+DOWNLOAD_FILE =								\
+  GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH"	\
+  $(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)"	\
+           "$(top_srcdir)/build-aux/download.scm"
+
+%D%/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz:
+	$(AM_V_DL)$(MKDIR_P) `dirname "$@"`;	\
+	$(DOWNLOAD_FILE) "$@"			\
+	  "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
+%D%/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz:
+	$(AM_V_DL)$(MKDIR_P) `dirname "$@"`;	\
+	$(DOWNLOAD_FILE) "$@"			\
+	  "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
+%D%/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz:
+	$(AM_V_DL)$(MKDIR_P) `dirname "$@"`;	\
+	$(DOWNLOAD_FILE) "$@"			\
+	  "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6"
+%D%/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz:
+	$(AM_V_DL)$(MKDIR_P) `dirname "$@"`;	\
+	$(DOWNLOAD_FILE) "$@" 			\
+	  "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"
@@ -24,6 +24,7 @@
  #:use-module (guix packages)
  #:use-module (guix ui)
  #:use-module (guix utils)
+  #:use-module (guix combinators)
  #:use-module ((guix build utils)
                #:select ((package-name->name+version
                           . hyphen-separated-name->name+version)))
@@ -37,12 +38,14 @@
  #:use-module (srfi srfi-35)
  #:use-module (srfi srfi-39)
  #:export (search-patch
+            search-patches
            search-bootstrap-binary
            %patch-path
            %bootstrap-binaries-path
            %package-module-path

            fold-packages
+            scheme-modules                    ;XXX: for lack of a better place

            find-packages-by-name
            find-best-packages-by-name
@@ -76,6 +79,11 @@
              (&message (message (format #f (_ "~a: patch not found")
                                         file-name)))))))

+(define-syntax-rule (search-patches file-name ...)
+  "Return the list of absolute file names corresponding to each
+FILE-NAME found in %PATCH-PATH."
+  (list (search-patch file-name) ...))
+
 (define (search-bootstrap-binary file-name system)
  "Search the bootstrap binary FILE-NAME for SYSTEM.  Raise an error if not
 found."
@@ -151,8 +159,8 @@ returned list is sorted in alphabetical order."
      (map string->symbol
           (string-tokenize (string-drop-right file 4) not-slash)))))

-(define* (package-modules directory #:optional sub-directory)
-  "Return the list of modules that provide packages for the distribution.
+(define* (scheme-modules directory #:optional sub-directory)
+  "Return the list of Scheme modules available under DIRECTORY.
 Optionally, narrow the search to SUB-DIRECTORY."
  (define prefix-len
    (string-length directory))
@@ -177,9 +185,9 @@ search."
  (fold-right (lambda (spec result)
                (match spec
                  ((? string? directory)
-                   (append (package-modules directory) result))
+                   (append (scheme-modules directory) result))
                  ((directory . sub-directory)
-                   (append (package-modules directory sub-directory)
+                   (append (scheme-modules directory sub-directory)
                           result))))
              '()
              path))
@@ -192,7 +200,8 @@ same package twice."
   (fold2 (lambda (module result seen)
            (fold2 (lambda (var result seen)
                     (if (and (package? var)
-                              (not (vhash-assq var seen)))
+                              (not (vhash-assq var seen))
+                              (not (hidden-package? var)))
                         (values (proc var result)
                                 (vhash-consq var #t seen))
                         (values result seen)))
@@ -25,7 +25,7 @@
 (define-public abduco
  (package
   (name "abduco")
-   (version "0.5")
+   (version "0.6")
   (source (origin
            (method url-fetch)
            (uri (string-append
@@ -33,7 +33,7 @@
                  version ".tar.gz"))
            (sha256
             (base32
-              "11phry5wnvwm9ckij5gxbrjfgdz3x38vpnm505q5ldc88im248mz"))))
+              "1x1m58ckwsprljgmdy93mvgjyg9x3cqrzdf3mysp0mx97zhhj2f9"))))
   (build-system gnu-build-system)
   (arguments
    `(#:make-flags (list "CC=gcc"
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,6 +23,7 @@
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
  #:use-module (gnu packages boost)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages enchant)
@@ -41,7 +43,7 @@
 (define-public abiword
  (package
    (name "abiword")
-    (version "2.8.6")
+    (version "3.0.1")
    (source
      (origin
        (method url-fetch)
@@ -49,15 +51,10 @@
          (string-append "http://abisource.org/downloads/" name "/" version
                         "/source/" name "-" version ".tar.gz"))
        (sha256
-          (base32 "059sd2apxdmcacc4pll880i7vm18h0kyjsq299m1mz3c7ak8k46r"))
+          (base32 "1ik591rx15nn3n1297cwykl8wvrlgj78i528id9wbidgy3xzd570"))
        (patches
-          (list
-            (search-patch "abiword-wmf-version-lookup-fix.patch")
-            (search-patch "abiword-no-include-glib-internal-headers.patch")
-            (search-patch "abiword-explictly-cast-bools.patch")
-            (search-patch "abiword-use-proper-png-api.patch")
-            (search-patch "abiword-pass-no-undefined-to-linker.patch")
-            (search-patch "abiword-link-plugins-against-backend.patch")))))
+         (search-patches "abiword-wmf-version-lookup-fix.patch"
+                         "abiword-explictly-cast-bools.patch"))))

    (build-system gnu-build-system)
    (arguments                   ;; NOTE: rsvg is disabled, since Abiword
@@ -65,22 +62,31 @@
        (list
          "--enable-clipart"     ;; TODO: The following plugins have unresolved
          "--enable-templates"   ;; dependencies: aiksaurus, grammar, wpg, gda,
-          (string-append         ;; wordperfect, psion, mathview, goffice.
+          (string-append         ;; wordperfect, psion, mathview.
            "--enable-plugins="
              "applix " "babelfish " "bmp " "clarisworks " "collab " "command "
-              "docbook " "eml " "freetranslation " "garble " "gdict " "gimp "
-              "google " "hancom " "hrtext " "iscii " "kword " "latex "
-              "loadbindings " "mht " "mif " "mswrite " "opendocument "
+              "docbook " "eml " "epub " "freetranslation " "garble " "gdict "
+              "gimp " "goffice " "google " "hancom " "hrtext " "iscii " "kword "
+              "latex " "loadbindings " "mht " "mif " "mswrite " "opendocument "
              "openwriter " "openxml " "opml " "ots " "paint " "passepartout "
              "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict "
-              "wikipedia " "wmf " "wml " "xslfo"))))
+              "wikipedia " "wmf " "wml " "xslfo"))
+        ;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen:
+        ;;                  assertion 'GDK_IS_SCREEN (screen)' failed
+        ;;                  GLib-GObject-CRITICAL **: g_object_get_qdata:
+        ;;                  assertion 'G_IS_OBJECT (object)' failed
+        ;; Manually starting the X server before the test phase did not help
+        ;; the tests to pass.
+        #:tests? #f))
    (inputs
      `(("boost" ,boost)
        ("enchant" ,enchant)
        ("fontconfig" ,fontconfig)
        ("fribidi" ,fribidi)
        ("glib" ,glib)
-        ("gtk+" ,gtk+-2)
+        ("goffice" ,goffice)
+        ("gtk+" ,gtk+)
+        ("libchamplain" ,libchamplain)
        ("libglade" ,libglade)
        ("libgsf" ,libgsf)
        ("libjpeg" ,libjpeg)
@@ -88,14 +94,17 @@
        ("librsvg" ,librsvg)
        ("libwmf" ,libwmf)
        ("libxml2" ,libxml2)
+        ("libxslt" ,libxslt)
        ("ots" ,ots)
        ("popt" ,popt)
        ("readline" ,readline)
+        ("telepathy" ,telepathy-glib)
        ("wv" ,wv)
        ("zlib" ,zlib)))
    (native-inputs
      `(("intltool" ,intltool)
        ("glib:bin" ,glib "bin")
+        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
    (home-page "http://abisource.org/")
    (synopsis "Word processing program")
@@ -41,7 +41,7 @@
      (sha256
       (base32
        "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p"))
-      (patches (list (search-patch "acl-hurd-path-max.patch")))))
+      (patches (search-patches "acl-hurd-path-max.patch"))))
    (build-system gnu-build-system)
    (arguments
     `(#:tests? #f   ; FIXME: Investigate test suite failures
@@ -3,13 +3,15 @@
 ;;; 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 © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+;;; Copyright © 2015, 2016 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>
+;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
+;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -42,8 +44,10 @@
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages readline)
  #:use-module (gnu packages linux)
+  #:use-module (gnu packages lua)
  #:use-module (gnu packages guile)
  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages pcre)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages tcl)
  #:use-module (gnu packages compression)
@@ -56,6 +60,7 @@
  #:use-module (gnu packages mcrypt)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages popt)
+  #:use-module (gnu packages python)
  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages groff)
  #:use-module (gnu packages pciutils)
@@ -98,45 +103,34 @@ usual file attributes can be checked for inconsistencies.")
    (home-page "http://aide.sourceforge.net/")
    (license license:gpl2+)))

-(define-public dmd
-  ;; Deprecated.  Kept around "just in case."
-  (let ((base-version "0.2")
-        (patch-level  "01"))
-    (package
-      (name "dmd")
-      (version (string-append base-version "." patch-level))
-      (source (origin
-                (method url-fetch)
-                (uri (string-append "ftp://alpha.gnu.org/gnu/dmd/dmd-"
-                                    base-version ".tar.gz"))
-                (sha256
-                 (base32
-                  "10fl4k96f17gqx2fv8iw9c61ld26gsk4bbrlfqckdmiimz1k175z"))
-                (patches
-                 (list (origin
-                         ;; This patch augments 'make-fork+exec-constructor' and
-                         ;; is used by a bunch of services.
-                         (method url-fetch)
-                         (uri (string-append
-                               "http://git.savannah.gnu.org/cgit/shepherd.git/"
-                               "patch?id=d1d0ff30b3ed2b86b0a3c9bc048d2a855f8e31e6"))
-                         (sha256
-                          (base32
-                           "1lqymypixfiyb72d6bn24m06ry2q1ljnnv0qrc89pbb4z9azaa4d"))
-                         (file-name "dmd-user-group.patch"))))))
-      (build-system gnu-build-system)
-      (arguments
-       '(#:configure-flags '("--localstatedir=/var")))
-      (native-inputs `(("pkg-config" ,pkg-config)))
-      (inputs `(("guile" ,guile-2.0)))
-      (synopsis "Daemon managing daemons")
-      (description
-       "GNU DMD is a daemon-managing daemon, meaning that it manages 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/dmd/"))))
+(define-public progress
+  (package
+    (name "progress")
+    (version "0.13")
+    (source (origin
+      (method url-fetch)
+      (uri (string-append "https://github.com/Xfennec/"
+                          name "/archive/v" version ".tar.gz"))
+      (sha256
+       (base32 "133iar4vq5vlklydb4cyazjy6slmpbndrws474mg738bd8avc30n"))
+      (file-name (string-append name "-" version ".tar.gz"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("ncurses" ,ncurses)))
+    (arguments
+     `(#:tests? #f ; There is no test suite.
+       #:make-flags (list "CC=gcc" "LDFLAGS+=-lncurses"
+                          (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)))) ; There's no configure phase.
+    (home-page "https://github.com/Xfennec/progress")
+    (synopsis "Program to view the progress of the coreutils commands")
+    (description "A program that looks for coreutils basic commands (cp, mv,
+dd, tar, gzip/gunzip, cat, etc.) currently running on your system and displays
+the percentage of copied data.  It can also show estimated time and throughput,
+and provides a \"top-like\" mode (monitoring).")
+    (license license:gpl3+)))

 (define-public shepherd
  (package
@@ -189,14 +183,14 @@ graphs and can export its output to different formats.")
 (define-public htop
  (package
   (name "htop")
-   (version "2.0.1")
+   (version "2.0.2")
   (source (origin
            (method url-fetch)
            (uri (string-append "http://hisham.hm/htop/releases/"
                  version "/htop-" version ".tar.gz"))
            (sha256
             (base32
-              "0rjn9ybqx5sav7z4gn18f1q6k23nmqyb6yydfgghzdznz9nn447l"))))
+              "11zlwadm6dpkrlfvf3z3xll26yyffa7qrxd1w72y1kl0rgffk6qp"))))
   (build-system gnu-build-system)
   (inputs
    `(("ncurses" ,ncurses)))
@@ -312,8 +306,8 @@ login, passwd, su, groupadd, and useradd.")
    (version "1.08")
    (source (origin
             (method url-fetch)
-             (uri (string-append "mirror://sourceforge/mingetty/mingetty-"
-                                 version ".tar.gz"))
+             (uri (string-append "mirror://sourceforge/mingetty/mingetty/"
+                                 version "/mingetty-" version ".tar.gz"))
             (sha256
              (base32
               "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"))))
@@ -406,8 +400,8 @@ ONC RPC numbers.")
    (version "0.7.1")
    (source (origin
             (method url-fetch)
-             (uri (string-append "mirror://sourceforge/netcat/netcat-"
-                                 version ".tar.bz2"))
+             (uri (string-append "mirror://sourceforge/netcat/netcat/" version
+                                 "/netcat-" version ".tar.bz2"))
             (sha256
              (base32
               "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"))))
@@ -455,9 +449,9 @@ connection alive.")
 (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-patch-version "9")
+         (bind-release-type "")         ; for patch release, use "-P"
+         (bind-release-version "")      ; for patch release, e.g. "4"
         (bind-version (string-append bind-major-version
                                      "."
                                      bind-minor-version
@@ -467,14 +461,14 @@ connection alive.")
                                      bind-release-version)))
    (package
      (name "isc-dhcp")
-      (version "4.3.3-P1")
+      (version "4.3.4")
      (source (origin
                (method url-fetch)
                (uri (string-append "http://ftp.isc.org/isc/dhcp/"
                                    version "/dhcp-" version ".tar.gz"))
                (sha256
                 (base32
-                  "08crcsmg4dm2v533aq3883ik8mf4vvvd6r998r4vrgx1zxnqj7n1"))))
+                  "0zk0imll6bfyp9p4ndn8h6s4ifijnw5bhixswifr5rnk7pp5l4gm"))))
      (build-system gnu-build-system)
      (arguments
       `(#:parallel-build? #f
@@ -573,7 +567,7 @@ connection alive.")
                                        "/bind-" bind-version ".tar.gz"))
                    (sha256
                     (base32
-                      "1wl9kl0630dc1qjrf7fnp8cscagfm5qgmisi0zhr1p6iwi9bil2y"))))
+                      "0w8qqm6p2y6x57j2l0a3278g173wd84dsr4py9z00191f3wra74q"))))

                ;; When cross-compiling, we need the cross Coreutils and sed.
                ;; Otherwise just use those from %FINAL-INPUTS.
@@ -588,7 +582,8 @@ connection alive.")
       "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)
+      (properties '((cpe-name . "dhcp"))))))

 (define-public libpcap
  (package
@@ -670,7 +665,8 @@ by bandwidth they use.")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/clusterssh/"
-                                  "clusterssh-" version ".tar.gz"))
+                                  "1.%20ClusterSSH%20Series%203/" version
+                                  "/clusterssh-" version ".tar.gz"))
              (sha256
               (base32
                "1bwggpvaj2al5blg1ynapviv2kpydffpzq2zkhi81najnvzc1rr7"))))
@@ -755,18 +751,17 @@ system administrator.")
 (define-public sudo
  (package
    (name "sudo")
-    (version "1.8.15")
+    (version "1.8.17p1")
    (source (origin
              (method url-fetch)
              (uri
-               (list (string-append "http://www.sudo.ws/sudo/dist/sudo-"
+               (list (string-append "https://www.sudo.ws/sudo/dist/sudo-"
                                    version ".tar.gz")
                     (string-append "ftp://ftp.sudo.ws/pub/sudo/OLD/sudo-"
                                    version ".tar.gz")))
              (sha256
               (base32
-                "0263gi6i19fyzzc488n0qw3m518i39f6a7qmrfvahk9j10bkh5j3"))
-              (patches (list (search-patch "sudo-CVE-2015-5602.patch")))))
+                "1k2mn65l1kmsxm8wh0gjxy496xhbpiimbpm6yv6kw6snzc3xg466"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags
@@ -815,7 +810,7 @@ system administrator.")
     `(("groff" ,groff)
       ("linux-pam" ,linux-pam)
       ("coreutils" ,coreutils)))
-    (home-page "http://www.sudo.ws/")
+    (home-page "https://www.sudo.ws/")
    (synopsis "Run commands as root")
    (description
     "Sudo (su \"do\") allows a system administrator to delegate authority to
@@ -840,10 +835,15 @@ commands and their arguments.")
               (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")))))
+               (search-patches "wpa-supplicant-CVE-2015-5310.patch"
+                               "wpa-supplicant-CVE-2015-5314.patch"
+                               "wpa-supplicant-CVE-2015-5315.patch"
+                               "wpa-supplicant-CVE-2015-5316.patch"
+                               "wpa-supplicant-CVE-2016-4476.patch"
+                               "wpa-supplicant-CVE-2016-4477-pt1.patch"
+                               "wpa-supplicant-CVE-2016-4477-pt2.patch"
+                               "wpa-supplicant-CVE-2016-4477-pt3.patch"
+                               "wpa-supplicant-CVE-2016-4477-pt4.patch"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases (alist-replace
@@ -981,18 +981,18 @@ network, which causes enabled computers to power on.")
 (define-public dmidecode
  (package
    (name "dmidecode")
-    (version "2.12")
+    (version "3.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
                    "mirror://savannah/dmidecode/dmidecode-"
-                    version ".tar.bz2"))
+                    version ".tar.xz"))
              (sha256
               (base32
-                "122hgaw8mpqdfra159lfl6pyk3837giqx6vq42j64fjnbl2z6gwi"))))
+                "0iby0xfk5x3cdr0x0gxj5888jjyjhafvaq0l79civ73jjfqmphvy"))))
    (build-system gnu-build-system)
    (arguments
-     '(#:phases (alist-delete 'configure %standard-phases)
+     '(#:phases (modify-phases %standard-phases (delete 'configure))
       #:tests? #f                                ; no 'check' target
       #:make-flags (list (string-append "prefix="
                                         (assoc-ref %outputs "out")))))
@@ -1073,8 +1073,8 @@ system is under heavy load.")
    (version "1.2.0")
    (source (origin
              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/detox/detox-"
-                                  version ".tar.bz2"))
+              (uri (string-append "mirror://sourceforge/detox/detox/" version
+                                  "/detox-" version ".tar.bz2"))
              (sha256
               (base32
                "1y6vvjqsg54kl49cry73jbfhr04s7wjs779vrr9zrq6kww7dkymb"))))
@@ -1100,19 +1100,20 @@ characters can be replaced as well, as can UTF-8 characters.")
 (define-public testdisk
  (package
    (name "testdisk")
-    (version "6.14")
+    (version "7.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "http://www.cgsecurity.org/testdisk-"
                                  version ".tar.bz2"))
              (sha256
               (base32
-                "0v1jap83f5h99zv01v3qmqm160d36n4ysi0gyq7xzb3mqgmw75x5"))))
+                "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0"))))
    (build-system gnu-build-system)
    (inputs
-     `(;; ("ntfs" ,ntfs)
+     `(("ntfs-3g" ,ntfs-3g)
       ("util-linux" ,util-linux)
       ("openssl" ,openssl)
+       ;; FIXME: add reiserfs
       ("zlib" ,zlib)
       ("e2fsprogs" ,e2fsprogs)
       ("libjpeg" ,libjpeg)
@@ -1216,7 +1217,7 @@ various ways that may be running with too much privilege.")
 (define-public smartmontools
  (package
    (name "smartmontools")
-    (version "6.3")
+    (version "6.5")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1224,7 +1225,7 @@ various ways that may be running with too much privilege.")
                    version "/smartmontools-" version ".tar.gz"))
              (sha256
               (base32
-                "06gy71jh2d3gcfmlbbrsqw7215knkfq59q3j6qdxfrar39fhcxx7"))))
+                "1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49"))))
    (build-system gnu-build-system)
    (inputs `(("libcap-ng" ,libcap-ng)))
    (home-page "http://www.smartmontools.org/")
@@ -1306,17 +1307,14 @@ of supported upstream metrics systems simultaneously.")
 (define-public ansible
  (package
    (name "ansible")
-    (version "1.9.2")
+    (version "2.1.0.0")
    (source
     (origin
       (method url-fetch)
-       (uri (string-append
-             "https://pypi.python.org/packages/source/a/ansible/ansible-"
-             version
-             ".tar.gz"))
+       (uri (pypi-uri "ansible" version))
       (sha256
        (base32
-         "007fzgsqaahb0y4gjdxxmir9kcni7wph2z14jhqgpz88idrz8pn2"))))
+         "1bfc2xiplpad6f2nwi48y0kps7xqnsll85dlz63cy8k5bysl6d20"))))
    (build-system python-build-system)
    (native-inputs
     `(("python2-setuptools" ,python2-setuptools)
@@ -1468,20 +1466,20 @@ displays a table of current bandwidth usage by pairs of hosts.")
 (define-public munge
  (package
    (name "munge")
-    (version "0.5.11")
+    (version "0.5.12")
    (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"))
+              (uri (string-append "https://github.com/dun/munge/releases/"
+                                  "download/munge-" version "/munge-"
+                                  version ".tar.xz"))
              (sha256
               (base32
-                "0njplyalwwqh7xr7xc7klc6x06mq0ak8w2pxh85w8n4hxkmqqnf5"))))
+                "1s0vlwgm3hcx75vcmjf2y3icy5nv8y07bx93w2cmm6a7x71y6wp9"))))
    (inputs
     `(("openssl" ,openssl)
       ("libgcrypt" ,libgcrypt)))
    (build-system gnu-build-system)
-    (home-page "http://dun.github.io/munge/")
+    (home-page "https://dun.github.io/munge/")
    (synopsis "Cluster computing authentication service")
    (description
     "Munge is an authentication service for creating and validating
@@ -1529,3 +1527,174 @@ 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+)))
+
+(define-public nmap
+  (package
+    (name "nmap")
+    (version "7.12")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://nmap.org/dist/nmap-" version
+                                  ".tar.bz2"))
+              (sha256
+               (base32
+                "014vagh9ak10hidwzp9s6g30y5h5fhsh8wykcnc1hnn9hwm0ipv3"))
+              (modules '((guix build utils)))
+              (snippet
+               '(map delete-file-recursively
+                 ;; Remove bundled lua, pcap, and pcre libraries.
+                 ;; FIXME: Remove bundled liblinear once packaged.
+                 '("liblua"
+                   "libpcap"
+                   "libpcre"
+                   ;; Remove pre-compiled binares.
+                   "mswin32")))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("openssl" ,openssl)
+       ("libpcap" ,libpcap)
+       ("pcre" ,pcre)
+       ("lua" ,lua)
+       ;; For 'ndiff'.
+       ("python" ,python-2)))
+
+    ;; TODO Add zenmap output.
+    (outputs '("out" "ndiff"))
+    (arguments
+     '(#:configure-flags '("--without-zenmap")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (define (make out . args)
+               (unless (zero? (apply system* "make"
+                                     (string-append "prefix=" out)
+                                     args))
+                 (error "make failed")))
+             (define (python-path dir)
+               (string-append dir "/lib/python2.7/site-packages"))
+             (let ((out (assoc-ref outputs "out"))
+                   (ndiff (assoc-ref outputs "ndiff")))
+               (for-each mkdir-p (list out ndiff))
+               (make out
+                 "install-nmap"
+                 "install-nse"
+                 "install-ncat"
+                 "install-nping")
+               (make ndiff "install-ndiff")
+               (wrap-program (string-append ndiff "/bin/ndiff")
+                 `("PYTHONPATH" prefix
+                   (,(python-path ndiff)))))))
+         ;; These are the tests that do not require network access.
+         (replace 'check
+           (lambda _ (zero? (system* "make"
+                                     "check-nse"
+                                     "check-ndiff"
+                                     "check-dns")))))
+       ;; Nmap can't cope with out-of-source building.
+       #:out-of-source? #f))
+    (home-page "https://nmap.org/")
+    (synopsis "Network discovery and security auditing tool")
+    (description
+     "Nmap (\"Network Mapper\") is a network discovery and security auditing
+tool.  It is also useful for tasks such as network inventory, managing service
+upgrade schedules, and monitoring host or service uptime.  It also provides an
+advanced netcat implementation (ncat), a utility for comparing scan
+results (ndiff), and a packet generation and response analysis tool (nping).")
+    ;; This package uses nmap's bundled versions of libdnet and liblinear, which
+    ;; both use a 3-clause BSD license.
+    (license (list license:nmap license:bsd-3))))
+
+(define-public dstat
+  (package
+    (name "dstat")
+    (version "0.7.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/dagwieers/dstat/archive/"
+                    version ".tar.gz"))
+              (file-name (string-append "dstat-" version ".tar.gz"))
+              (sha256
+               (base32
+                "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ;; no make check
+       #:make-flags (let ((out (assoc-ref %outputs "out")))
+                      (list (string-append "DESTDIR=" out)
+                            "prefix=/"))
+       ;; no configure script
+       #:phases (alist-delete 'configure %standard-phases)))
+    (inputs `(("python-2" ,python-2)))
+    (synopsis "Versatile resource statistics tool")
+    (description "Dstat is a versatile replacement for @command{vmstat},
+@command{iostat}, @command{netstat}, and @command{ifstat}.  Dstat overcomes
+some of their limitations and adds some extra features, more counters and
+flexibility.  Dstat is handy for monitoring systems during performance tuning
+tests, benchmarks or troubleshooting.
+
+Dstat allows you to view all of your system resources in real-time, you can,
+e.g., compare disk utilization in combination with interrupts from your IDE
+controller, or compare the network bandwidth numbers directly with the disk
+throughput (in the same interval).")
+    (home-page "http://dag.wiee.rs/home-made/dstat/")
+    (license license:gpl2+)))
+
+(define-public thefuck
+  (package
+    (name "thefuck")
+    (version "3.9")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/nvbn/thefuck/archive/"
+                                  version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0g4s2vkpl0mqhkdkbzib07qr4xf0cq25fvhdhna52290qgd69pwf"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (inputs
+     `(("python-colorama" ,python-colorama)
+       ("python-decorator" ,python-decorator)
+       ("python-psutil" ,python-psutil)
+       ("python-six" ,python-six)))
+    (home-page "https://github.com/nvbn/thefuck")
+    (synopsis "Correct mistyped console command")
+    (description
+     "The Fuck tries to match a rule for a previous, mistyped command, creates
+a new command using the matched rule, and runs it.")
+    (license license:x11)))
+
+(define-public di
+  (package
+    (name "di")
+    (version "4.42")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://gentoo.com/di/di-" version ".tar.gz"))
+       (sha256
+        (base32 "1i6m9zdnidn8268q1lz9fd8payk7s4pgwh5zlam9rr4dy6h6a67n"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; Obscure test failures.
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-before 'build 'setup-environment
+           (lambda* (#:key outputs #:allow-other-keys)
+             (setenv "CC" "gcc")
+             (setenv "prefix" (assoc-ref outputs "out"))
+             #t)))
+       #:make-flags (list "--environment-overrides")))
+    (home-page "https://www.gentoo.com/di/")
+    (synopsis "Advanced df like disk information utility")
+    (description
+     "'di' is a disk information utility, displaying everything
+(and more) that your @code{df} command does.  It features the ability to
+display your disk usage in whatever format you prefer.  It is designed to be
+highly portable.  Great for heterogenous networks.")
+    (license license:zlib)))
@@ -1,7 +1,9 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,13 +22,23 @@

 (define-module (gnu packages algebra)
  #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
  #:use-module (gnu packages compression)
+  #:use-module (gnu packages documentation)
+  #:use-module (gnu packages fltk)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages image)
  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages maths)
  #:use-module (gnu packages mpi)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages readline)
  #:use-module (gnu packages flex)
-  #:use-module (gnu packages texlive)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages tcsh)
+  #:use-module (gnu packages tex)
+  #:use-module (gnu packages xiph)
  #:use-module (gnu packages xorg)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
@@ -116,7 +128,7 @@ solve the shortest vector problem.")
 (define-public pari-gp
  (package
   (name "pari-gp")
-   (version "2.7.5")
+   (version "2.7.6")
   (source (origin
            (method url-fetch)
            (uri (string-append
@@ -124,7 +136,7 @@ solve the shortest vector problem.")
                  version ".tar.gz"))
            (sha256
              (base32
-                "0c8l83a0gjq73r9hndsrzkypwxvnnm4pxkkzbg6jm95m80nzwh11"))))
+                "04dqi697czd8mmw8aiwzrkgbvkjassqagg6lfy3lkf1k5qi9g9rr"))))
   (build-system gnu-build-system)
   (native-inputs `(("texlive" ,texlive-minimal)))
   (inputs `(("gmp" ,gmp)
@@ -187,6 +199,68 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
   (license license:gpl2)
   (home-page "http://pari.math.u-bordeaux.fr/")))

+(define-public giac-xcas
+  (package
+    (name "giac-xcas")
+    (version "1.2.2-75")
+    (source (origin
+              (method url-fetch)
+              ;; "~parisse/giac" is not used because the maintainer regularly
+              ;; overwrites the release tarball there, introducing a checksum
+              ;; mismatch every time.  See
+              ;; <https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/README>
+              (uri (string-append "https://www-fourier.ujf-grenoble.fr/"
+                                  "~parisse/debian/dists/stable/main/"
+                                  "source/giac_" version ".tar.gz"))
+              (sha256
+               (base32
+                "0vs111fkd900wkm7yypaxmplc8i8j63d9shc3fbdhddn7cdj70b1"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-bin-cp
+           (lambda _
+             ;; Some Makefiles contain hard-coded "/bin/cp".
+             (substitute* (find-files "doc" "^Makefile")
+               (("/bin/cp") (which "cp")))
+             #t))
+         (add-after 'unpack 'disable-broken-test
+           (lambda _
+             ;; Disable failing test.  Actually, the results are correct but
+             ;; a sorting discrepancy prevents the test from being validated.
+             (substitute* "check/Makefile.in"
+               (("chk_fhan16") ""))
+             #t)))))
+    (inputs
+     `(("fltk" ,fltk)
+       ("gmp" ,gmp)
+       ("gsl" ,gsl)
+       ("lapack" ,lapack)
+       ("libao" ,ao)
+       ("libjpeg" ,libjpeg)
+       ("libpng" ,libpng)
+       ("libx11" ,libx11)
+       ("libxinerama" ,libxinerama)
+       ("libxft" ,libxft)
+       ("libxt" ,libxt)
+       ("mesa" ,mesa)
+       ("mpfi" ,mpfi)
+       ("mpfr" ,mpfr)
+       ("ntl" ,ntl)
+       ("perl" ,perl)
+       ("pari-gp" ,pari-gp)
+       ("tcsh" ,tcsh)
+       ("texlive" ,texlive-minimal)))
+    (native-inputs `(("readline" ,readline)))
+    (home-page "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html")
+    (synopsis "Computer algebra system")
+    (description
+     "Giac/Xcas is a computer algebra system.  It has a compatibility mode for
+maple, mupad and the TI89.  It is available as a standalone program (graphic
+or text interfaces) or as a C++ library.")
+    (license license:gpl3+)))
+
 (define-public flint
  (package
   (name "flint")
@@ -198,7 +272,7 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
                  version ".tar.gz"))
            (sha256 (base32
                     "11syazv1a8rrnac3wj3hnyhhflpqcmq02q8pqk2m6g2k6h0gxwfb"))
-            (patches (map search-patch '("flint-ldconfig.patch")))))
+            (patches (search-patches "flint-ldconfig.patch"))))
   (build-system gnu-build-system)
   (propagated-inputs
    `(("gmp" ,gmp)
@@ -247,7 +321,7 @@ fast arithmetic.")
            (sha256
              (base32
                "04hhcpshfkcq9fr4hixbhpps50yf9drk62xgkvlcaj5kb4nyrx7l"))
-            (patches (map search-patch '("arb-ldconfig.patch")))))
+            (patches (search-patches "arb-ldconfig.patch"))))
   (build-system gnu-build-system)
   (propagated-inputs
    `(("flint" ,flint))) ; flint.h is included by arf.h
@@ -281,6 +355,116 @@ real and complex numbers, with automatic, rigorous error control.")
   (license license:gpl2+)
   (home-page "http://fredrikj.net/arb/")))

+(define-public ntl
+  (package
+   (name "ntl")
+   (version "9.7.0")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "http://shoup.net/ntl/ntl-"
+                                version ".tar.gz"))
+            (sha256 (base32
+                     "115frp5flyvw9wghz4zph1b3llmr5nbxk1skgsggckr81fh3gmxq"))))
+   (build-system gnu-build-system)
+   (native-inputs
+    `(("libtool" ,libtool)
+      ("perl" ,perl))) ; for configuration
+   ;; FIXME: Add optional input gf2x once available; then also add
+   ;; configure flag "NTL_GF2X_LIB=on".
+   (inputs
+    `(("gmp" ,gmp)))
+   (arguments
+    `(#:phases
+      (modify-phases %standard-phases
+        (replace 'configure
+         (lambda* (#:key outputs #:allow-other-keys)
+           (chdir "src")
+           (system* "./configure"
+                    (string-append "PREFIX=" (assoc-ref outputs "out"))
+                    ;; Do not build especially for the build machine.
+                    "NATIVE=off"
+                    ;; Also do not tune to the build machine.
+                    "WIZARD=off"
+                    "SHARED=on")
+           #t)))))
+   (synopsis "C++ library for number theory")
+   (description
+    "NTL is a C++ library providing data structures and algorithms
+for manipulating signed, arbitrary length integers, and for vectors,
+matrices, and polynomials over the integers and over finite fields.")
+   (license license:gpl2+)
+   (home-page "http://shoup.net/ntl/")))
+
+(define-public singular
+  (package
+   (name "singular")
+   (version "4.0.3")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "http://www.mathematik.uni-kl.de/ftp/pub/"
+                                "Math/Singular/SOURCES/"
+                                (string-join (string-split version #\.) "-")
+                                "/singular-" version ".tar.gz"))
+            (sha256 (base32
+                     "0viidy2fz62rln9p0s9qfs7fnm55c6fw1agydd1py26gxylp1ksc"))))
+   (build-system gnu-build-system)
+   (native-inputs
+    `(("doxygen" ,doxygen)
+      ("graphviz" ,graphviz)
+      ("perl" ,perl)))
+   (inputs
+    `(("cddlib" ,cddlib)
+      ("gmp" ,gmp)
+      ("flint" ,flint)
+      ("mpfr" ,mpfr)
+      ("ntl" ,ntl)
+      ("python" ,python-2)
+      ("readline" ,readline)))
+   (arguments
+    `(#:configure-flags
+      (list (string-append "--with-ntl="
+                           (assoc-ref %build-inputs "ntl")))))
+   (synopsis "Computer algebra system for polynomial computations")
+   (description
+    "Singular is a computer algebra system for polynomial computations,
+with special emphasis on commutative and non-commutative algebra, algebraic
+geometry and singularity theory.")
+   ;; Singular itself is dual licensed gpl2 or gpl3, but some of the
+   ;; libraries with which it links are licensed under lgpl3+, so the
+   ;; combined work becomes gpl3. See COPYING in the source code.
+   (license license:gpl3)
+   (home-page "http://www.singular.uni-kl.de/index.php")))
+
+(define-public gmp-ecm
+  (package
+   (name "gmp-ecm")
+   (version "7.0")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "https://gforge.inria.fr/frs/download.php/"
+                                "file/35642/ecm-"
+                                version ".tar.gz"))
+            (sha256 (base32
+                     "00jzzwqp49m01vwsr9z1w7bvm8lb69l3f62x7qr8sfz0xiczxnpm"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(("gmp" ,gmp)))
+   (arguments
+    `(#:configure-flags '("--enable-shared"
+                          ;; Disable specific assembly routines, which depend
+                          ;; on the subarchitecture of the build machine,
+                          ;; and use gmp instead.
+                          "--disable-asm-redc")))
+   (synopsis "Integer factorization library using the elliptic curve method")
+   (description
+    "GMP-ECM factors integers using the elliptic curve method (ECM) as well
+as the P-1 and P+1 algorithms.  It provides a library and a stand-alone
+binary.")
+   ;; Most files are under lgpl3+, but some are under gpl3+ or gpl2+,
+   ;; so the combined work is under gpl3+.
+   (license license:gpl3+)
+   (home-page "http://ecm.gforge.inria.fr/")))
+
 (define-public bc
  (package
    (name "bc")
@@ -383,14 +567,14 @@ cosine/ sine transforms or DCT/DST).")
 (define-public eigen
  (package
    (name "eigen")
-    (version "3.2.7")
+    (version "3.2.8")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://bitbucket.org/eigen/eigen/get/"
                                  version ".tar.bz2"))
              (sha256
               (base32
-                "0gigbjjdlw2q0gvcnyiwc6in314a647rkidk6977bwiwn88im3p5"))
+                "0mby6my1djsg8681fcvlaq0i4kd17fja9qn5f713j3xpfbb66akj"))
              (file-name (string-append name "-" version ".tar.bz2"))
              (modules '((guix build utils)))
              (snippet
@@ -68,7 +68,7 @@ C++ @dfn{Standard Template Library} (STL).")
              (sha256
               (base32
                "1d3z2r78j3rkff47q3wl0ami69y3l4nyi5r9zclymb8ar7mgkk9l"))
-              (patches (list (search-patch "synfig-build-fix.patch")))))
+              (patches (search-patches "synfig-build-fix.patch"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags
@@ -0,0 +1,64 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Chris Marusich <cmmarusich@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 GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages anthy)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public anthy
+  (package
+    (name "anthy")
+    (version "9100h")
+    (source (origin
+              (method url-fetch)
+              ;; The URI does not appear to be easily guessable.  For
+              ;; example, you cannot download version "9100g" simply
+              ;; by replacing "9100h" in the URI.
+              (uri "http://tcpdiag.dl.osdn.jp/anthy/37536/anthy-9100h.tar.gz")
+              (sha256
+               (base32
+                "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"))))
+    (build-system gnu-build-system)
+    ;; Anthy also contains elisp modules for using anthy within Emacs.
+    ;; However, these modules are incompatible with the latest version
+    ;; of Emacs.  This is because they rely on the presence of
+    ;; last-command-char, which was removed in Emacs 24.3.  So, we
+    ;; don't try to install them here at this time.
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (with-directory-excursion "test"
+               (zero? (system* "./anthy" "--all"))))))))
+    (home-page "http://anthy.osdn.jp/")
+    (synopsis "Japanese input method")
+    (description "Anthy is a Japanese input method for converting
+hiragana text to mixed kana and kanji.  It is written in the C
+programming language.  Anthy stores personal customizations (words it
+has learned from the user's input, words the user has explicitly
+added, etc.) in the ~/.anthy/ directory.  This package contains the
+anthy C libraries, the cannadic and alt-cannadic kana dictionaries, as
+well as command-line tools for using anthy and managing
+dictionaries.")
+    ;; Most of anthy is lgpl2.1+.  However, some files (e.g., from
+    ;; alt-cannadic) use gpl2.  See the file "COPYING" in the anthy
+    ;; source for details.
+    (license (list lgpl2.1+ gpl2))))
@@ -39,7 +39,7 @@
              (base32
               "0ypn51xblix5ys9xy7da3ngdydip0qqh9rdq8nz54w9aq8lys0vx"))
             (patches
-              (list (search-patch "apr-skip-getservbyname-test.patch")))
+              (search-patches "apr-skip-getservbyname-test.patch"))
             (patch-flags '("-p0"))))
    (build-system gnu-build-system)
    (arguments
@@ -1,52 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 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/>.
-
-(define-module (gnu packages asciidoc)
-  #:use-module (guix licenses)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (gnu packages python)
-  #:use-module (guix build-system gnu)
-  #:autoload   (gnu packages zip) (unzip))
-
-(define-public asciidoc
-  (package
-    (name "asciidoc")
-    (version "8.6.9")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/asciidoc/asciidoc-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq"))))
-    (build-system gnu-build-system)
-    (arguments '(#:tests? #f))                    ; no 'check' target
-    (inputs `(("python" ,python-2)))
-    (home-page "http://www.methods.co.nz/asciidoc/")
-    (synopsis "Text-based document generation system")
-    (description
-     "AsciiDoc is a text document format for writing notes, documentation,
-articles, books, ebooks, slideshows, web pages, man pages and blogs.
-AsciiDoc files can be translated to many formats including HTML, PDF,
-EPUB, man page.
-
-AsciiDoc is highly configurable: both the AsciiDoc source file syntax and
-the backend output markups (which can be almost any type of SGML/XML
-markup) can be customized and extended by the user.")
-    (license gpl2+)))
@@ -0,0 +1,114 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;;
+;;; 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 assembly)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xml))
+
+(define-public nasm
+  (package
+    (name "nasm")
+    (version "2.12.01")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.nasm.us/pub/nasm/releasebuilds/"
+                                  version "/" name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "12bl6vc5sjp9nnhf0iwy6l27vq783y0rxrjpp8sy84h5cb7a3fwx"))
+              (patches (search-patches "nasm-no-ps-pdf.patch"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("perl" ,perl)  ;for doc and test target
+                     ("texinfo" ,texinfo)))
+    (arguments
+     `(#:test-target "test"
+       #:phases (modify-phases %standard-phases
+                  (add-after 'install 'install-info
+                    (lambda _
+                      (zero? (system* "make" "install_doc")))))))
+    (home-page "http://www.nasm.us/")
+    (synopsis "80x86 and x86-64 assembler")
+    (description
+     "NASM, the Netwide Assembler, is an 80x86 and x86-64 assembler designed
+for portability and modularity.  It supports a range of object file formats,
+including Linux and *BSD a.out, ELF, COFF, Mach-O, Microsoft 16-bit OBJ,
+Windows32 and Windows64.  It will also output plain binary files.  Its syntax
+is designed to be simple and easy to understand, similar to Intel's but less
+complex.  It supports all currently known x86 architectural extensions, and
+has strong support for macros.")
+    (supported-systems '("x86_64-linux" "i686-linux"))
+    (license license:bsd-3)))
+
+(define-public yasm
+  (package
+    (name "yasm")
+    (version "1.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://www.tortall.net/projects/yasm/releases/yasm-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("python" ,python-wrapper)
+       ("xmlto" ,xmlto)))
+    (home-page "http://yasm.tortall.net/")
+    (synopsis "Rewrite of the NASM assembler")
+    (description
+     "Yasm is a complete rewrite of the NASM assembler.
+
+Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM
+and GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit
+Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, and generates source
+debugging information in STABS, DWARF 2, and CodeView 8 formats.")
+    (license (license:non-copyleft "file://COPYING"
+                                   "See COPYING in the distribution."))))
+
+(define-public lightning
+  (package
+    (name "lightning")
+    (version "2.1.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/lightning/lightning-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz"))))
+    (build-system gnu-build-system)
+    (synopsis "Library for generating assembly code at runtime")
+    (description
+     "GNU Lightning is a library that generates assembly language code at
+run-time.  Thus, it is useful in creating Just-In-Time compilers.  It
+abstracts over the target CPU by exposing a standardized RISC instruction set
+to the clients.")
+    (home-page "http://www.gnu.org/software/lightning/")
+    (license license:gpl3+)))
@@ -42,12 +42,11 @@
    (source
     (origin
       (method url-fetch)
-       (uri
-        (string-append
-         "mirror://sourceforge/audacity/audacity-minsrc-" version ".tar.xz"))
+       (uri (string-append "mirror://sourceforge/audacity/audacity/" version
+                           "/audacity-minsrc-" version ".tar.xz"))
       (sha256
        (base32 "1cs2w3fwqylpqmfwkvlgdx5lhclpckfil7pqibl37qlbnf4qvndh"))
-       (patches (list (search-patch "audacity-fix-ffmpeg-binding.patch")))))
+       (patches (search-patches "audacity-fix-ffmpeg-binding.patch"))))
    (build-system gnu-build-system)
    (inputs
     ;; TODO: Add portSMF and libwidgetextra once they're packaged.  In-tree
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -74,8 +75,8 @@
    (version "2.1.2")
    (source (origin
              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/alsamodular/ams-"
-                                  version ".tar.bz2"))
+              (uri (string-append "mirror://sourceforge/alsamodular/alsamodular"
+                                  "/" version "/ams-" version ".tar.bz2"))
              (sha256
               (base32
                "1azbrhpfk4nnybr7kgmc7w6al6xnzppg853vas8gmkh185kk11l0"))))
@@ -100,7 +101,8 @@
       ("jack" ,jack-1)
       ("ladspa" ,ladspa)
       ("liblo" ,liblo)
-       ("qt" ,qt)))
+       ("qtbase" ,qtbase)
+       ("qttools" ,qttools)))
    (native-inputs
     `(("pkg-config" ,pkg-config)))
    (home-page "http://alsamodular.sourceforge.net/")
@@ -333,7 +335,7 @@ tools (analyzer, mono/stereo tools, crossovers).")
              (sha256
               (base32
                "0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd"))
-              (patches (list (search-patch "csound-header-ordering.patch")))))
+              (patches (search-patches "csound-header-ordering.patch"))))
    (build-system cmake-build-system)
    (arguments
     ;; Work around this error on x86_64 with libc 2.22+:
@@ -764,8 +766,8 @@ also play midifiles using a Soundfont.")
    (version "2.7")
    (source (origin
              (method url-fetch)
-              (uri (string-append
-                    "mirror://sourceforge/faac/faad2-" version ".zip"))
+              (uri (string-append "mirror://sourceforge/faac/faad2-src/faad2-"
+                                  version "/faad2-" version ".zip"))
              (sha256
               (base32
                "16f3l16c00sg0wkrkm3vzv0gy3g97x309vw788igs0cap2x1ak3z"))))
@@ -862,15 +864,15 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
 (define-public guitarix
  (package
    (name "guitarix")
-    (version "0.34.0")
+    (version "0.35.0")
    (source (origin
             (method url-fetch)
             (uri (string-append
-                   "mirror://sourceforge/guitarix/guitarix2-"
-                   version ".tar.bz2"))
+                   "mirror://sourceforge/guitarix/guitarix/guitarix2-"
+                   version ".tar.xz"))
             (sha256
              (base32
-               "0pamaq8iybsaglq6y1m1rlmz4wgbs2r6m24bj7x4fwg4grjvzjl8"))))
+               "10hijqrrl8xil46kgsac10ysfxysisxlibm2rz133zyig5n63jdw"))))
    (build-system waf-build-system)
    (arguments
     `(#:tests? #f ; no "check" target
@@ -1228,8 +1230,8 @@ connections between them.")
    (version "3.1.0")
    (source (origin
              (method url-fetch)
-              (uri (string-append
-                    "mirror://sourceforge/bs2b/libbs2b-" version ".tar.lzma"))
+              (uri (string-append "mirror://sourceforge/bs2b/libbs2b/" version
+                                  "/libbs2b-" version ".tar.lzma"))
              (sha256
               (base32
                "1mcc4gjkmphczjybnsrip3gq1f974knzys7x49bv197xk3fn8wdr"))))
@@ -1251,10 +1253,8 @@ essential distortions.")
    (version "0.28")
    (source (origin
             (method url-fetch)
-             (uri (string-append
-                   "mirror://sourceforge/liblo/liblo-"
-                   version
-                   ".tar.gz"))
+             (uri (string-append "mirror://sourceforge/liblo/liblo/" version
+                                 "/liblo-" version ".tar.gz"))
             (sha256
              (base32
               "02drgnpirvl2ihvzgsmn02agr5sj3vipzzw9vma56qlkgfvak56s"))))
@@ -1707,9 +1707,9 @@ Suil currently supports every combination of Gtk 2, Qt 4, and X11.")
    (version "2.14.0")
    (source (origin
              (method url-fetch)
-              (uri (string-append
-                    "mirror://sourceforge/timidity/TiMidity++-"
-                    version ".tar.bz2"))
+              (uri (string-append "mirror://sourceforge/timidity/TiMidity++"
+                                  "/TiMidity++-" version
+                                  "/TiMidity++-" version ".tar.bz2"))
              (sha256
               (base32
                "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr"))))
@@ -1869,7 +1869,7 @@ encode and decode wavpack files.")
    (source (origin
              (method url-fetch)
              (uri (string-append
-                    "mirror://sourceforge/project/modplug-xmms/"
+                    "mirror://sourceforge/modplug-xmms/"
                    name "/" version "/" name "-" version ".tar.gz"))
              (sha256
               (base32
@@ -1890,7 +1890,7 @@ surround and reverb.")
    (version "4.3.10")
    (source (origin
              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/xmp/libxmp/"
+              (uri (string-append "mirror://sourceforge/xmp/libxmp/" version "/"
                                  name "-" version ".tar.gz"))
              (sha256
               (base32
@@ -1910,7 +1910,7 @@ Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).")
    (version "4.0.10")
    (source (origin
              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/xmp/xmp/"
+              (uri (string-append "mirror://sourceforge/xmp/xmp/" version "/"
                                  name "-" version ".tar.gz"))
              (sha256
               (base32
@@ -1970,8 +1970,8 @@ control functionality, or just for playing around with the sound effects.")
    (version "14.4.2")
    (source (origin
              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/sox/sox-"
-                                  version ".tar.bz2"))
+              (uri (string-append "mirror://sourceforge/sox/sox/" version "/"
+                                  name "-" version ".tar.bz2"))
              (sha256
               (base32
                "170lx90r1nlnb2j6lg00524iwvqy72p48vii4xc5prrh8dnrb9l1"))))
@@ -2033,8 +2033,8 @@ conversion.  It may be used, for example, to resample PCM-encoded audio.")
    (source
     (origin
       (method url-fetch)
-       (uri (string-append
-             "mirror://sourceforge/twolame/twolame-" version ".tar.gz"))
+       (uri (string-append "mirror://sourceforge/twolame/twolame/" version
+                           "/twolame-" version ".tar.gz"))
       (sha256
        (base32 "0ahiqqng5pidwhj1wzph4vxxgxxgcfa3gl0gywipzx2ii7s35wwq"))))
    (build-system gnu-build-system)
@@ -2064,7 +2064,7 @@ portions of LAME.")
             ".tgz"))
       (sha256
        (base32 "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"))
-       (patches (list (search-patch "portaudio-audacity-compat.patch")))))
+       (patches (search-patches "portaudio-audacity-compat.patch"))))
    (build-system gnu-build-system)
    (inputs
     ;; TODO: Add ASIHPI.
@@ -2096,14 +2096,14 @@ interface.")
 (define-public qsynth
  (package
    (name "qsynth")
-    (version "0.4.0")
+    (version "0.4.1")
    (source
     (origin
       (method url-fetch)
-       (uri (string-append
-             "mirror://sourceforge/qsynth/qsynth-" version ".tar.gz"))
+       (uri (string-append "mirror://sourceforge/qsynth/qsynth/" version
+                           "/qsynth-" version ".tar.gz"))
       (sha256
-        (base32 "1chc89v9hcjw3k4rvzakl8g56wv24kh48fzv1gfs4iv8vhyl3j4x"))))
+        (base32 "034p6mbwrjnxd9b6h20cidxi4ilkk3cgpjp154j0jzjs1ipf7x2h"))))
    (build-system gnu-build-system)
    (arguments
     `(#:tests? #f)) ; no "check" phase
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013,2014 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2013, 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,31 +31,31 @@
 (define-public autogen
  (package
    (name "autogen")
-    (version "5.18.7")
+    (version "5.18.10")
    (source
     (origin
      (method url-fetch)
-      (uri (string-append "mirror://gnu/autogen"
+      (uri (string-append "mirror://gnu/autogen/rel" version
                          "/autogen-" version ".tar.xz"))
      (sha256
       (base32
-        "01d4m8ckww12sy50vgyxlnz83z9dxqpyqp153cscncc9w6jq19d7"))))
+        "0j61mf3qab5ya7w5xsp7xalrby00cv92g462bxffl104ql18w92f"))))
    (build-system gnu-build-system)
    (native-inputs `(("perl" ,perl)     ;for doc generator mdoc
                     ("pkg-config" ,pkg-config)))
    (inputs `(("which" ,which)
              ("guile" ,guile-2.0)))
    (arguments
-     '(#:phases (alist-cons-before
-                 'patch-source-shebangs 'patch-test-scripts
-                 (lambda _
-                   (let ((sh (which "sh")))
-                     (substitute*
-                         (append (find-files "agen5/test" "\\.test$")
-                                 (find-files "autoopts/test" "\\.(test|in)$"))
-                       (("/bin/sh") sh)
-                       (("/usr/bin/tr") "tr"))))
-                 %standard-phases)))
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'patch-source-shebangs 'patch-test-scripts
+           (lambda _
+             (let ((sh (which "sh")))
+               (substitute*
+                 (append (find-files "agen5/test" "\\.test$")
+                         (find-files "autoopts/test" "\\.(test|in)$"))
+                 (("/bin/sh") sh)
+                 (("/usr/bin/tr") "tr"))))))))
    (home-page "http://www.gnu.org/software/autogen/")
    (synopsis "Automated program generator")
    (description
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
 ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 David Thompson <davet@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -159,6 +160,27 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
                port)))
           (chmod (string-append bin "/autoconf") #o555)))))))

+(define-public autoconf-archive
+  (package
+    (name "autoconf-archive")
+    (version "2016.03.20")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/autoconf-archive/autoconf-archive-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "0dz4fnc723jqn3by22ds5fys7g31apzm1r9allldvva0yvzjxyw8"))))
+    (build-system gnu-build-system)
+    (home-page "https://www.gnu.org/software/autoconf-archive")
+    (synopsis "Collection of freely reusable Autoconf macros")
+    (description
+     "Autoconf Archive is a collection of over 450 new macros for Autoconf,
+greatly expanding the domain of its functionality.  These macros have been
+contributed as free software by the community.")
+    (license gpl3+)))
+
 (define-public autobuild
  (package
    (name "autobuild")
@@ -195,9 +217,9 @@ output is indexed in many ways to simplify browsing.")
              (base32
               "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r"))
             (patches
-              (map search-patch
-                   '("automake-regexp-syntax.patch"
-                     "automake-skip-amhello-tests.patch")))))
+              (search-patches "automake-regexp-syntax.patch"
+                              "automake-skip-amhello-tests.patch"
+                              "automake-test-gzip-warning.patch"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("autoconf" ,(autoconf-wrapper))
@@ -273,8 +295,7 @@ Makefile, simplifying the entire process for the developer.")
              (sha256
               (base32
                "0vxj52zm709125gwv9qqlw02silj8bnjnh4y07arrz60r31ai1vw"))
-              (patches
-               (list (search-patch "libtool-skip-tests2.patch")))))
+              (patches (search-patches "libtool-skip-tests2.patch"))))
    (build-system gnu-build-system)
    (propagated-inputs `(("m4" ,m4)))
    (native-inputs `(("m4" ,m4)
@@ -41,7 +41,7 @@
             (sha256
              (base32
               "0j5b5ld6bjyh3qhd2nw0jb84znq0wqai7fsrdzg7bpg24jdp2wl3"))
-             (patches (list (search-patch "avahi-localstatedir.patch")))))
+             (patches (search-patches "avahi-localstatedir.patch"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags '("--with-distro=none"
@@ -1,6 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
+;;; Copyright © 2014, 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 David Thompson <davet@gnu.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,52 +21,128 @@

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

+(define-public avr-binutils
+  (package
+    (inherit (cross-binutils "avr"))
+    (name "avr-binutils")))
+
+(define-public avr-gcc-4.9
+  (let ((xgcc (cross-gcc "avr" avr-binutils)))
+    (package
+      (inherit xgcc)
+      (name "avr-gcc")
+      (arguments
+       (substitute-keyword-arguments (package-arguments xgcc)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             ;; Without a working multilib build, the resulting GCC lacks
+             ;; support for nearly every AVR chip.
+             (add-after 'unpack 'fix-genmultilib
+               (lambda _
+                 ;; patch-shebang doesn't work here because there are actually
+                 ;; several scripts inside this script, each with a #!/bin/sh
+                 ;; that needs patching.
+                 (substitute* "gcc/genmultilib"
+                   (("#!/bin/sh") (string-append "#!" (which "sh"))))
+                 #t))))
+         ((#:configure-flags flags)
+          `(delete "--disable-multilib" ,flags))))
+      (native-search-paths
+       (list (search-path-specification
+              (variable "CROSS_CPATH")
+              (files '("avr/include")))
+             (search-path-specification
+              (variable "CROSS_LIBRARY_PATH")
+              (files '("avr/lib"))))))))
+
+(define-public avr-gcc-5
+  (package
+    (inherit avr-gcc-4.9)
+    (version (package-version gcc-5))
+    (source (package-source gcc-5))))
+
 (define-public avr-libc
  (package
    (name "avr-libc")
-    (version "1.8.1")
+    (version "2.0.0")
    (source (origin
              (method url-fetch)
-              (uri (string-append
-                    "mirror://savannah//avr-libc/avr-libc-"
-                    version ".tar.bz2"))
+              (uri (string-append "mirror://savannah//avr-libc/avr-libc-"
+                                  version ".tar.bz2"))
              (sha256
               (base32
-                "0sd9qkvhmk9av4g1f8dsjwc309hf1g0731bhvicnjb3b3d42l1n3"))))
+                "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj"))))
    (build-system gnu-build-system)
    (arguments
-     `(#:out-of-source? #t
-       #:configure-flags '("--host=avr")))
-
-    (native-inputs `(("cross-binutils" ,(cross-binutils "avr"))
-                     ("cross-gcc" ,xgcc-avr)))
+     '(#:out-of-source? #t
+       #:configure-flags '("--host=avr")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'unpack 'fix-cpath
+           (lambda _
+             ;; C_INCLUDE_PATH poses issues for cross-building, leading to
+             ;; failures when building avr-libc on 64-bit systems.  Simply
+             ;; unsetting it allows the build to succeed because it doesn't
+             ;; try to use any of the native system's headers.
+             (unsetenv "C_INCLUDE_PATH")
+             #t)))))
+    (native-inputs `(("avr-binutils" ,avr-binutils)
+                     ("avr-gcc" ,avr-gcc-4.9)))
    (home-page "http://www.nongnu.org/avr-libc/")
    (synopsis "The AVR C Library")
    (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"))))
+    (license
+     (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt"))))
+
+(define (avr-toolchain avr-gcc)
+  (package
+    (name "avr-toolchain")
+    (version (package-version avr-gcc))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments '(#:builder (mkdir %output)))
+    (propagated-inputs
+     `(("avrdude" ,avrdude)
+       ("binutils" ,avr-binutils)
+       ("gcc" ,avr-gcc)
+       ("libc" ,avr-libc)))
+    (synopsis "Complete GCC tool chain for AVR microcontroller development")
+    (description "This package provides a complete GCC tool chain for AVR
+microcontroller development.  This includes the GCC AVR cross compiler and
+avrdude for firmware flashing.  The supported programming languages are C and
+C++.")
+    (home-page (package-home-page avr-libc))
+    (license (package-license avr-gcc))))
+
+(define-public avr-toolchain-4.9 (avr-toolchain avr-gcc-4.9))
+(define-public avr-toolchain-5 (avr-toolchain avr-gcc-5))

 (define-public microscheme
  (package
    (name "microscheme")
-    (version "0.9.2")
+    (version "0.9.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/ryansuchocki/"
-                                  "microscheme/archive/v" version ".zip"))
+                                  "microscheme/archive/v" version ".tar.gz"))
              (sha256
               (base32
-                "0cmp1c6ilcib4w9ysqghav310g8jsq9gdfpfa9sd23wgl7mlncxf"))
-              (file-name (string-append name "-" version ".zip"))))
+                "1n404mh7z2icy3ga1mx249lk9x091k7idj6xpcf20hnmzabd0k0x"))
+              (file-name (string-append name "-" version ".tar.gz"))))
    (build-system gnu-build-system)
    (arguments
     `(#:parallel-build? #f ; fails to build otherwise
@@ -61,8 +61,8 @@
      (sha256
       (base32
        "0jh79syhr8n3l81jxlwsmwm1pklb4d923m2lgqbswyavh1fqmvwb"))
-      (patches (list (search-patch "duplicity-piped-password.patch")
-                     (search-patch "duplicity-test_selection-tmp.patch")))))
+      (patches (search-patches "duplicity-piped-password.patch"
+                               "duplicity-test_selection-tmp.patch"))))
    (build-system python-build-system)
    (native-inputs
     `(("python2-setuptools" ,python2-setuptools)
@@ -106,8 +106,7 @@ spying and/or modification by the server.")
    (source
     (origin
      (method url-fetch)
-      ;; Source tarballs are not versioned
-      (uri "http://archive.miek.nl/projects/hdup2/hdup.tar.bz2")
+      (uri "https://fossies.org/linux/privat/old/hdup-2.0.14.tar.bz2")
      (sha256
       (base32
        "02bnczg01cyhajmm4rhbnc0ja0dd9ikv9fwv28asxh1rlx9yr0b7"))))
@@ -136,7 +135,7 @@ backups (called chunks) to allow easy burning to CD/DVD.")
 (define-public libarchive
  (package
    (name "libarchive")
-    (version "3.1.2")
+    (version "3.2.1")
    (source
     (origin
       (method url-fetch)
@@ -144,12 +143,7 @@ backups (called chunks) to allow easy burning to CD/DVD.")
                           version ".tar.gz"))
       (sha256
        (base32
-         "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb"))
-       (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")))))
+         "1lngng84k1kkljl74q0cdqc3s82vn2kimfm02dgm4d6m7x71mvkj"))))
    (build-system gnu-build-system)
    ;; TODO: Add -L/path/to/nettle in libarchive.pc.
    (inputs
@@ -180,7 +174,10 @@ backups (called chunks) to allow easy burning to CD/DVD.")
                (zero? (system* "./libarchive_test" "^test_*_disk*"))
                (zero? (system* "./bsdcpio_test" "^test_owner_parse"))
                (zero? (system* "./bsdtar_test"))))
-         %standard-phases))))
+         %standard-phases))
+       ;; libarchive/test/test_write_format_gnutar_filenames.c needs to be
+       ;; compiled with C99 or C11 or a gnu variant.
+       #:configure-flags '("CFLAGS=-O2 -g -std=c99")))
    (home-page "http://libarchive.org/")
    (synopsis "Multi-format archive and compression library")
    (description
@@ -377,8 +374,7 @@ changes are stored.")
              (sha256
               (base32
                "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"))
-              (patches
-               (list (search-patch "diffutils-gets-undeclared.patch")))))
+              (patches (search-patches "diffutils-gets-undeclared.patch"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("guile" ,guile-2.0)
@@ -410,13 +406,14 @@ detection, and lossless compression.")
 (define-public borg
  (package
    (name "borg")
-    (version "1.0.0")
+    (version "1.0.6")
    (source (origin
              (method url-fetch)
              (uri (pypi-uri "borgbackup" version))
+
              (sha256
               (base32
-                "0wa6cvqs3rni5nwrgagigchcly8a53rxk56z0zn8iaii2cqrw2sh"))))
+                "1dxn9p4xm0zd32xzzd9hs4a542db34clykrrnnv3hrdnc394895p"))))
    (build-system python-build-system)
    (arguments
     `(#:phases
@@ -6,6 +6,7 @@
 ;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,7 +25,7 @@

 (define-module (gnu packages base)
  #:use-module ((guix licenses)
-                #:select (gpl3+ lgpl2.0+ public-domain))
+                #:select (gpl3+ lgpl2.0+ lgpl3+ public-domain))
  #:use-module (gnu packages)
  #:use-module (gnu packages acl)
  #:use-module (gnu packages bash)
@@ -43,7 +44,9 @@
  #:use-module (guix download)
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system trivial))
+  #:use-module (guix build-system trivial)
+  #:use-module (ice-9 match)
+  #:export (glibc))

 ;;; Commentary:
 ;;;
@@ -74,16 +77,15 @@ command-line arguments, multiple languages, and so on.")
 (define-public grep
  (package
   (name "grep")
-   (version "2.22")
+   (version "2.25")
   (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")))))
+              "0c38b67cnwchwzv4wq2gpz6smkhdxrac2hhssv8f0l04qnx867p2"))
+            (patches (search-patches "grep-timing-sensitive-test.patch"))))
   (build-system gnu-build-system)
   (native-inputs `(("perl" ,perl)))             ;some of the tests require it
   (synopsis "Print lines matching a pattern")
@@ -109,7 +111,7 @@ including, for example, recursive directory searching.")
            (sha256
             (base32
              "1myvrmh99jsvk7v3d7crm0gcrq51hmmm1r2kjyyci152in1x2j7h"))
-            (patches (list (search-patch "sed-hurd-path-max.patch")))))
+            (patches (search-patches "sed-hurd-path-max.patch"))))
   (build-system gnu-build-system)
   (synopsis "Stream editor")
   (arguments
@@ -137,18 +139,34 @@ implementation offers several extensions over the standard utility.")
 (define-public tar
  (package
   (name "tar")
-   (version "1.28")
+   (version "1.29")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/tar/tar-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "1wi2zwm4c9r3h3b8y4w0nm0qq897kn8kyj9k22ba0iqvxj48vvk4"))
-            (patches (map search-patch
-                          '("tar-d_ino_in_dirent-fix.patch"
-                            "tar-skip-unreliable-tests.patch")))))
+              "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0"))
+            (patches (search-patches "tar-skip-unreliable-tests.patch"))))
   (build-system gnu-build-system)
+   ;; Note: test suite requires ~1GiB of disk space.
+   (arguments
+    '(#:phases (modify-phases %standard-phases
+                 (add-before 'build 'set-shell-file-name
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     ;; Do not use "/bin/sh" to run programs.
+                     (let ((bash (assoc-ref inputs "bash")))
+                       (substitute* "src/system.c"
+                         (("/bin/sh")
+                          (string-append bash "/bin/sh")))
+                       #t))))))
+
+   ;; When cross-compiling, the 'set-shell-file-name' phase needs to be able
+   ;; to refer to the target Bash.
+   (inputs (if (%current-target-system)
+               `(("bash" ,bash))
+               '()))
+
   (synopsis "Managing tar archives")
   (description
    "Tar provides the ability to create tar archives, as well as the
@@ -171,7 +189,7 @@ standard utility.")
              (sha256
               (base32
                "16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx"))
-              (patches (list (search-patch "patch-hurd-path-max.patch")))))
+              (patches (search-patches "patch-hurd-path-max.patch"))))
   (build-system gnu-build-system)
   (native-inputs `(("ed" ,ed)))
   (synopsis "Apply differences to originals, with optional backups")
@@ -217,9 +235,8 @@ interactive means to merge two files.")
            (sha256
             (base32
              "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y"))
-            (patches (map search-patch
-                          '("findutils-localstatedir.patch"
-                            "findutils-test-xargs.patch")))))
+            (patches (search-patches "findutils-localstatedir.patch"
+                                     "findutils-test-xargs.patch"))))
   (build-system gnu-build-system)
   (arguments
    `(#:configure-flags (list
@@ -245,23 +262,14 @@ used to apply commands with arbitrarily long arguments.")
 (define-public coreutils
  (package
   (name "coreutils")
-   (version "8.24")
+   (version "8.25")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/coreutils/coreutils-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "0w11jw3fb5sslf0f72kxy7llxgk1ia3a6bcw0c9kmvxrlj355mx2"))
-            (patches
-             (list (origin
-                     (method url-fetch)
-                     (uri "http://git.savannah.gnu.org/cgit/coreutils.git/\
-patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0")
-                     (sha256
-                      (base32
-                       "1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz"))
-                     (file-name "coreutils-tail-inotify-race.patch"))))))
+              "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii"))))
   (build-system gnu-build-system)
   (inputs `(("acl"  ,acl)                        ; TODO: add SELinux
             ("gmp"  ,gmp)                        ;bignums in 'expr', yay!
@@ -317,15 +325,15 @@ functionality beyond that which is outlined in the POSIX standard.")
 (define-public gnu-make
  (package
   (name "make")
-   (version "4.1")
+   (version "4.2")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/make/make-" version
                                ".tar.bz2"))
            (sha256
             (base32
-              "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb"))
-            (patches (list (search-patch "make-impure-dirs.patch")))))
+              "0pv5rvz5pp4njxiz3syf786d2xp4j7gzddwjvgw5zmz55yvf6p2f"))
+            (patches (search-patches "make-impure-dirs.patch"))))
   (build-system gnu-build-system)
   (native-inputs `(("pkg-config" ,pkg-config)))  ; to detect Guile
   (inputs `(("guile" ,guile-2.0)))
@@ -363,8 +371,8 @@ change.  GNU make offers many powerful extensions over the standard utility.")
            (sha256
             (base32
              "08lzmhidzc16af1zbx34f8cy4z7mzrswpdbhrb8shy3xxpflmcdm"))
-            (patches (list (search-patch "binutils-ld-new-dtags.patch")
-                           (search-patch "binutils-loongson-workaround.patch")))))
+            (patches (search-patches "binutils-ld-new-dtags.patch"
+                                     "binutils-loongson-workaround.patch"))))
   (build-system gnu-build-system)

   ;; TODO: Add dependency on zlib + those for Gold.
@@ -465,17 +473,17 @@ store.")

 (export make-ld-wrapper)

-(define-public glibc
+(define-public glibc/linux
  (package
   (name "glibc")
-   (version "2.22")
+   (version "2.23")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/glibc/glibc-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "0j49682pm2nh4qbdw35bas82p1pgfnz4d2l7iwfyzvrvj0318wzb"))
+              "1s8krs3y2n6pzav7ic59dz41alqalphv7vww4138ag30wh0fpvwl"))
            (snippet
             ;; Disable 'ldconfig' and /etc/ld.so.cache.  The latter is
             ;; required on LFS distros to avoid loading the distro's libc.so
@@ -484,17 +492,14 @@ store.")
                (("use_ldconfig=yes")
                 "use_ldconfig=no")))
            (modules '((guix build utils)))
-            (patches (map search-patch
-                          '("glibc-ldd-x86_64.patch"
-                            "glibc-locale-incompatibility.patch"
-                            "glibc-versioned-locpath.patch"
-                            "glibc-o-largefile.patch"
-                            "glibc-CVE-2015-7547.patch")))))
+            (patches (search-patches "glibc-ldd-x86_64.patch"
+                                     "glibc-versioned-locpath.patch"
+                                     "glibc-o-largefile.patch"))))
   (build-system gnu-build-system)

   ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
   ;; users should automatically pull Linux headers as well.
-   (propagated-inputs `(("linux-headers" ,linux-libre-headers)))
+   (propagated-inputs `(("kernel-headers" ,linux-libre-headers)))

   (outputs '("out" "debug"))

@@ -506,7 +511,7 @@ store.")
      #:parallel-build? #f

      ;; The libraries have an empty RUNPATH, but some, such as the versioned
-      ;; libraries (libdl-2.22.so, etc.) have ld.so marked as NEEDED.  Since
+      ;; libraries (libdl-2.23.so, etc.) have ld.so marked as NEEDED.  Since
      ;; these libraries are always going to be found anyway, just skip
      ;; RUNPATH checks.
      #:validate-runpath? #f
@@ -530,11 +535,15 @@ store.")
            ;;
            ;; `--localedir' is not honored, so work around it.
            ;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>.
+            ;; FIXME: This hack no longer works on 2.23!
            (string-append "libc_cv_localedir=/run/current-system/locale/"
                           ,version)

            (string-append "--with-headers="
-                           (assoc-ref %build-inputs "linux-headers")
+                           (assoc-ref ,(if (%current-target-system)
+                                           '%build-target-inputs
+                                           '%build-inputs)
+                                      "kernel-headers")
                           "/include")

            ;; This is the default for most architectures as of GNU libc 2.21,
@@ -548,7 +557,7 @@ store.")
                           "/bin/bash")

            ;; XXX: Work around "undefined reference to `__stack_chk_guard'".
-            "libc_cv_ssp=no")
+            "libc_cv_ssp=no" "libc_cv_ssp_strong=no")

      #:tests? #f                                 ; XXX
      #:phases (modify-phases %standard-phases
@@ -562,10 +571,6 @@ store.")
                           ;; but cross-base uses it as a native input.
                           (bash (or (assoc-ref inputs "static-bash")
                                     (assoc-ref native-inputs "static-bash"))))
-                      ;; Use `pwd', not `/bin/pwd'.
-                      (substitute* "configure"
-                        (("/bin/pwd") "pwd"))
-
                      ;; Install the rpc data base file under `$out/etc/rpc'.
                      ;; FIXME: Use installFlags = [ "sysconfdir=$(out)/etc" ];
                      (substitute* "sunrpc/Makefile"
@@ -646,11 +651,104 @@ with the Linux kernel.")
   (license lgpl2.0+)
   (home-page "http://www.gnu.org/software/libc/")))

-(define-public glibc-2.21
+(define-public glibc/hurd
+  ;; The Hurd's libc variant.
+  (package (inherit glibc/linux)
+    (name "glibc-hurd")
+    (version "2.19")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://alpha.gnu.org/gnu/hurd/glibc-"
+                                  version "-hurd+libpthread-20160518" ".tar.gz"))
+              (sha256
+               (base32
+                "12zmdjviybpsdb2kq4cg98rds7909f0cc96fzdahdfrzlxx1q0px"))))
+
+    ;; Libc provides <hurd.h>, which includes a bunch of Hurd and Mach headers,
+    ;; so both should be propagated.
+    (propagated-inputs `(("hurd-core-headers" ,hurd-core-headers)))
+    (native-inputs
+     `(,@(package-native-inputs glibc/linux)
+       ("mig" ,mig)
+       ("perl" ,perl)))
+
+    (arguments
+     (substitute-keyword-arguments (package-arguments glibc/linux)
+       ((#:phases original-phases)
+        ;; Add libmachuser.so and libhurduser.so to libc.so's search path.
+        ;; See <http://lists.gnu.org/archive/html/bug-hurd/2015-07/msg00051.html>.
+        `(alist-cons-after
+          'install 'augment-libc.so
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let* ((out (assoc-ref outputs "out")))
+              (substitute* (string-append out "/lib/libc.so")
+                (("/[^ ]+/lib/libc.so.0.3")
+                 (string-append out "/lib/libc.so.0.3" " libmachuser.so" " libhurduser.so"))))
+            #t)
+          (alist-cons-after
+           'pre-configure 'pre-configure-set-pwd
+           (lambda _
+             ;; Use the right 'pwd'.
+             (substitute* "configure"
+               (("/bin/pwd") "pwd")))
+          ,original-phases)))
+        ((#:configure-flags original-configure-flags)
+        `(append (list "--host=i586-pc-gnu"
+
+                       ;; We need this to get a working openpty() function.
+                       "--enable-pt_chown"
+
+                       ;; nscd fails to build for GNU/Hurd:
+                       ;; <https://lists.gnu.org/archive/html/bug-hurd/2014-07/msg00006.html>.
+                       ;; Disable it.
+                       "--disable-nscd")
+                 (filter (lambda (flag)
+                           (not (string-prefix? "--enable-kernel=" flag)))
+                         ,original-configure-flags)))))
+    (synopsis "The GNU C Library (GNU Hurd variant)")
+    (supported-systems %hurd-systems)))
+
+(define* (glibc-for-target #:optional
+                           (target (or (%current-target-system)
+                                       (%current-system))))
+  "Return the glibc for TARGET, GLIBC/LINUX for a Linux host or
+GLIBC/HURD for a Hurd host"
+  (match target
+    ((or "i586-pc-gnu" "i586-gnu") glibc/hurd)
+    (_ glibc/linux)))
+
+(define-syntax glibc
+  (identifier-syntax (glibc-for-target)))
+
+(define-public glibc-2.22
  ;; 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.22")
+    (source (origin
+              (inherit (package-source glibc))
+              (uri (string-append "mirror://gnu/glibc/glibc-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "0j49682pm2nh4qbdw35bas82p1pgfnz4d2l7iwfyzvrvj0318wzb"))
+              (patches (search-patches "glibc-ldd-x86_64.patch"))))
+    (arguments
+      (substitute-keyword-arguments (package-arguments glibc)
+        ((#:phases phases)
+         `(modify-phases ,phases
+            (add-before 'configure 'fix-pwd
+              (lambda _
+                ;; Use `pwd' instead of `/bin/pwd' for glibc-2.21
+                (substitute* "configure"
+                  (("/bin/pwd") "pwd"))))))))))
+
+(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-2.22)
    (version "2.21")
    (source (origin
              (inherit (package-source glibc))
@@ -659,7 +757,7 @@ with the Linux kernel.")
              (sha256
               (base32
                "1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf"))
-              (patches (list (search-patch "glibc-ldd-x86_64.patch")))))))
+              (patches (search-patches "glibc-ldd-x86_64.patch"))))))

 (define-public glibc-locales
  (package
@@ -689,7 +787,7 @@ the 'share/locale' sub-directory of this package.")
         ((#:configure-flags flags)
          `(append ,flags
                   ;; Use $(libdir)/locale/X.Y as is the case by default.
-                   (list (string-append "libc_cv_localedir="
+                   (list (string-append "libc_cv_complocaledir="
                                        (assoc-ref %outputs "out")
                                        "/lib/locale/"
                                        ,(package-version glibc))))))))))
@@ -765,74 +863,6 @@ variety of options.  It is an alternative to the shell \"type\" built-in
 command.")
    (license gpl3+))) ; some files are under GPLv2+

-(define-public glibc/hurd
-  ;; The Hurd's libc variant.
-  (package (inherit glibc)
-    (name "glibc-hurd")
-    (version "2.18")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "git://git.sv.gnu.org/hurd/glibc")
-                    (commit "cc94b3cfe65523f980359e5f0e93a26196bda1d3")))
-              (sha256
-               (base32
-                "17gsh0kaz0zyvghjmx861mi2p65m9901lngi179x61zm6v2v3xc4"))
-              (file-name (string-append name "-" version))
-              (patches (map search-patch
-                            '("glibc-hurd-extern-inline.patch")))))
-
-    ;; Libc provides <hurd.h>, which includes a bunch of Hurd and Mach headers,
-    ;; so both should be propagated.
-    (propagated-inputs `(("gnumach-headers" ,gnumach-headers)
-                         ("hurd-headers" ,hurd-headers)
-                         ("hurd-minimal" ,hurd-minimal)))
-    (native-inputs
-     `(,@(package-native-inputs glibc)
-       ("patch/libpthread-patch" ,(search-patch "libpthread-glibc-preparation.patch"))
-       ("mig" ,mig)
-       ("perl" ,perl)
-       ("libpthread" ,(origin
-                        (method git-fetch)
-                        (uri (git-reference
-                              (url "git://git.sv.gnu.org/hurd/libpthread")
-                              (commit "0ef7b75c4ba91b6660f0d3d8b51d14d25e3d5bfb")))
-                        (sha256
-                         (base32
-                          "031py18fls15z0wprni33mf762kg6fx8xqijppimhp83yp6ky3l3"))
-                        (file-name "libpthread")))))
-
-    (arguments
-     (substitute-keyword-arguments (package-arguments glibc)
-       ((#:configure-flags original-configure-flags)
-        `(append (list "--host=i686-pc-gnu"
-
-                       ;; nscd fails to build for GNU/Hurd:
-                       ;; <https://lists.gnu.org/archive/html/bug-hurd/2014-07/msg00006.html>.
-                       ;; Disable it.
-                       "--disable-nscd")
-                 (filter (lambda (flag)
-                           (not (or (string-prefix? "--with-headers=" flag)
-                                    (string-prefix? "--enable-kernel=" flag))))
-                         ;; Evaluate 'original-configure-flags' in a
-                         ;; lexical environment that has a dummy
-                         ;; "linux-headers" input, to prevent errors.
-                         (let ((%build-inputs `(("linux-headers" . "@DUMMY@")
-                                                ,@%build-inputs)))
-                           ,original-configure-flags))))
-       ((#:phases phases)
-        `(alist-cons-after
-          'unpack 'prepare-libpthread
-          (lambda* (#:key inputs #:allow-other-keys)
-            (copy-recursively (assoc-ref inputs "libpthread") "libpthread")
-
-            (system* "patch" "--force" "-p1" "-i"
-                     (assoc-ref inputs "patch/libpthread-patch"))
-            #t)
-          ,phases))))
-    (synopsis "The GNU C Library (GNU Hurd variant)")
-    (supported-systems %hurd-systems)))
-
 (define-public glibc/hurd-headers
  (package (inherit glibc/hurd)
    (name "glibc-hurd-headers")
@@ -844,7 +874,7 @@ command.")
       ;; We just pass the flags really needed to build the headers.
       ((#:configure-flags _)
        `(list "--enable-add-ons"
-               "--host=i686-pc-gnu"
+               "--host=i586-pc-gnu"
               "--enable-obsolete-rpc"))
       ((#:phases _)
        '(alist-replace
@@ -940,6 +970,33 @@ reflect changes made by political bodies to time zone boundaries, UTC offsets,
 and daylight-saving rules.")
    (license public-domain)))

+(define-public libiconv
+  (package
+    (name "libiconv")
+    (version "1.14")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/libiconv/libiconv-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Work around "declared gets" error on glibc systems (fixed by
+               ;; Gnulib commit 66712c23388e93e5c518ebc8515140fa0c807348.)
+               '(substitute* "srclib/stdio.in.h"
+                  (("^#undef gets") "")
+                  (("^_GL_WARN_ON_USE \\(gets.*") "")))))
+    (build-system gnu-build-system)
+    (synopsis "Character set conversion library")
+    (description
+     "libiconv provides an implementation of the iconv function for systems
+that lack it.  iconv is used to convert between character encodings in a
+program.  It supports a wide variety of different encodings.")
+    (home-page "http://www.gnu.org/software/libiconv/")
+    (license lgpl3+)))
+
 (define-public (canonical-package package)
  ;; Avoid circular dependency by lazily resolving 'commencement'.
  (let* ((iface (resolve-interface '(gnu packages commencement)))
@@ -285,7 +285,7 @@ without modification.")
               (base32
                "0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b"))
              (patches
-               (list (search-patch "bash-completion-directories.patch")))))
+               (search-patches "bash-completion-directories.patch"))))
    (build-system gnu-build-system)
    (native-inputs `(("util-linux" ,util-linux)))
    (arguments
@@ -318,3 +318,46 @@ without modification.")
 completion for many common commands.")
    (home-page "http://bash-completion.alioth.debian.org/")
    (license gpl2+)))
+
+(define-public bash-tap
+  (package
+    (name "bash-tap")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/illusori/bash-tap/"
+                                  "archive/" version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0qs1qi38bl3ns4mpagcawv618dsk2q1lgrbddgvs0wl3ia12cyz5"))))
+    ;; There is no compilation process to use this package, however, the bash
+    ;; scripts installed by this package start with "#!/bin/bash".  To fix
+    ;; these lines, we use the patch-shebangs of the GNU build system.  The
+    ;; project does not use a Makefile.
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; There is no test suite.
+       #:phases
+       (modify-phases %standard-phases
+         ;; Because there are no configure scripts or Makefile, we can
+         ;; remove these phases.
+         (delete 'configure)
+         (delete 'build)
+         ;; The installation involves manually copying the files to a location.
+         ;; To make them easily accessible by setting PATH, we add the scripts
+         ;; to the "bin" folder.
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
+               (install-file "bash-tap" bin)
+               (install-file "bash-tap-bootstrap" bin)
+               (install-file "bash-tap-mock" bin)))))))
+    (home-page "http://www.illusori.co.uk/projects/bash-tap/")
+    (synopsis "Bash port of a Test::More/Test::Builder-style TAP-compliant
+test library")
+    (description "Bash TAP is a TAP-compliant Test::More-style testing library
+for Bash shell scripts and functions.  Along with the Test::More-style testing
+helpers it provides helper functions for mocking commands and in-process output
+capturing.")
+    (license expat)))
@@ -24,10 +24,9 @@
  #:use-module (gnu packages m4)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages flex)
-  #:use-module (srfi srfi-1)
-  #:export (bison))
+  #:use-module (srfi srfi-1))

-(define bison
+(define-public bison
  (package
    (name "bison")
    (version "3.0.4")
@@ -65,4 +64,3 @@ simple tools through complex programming languages.")
      (sha256
       (base32
        "1zd77ilmpv5mi3kr55jrj6ncqlcnyhpianhrwzak2q28cv2cbn23"))))))
-
@@ -1,6 +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 © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
@@ -73,7 +73,12 @@
                     (mkdir-p (string-append gui "/bin"))
                     (rename-file (string-append out "/bin/transmission-gtk")
                                  (string-append gui
-                                                 "/bin/transmission-gtk"))))
+                                                 "/bin/transmission-gtk"))
+
+                     ;; Move the '.desktop' file as well.
+                     (mkdir (string-append gui "/share"))
+                     (rename-file (string-append out "/share/applications")
+                                  (string-append gui "/share/applications"))))
                 %standard-phases)))
    (inputs
     `(("inotify-tools" ,inotify-tools)
@@ -202,7 +207,7 @@ interface, for the Transmission BitTorrent daemon.")
 (define-public aria2
  (package
    (name "aria2")
-    (version "1.21.0")
+    (version "1.25.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/tatsuhiro-t/aria2/"
@@ -210,7 +215,7 @@ interface, for the Transmission BitTorrent daemon.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-                "1035rzx9y7qv4p7cv04f461343dxha7ikprch059x2fci8n5yp12"))))
+                "0d8drwc5m5ps4bw63iq2gng36gyc2vadzixbynk1dj6gfr6fp2gz"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags '("--enable-libaria2")
@@ -225,10 +230,10 @@ interface, for the Transmission BitTorrent daemon.")
               (("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageReceiverTest\\);" text)
                (string-append "// " text))))))))
    (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("cppunit" ,cppunit) ; for the tests
+       ("pkg-config" ,pkg-config)))
    (inputs
     `(("c-ares" ,c-ares)
-       ("cppunit" ,cppunit) ; for the tests
       ("gnutls" ,gnutls)
       ("gmp" ,gmp)
       ("libssh2" ,libssh2)
@@ -236,7 +241,7 @@ interface, for the Transmission BitTorrent daemon.")
       ("nettle" ,nettle)
       ("sqlite" ,sqlite)
       ("zlib" ,zlib)))
-    (home-page "http://aria2.sourceforge.net/")
+    (home-page "https://aria2.github.io/")
    (synopsis "Utility for parallel downloading files")
    (description
      "Aria2 is a lightweight, multi-protocol & multi-source command-line
@@ -38,7 +38,7 @@
    (source (origin
              (method url-fetch)
              (uri (string-append
-                    "mirror://sourceforge/boost/boost_"
+                    "mirror://sourceforge/boost/boost/" version "/boost_"
                    (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
                    ".tar.bz2"))
              (sha256
@@ -51,50 +51,50 @@
       ("python" ,python-2)
       ("tcsh" ,tcsh)))
    (arguments
-     (let ((build-flags
-            `("threading=multi" "link=shared"
+     `(#:tests? #f
+       #:make-flags
+       (list "threading=multi" "link=shared"

-              ;; Set the RUNPATH to $libdir so that the libs find each other.
-              (string-append "linkflags=-Wl,-rpath="
-                             (assoc-ref outputs "out") "/lib")
+             ;; Set the RUNPATH to $libdir so that the libs find each other.
+             (string-append "linkflags=-Wl,-rpath="
+                            (assoc-ref %outputs "out") "/lib")

-              ;; Boost's 'context' library is not yet supported on mips64, so
-              ;; we disable it.  The 'coroutine' library depends on 'context',
-              ;; so we disable that too.
-              ,@(if (string-prefix? "mips64" (or (%current-target-system)
-                                                 (%current-system)))
-                    '("--without-context"
-                      "--without-coroutine" "--without-coroutine2")
-                    '()))))
-       `(#: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")))
+             ;; Boost's 'context' library is not yet supported on mips64, so
+             ;; we disable it.  The 'coroutine' library depends on 'context',
+             ;; so we disable that too.
+             ,@(if (string-prefix? "mips64" (or (%current-target-system)
+                                                (%current-system)))
+                   '("--without-context"
+                     "--without-coroutine" "--without-coroutine2")
+                   '()))
+       #: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")))

-                (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
-            'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (zero? (system* "./b2" "install" ,@build-flags))))))))
+               (zero? (system* "./bootstrap.sh"
+                               (string-append "--prefix=" out)
+                               "--with-toolset=gcc")))))
+         (replace
+             'build
+           (lambda* (#:key outputs make-flags #:allow-other-keys)
+             (zero? (apply system* "./b2" make-flags))))
+         (replace
+             'install
+           (lambda* (#:key outputs make-flags #:allow-other-keys)
+             (zero? (apply system* "./b2" "install" make-flags)))))))

    (home-page "http://boost.org")
    (synopsis "Peer-reviewed portable C++ source libraries")
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -27,7 +27,8 @@
  #:use-module (guix build-system trivial)
  #:use-module ((guix store) #:select (add-to-store add-text-to-store))
  #:use-module ((guix derivations) #:select (derivation))
-  #:use-module (guix utils)
+  #:use-module ((guix utils) #:select (gnu-triplet->nix-system))
+  #:use-module (guix combinators)
  #:use-module (srfi srfi-1)
  #:use-module (srfi srfi-26)
  #:use-module (ice-9 match)
@@ -61,7 +62,7 @@
  (define (boot fetch)
    (lambda* (url hash-algo hash
              #:optional name #:key system)
-      (fetch url hash-algo hash
+      (fetch url hash-algo hash name
             #:guile %bootstrap-guile
             #:system system)))

@@ -125,7 +126,7 @@ successful, or false to signal an error."
       ("tarball" ,(bootstrap-origin (source (%current-system))))))
    (source #f)
    (synopsis description)
-    (description #f)
+    (description description)
    (home-page #f)
    (license gpl3+)))

@@ -166,11 +167,13 @@ successful, or false to signal an error."
        ((string=? system "mips64el-linux") "/lib/ld.so.1")
        ((string=? system "i586-gnu") "/lib/ld.so.1")
        ((string=? system "i686-gnu") "/lib/ld.so.1")
+        ((string=? system "aarch64-linux") "/lib/ld-linux-aarch64.so.1")

        ;; XXX: This one is used bare-bones, without a libc, so add a case
        ;; here just so we can keep going.
        ((string=? system "xtensa-elf") "no-ld.so")
        ((string=? system "avr") "no-ld.so")
+        ((string=? system "i686-mingw") "no-ld.so")

        (else (error "dynamic linker name not known for this system"
                     system))))
@@ -410,7 +413,7 @@ $out/bin/guile --version~%"
                         (base32
                          "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg")))))))))
    (synopsis "Bootstrap binaries and headers of the GNU C Library")
-    (description #f)
+    (description synopsis)
    (home-page #f)
    (license lgpl2.1+)))

@@ -495,7 +498,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
            (variable "LIBRARY_PATH")
            (files '("lib" "lib64")))))
    (synopsis "Bootstrap binaries of the GNU Compiler Collection")
-    (description #f)
+    (description synopsis)
    (home-page #f)
    (license gpl3+)))

@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 John Darrington  <jmd@gnu.org>
+;;; Copyright © 2014 John Darrington <jmd@gnu.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,49 +30,48 @@
 (define-public busybox
  (package
    (name "busybox")
-    (version "1.22.1")
+    (version "1.25.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
-                    "http://www.busybox.net/downloads/" name "-"
+                    "https://www.busybox.net/downloads/" name "-"
                    version ".tar.bz2"))
              (sha256
               (base32
-                "12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf"))))
+                "1z52mh6prhd6v47qryz4rvng5r1z0am6masrnigq06zfhmlf03ss"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
-       (alist-replace
-        'configure
-        (lambda _ (zero? (system* "make" "defconfig")))
-        (alist-replace
-         'check
-         (lambda _
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda _ (zero? (system* "make" "defconfig"))))
+         (replace 'check
+           (lambda _
           (substitute* '("testsuite/du/du-s-works"
-                          "testsuite/du/du-works")
-             (("/bin") "/etc"))  ; there is no /bin but there is a /etc
+                           "testsuite/du/du-works")
+               (("/bin") "/etc"))  ; there is no /bin but there is a /etc

           ;; There is no /usr/bin or /bin - replace it with /gnu/store
           (substitute* "testsuite/cpio.tests"
-              (("/usr/bin") (%store-directory))
-              (("usr") (car (filter (negate string-null?)
-                                    (string-split (%store-directory) #\/)))))
+               (("/usr/bin") (%store-directory))
+               (("usr") (car (filter (negate string-null?)
+                                       (string-split (%store-directory) #\/)))))

           (substitute* "testsuite/date/date-works-1"
-             (("/bin/date") (which "date")))
+               (("/bin/date") (which "date")))

           ;; The pidof tests assume that pid 1 is called "init" but that is not
           ;; true in guix build environment
           (substitute* "testsuite/pidof.tests"
-             (("-s init") "-s $(cat /proc/1/comm)"))
+               (("-s init") "-s $(cat /proc/1/comm)"))

           (substitute* "testsuite/grep.tests"
-             ;; The subject of this test is buggy.  It is known by upstream (fixed in git)
-             ;; 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\"")
-              "test x\"$SKIP_KNOWN_BUGS\" = x\"\" && testing \"grep -w ^str doesn't match str not at the beginning\""))
+               ;; The subject of this test is buggy.  It is known by upstream (fixed in git)
+               ;; 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\"")
+               "test x\"$SKIP_KNOWN_BUGS\" = x\"\" && testing \"grep -w ^str doesn't match str not at the beginning\""))

           ;; This test cannot possibly pass.
           ;; It is trying to test that "which ls" returns "/bin/ls" when PATH is not set.
@@ -83,24 +83,23 @@
                           ;; "V=1"
                           "SKIP_KNOWN_BUGS=1"
                           "SKIP_INTERNET_TESTS=1"
-                           "check")))
-         (alist-replace
-          'install
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out")))
-              (zero?
-               (system* "make"
-                        (string-append "CONFIG_PREFIX=" out)
-                        "install"))))
-          %standard-phases)))))
+                           "check"))))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (zero?
+                (system* "make"
+                         (string-append "CONFIG_PREFIX=" out)
+                         "install"))))))))
    (native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man)
                     ;; The following are needed by the tests.
                     ("inetutils" ,inetutils)
+                     ("which" ,(@ (gnu packages base) which))
                     ("zip" ,zip)))
    (synopsis "Many common UNIX utilities in a single executable")
    (description "BusyBox combines tiny versions of many common UNIX utilities
 into a single small executable.  It provides a fairly complete environment for
 any small or embedded system.")
-    (home-page "http://www.busybox.net")
+    (home-page "https://www.busybox.net")
    ;; Some files are gplv2+
    (license gpl2)))
@@ -0,0 +1,127 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; 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/>.
+
+(define-module (gnu packages c)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system trivial)
+  #:use-module (gnu packages bootstrap)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages guile))
+
+(define-public tcc
+  (package
+    (name "tcc")                                  ;aka. "tinycc"
+    (version "0.9.26")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://savannah/tinycc/tcc-"
+                                  version ".tar.bz2"))
+              (sha256
+               (base32
+                "0wbdbdq6090ayw8bxnbikiv989kykff3m5rzbia05hrnwhd707jj"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("perl" ,perl)
+                     ("texinfo" ,texinfo)))
+    (arguments
+     `(#:configure-flags (list (string-append "--elfinterp="
+                                              (assoc-ref %build-inputs "libc")
+                                              ,(glibc-dynamic-linker))
+                               (string-append "--crtprefix="
+                                              (assoc-ref %build-inputs "libc")
+                                              "/lib")
+                               (string-append "--sysincludepaths="
+                                              (assoc-ref %build-inputs "libc")
+                                              "/include:"
+                                              (assoc-ref %build-inputs
+                                                         "kernel-headers")
+                                              "/include:{B}/include")
+                               (string-append "--libpaths="
+                                              (assoc-ref %build-inputs "libc")
+                                              "/lib"))
+       #:test-target "test"))
+    (synopsis "Tiny and fast C compiler")
+    (description
+     "TCC, also referred to as \"TinyCC\", is a small and fast C compiler
+written in C.  It supports ANSI C with GNU and extensions and most of the C99
+standard.")
+    (home-page "http://www.tinycc.org/")
+    (license license:lgpl2.1+)))
+
+(define-public tcc-wrapper
+  (package
+    (inherit tcc)
+    (name "tcc-wrapper")
+    (build-system trivial-build-system)
+    (native-inputs '())
+    (inputs `(("tcc" ,tcc)
+              ("guile" ,guile-2.0)))
+
+    ;; By default TCC does not honor any search path environment variable.
+    ;; This wrapper adds them.
+    ;;
+    ;; FIXME: TCC includes its own linker so our 'ld-wrapper' hack to set the
+    ;; RUNPATH is ineffective here.  We should modify TCC itself.
+    (native-search-paths
+     (list (search-path-specification
+            (variable "TCC_CPATH")
+            (files '("include")))
+           (search-path-specification
+            (variable "TCC_LIBRARY_PATH")
+            (files '("lib" "lib64")))))
+
+    (arguments
+     '(#:builder
+       (let* ((out   (assoc-ref %outputs "out"))
+              (bin   (string-append out "/bin"))
+              (tcc   (assoc-ref %build-inputs "tcc"))
+              (guile (assoc-ref %build-inputs "guile")))
+         (mkdir out)
+         (mkdir bin)
+         (call-with-output-file (string-append bin "/cc")
+           (lambda (port)
+             (format port "#!~a/bin/guile --no-auto-compile~%!#~%" guile)
+             (write
+              `(begin
+                 (use-modules (ice-9 match)
+                              (srfi srfi-26))
+
+                 (define (split path)
+                   (string-tokenize path (char-set-complement
+                                          (char-set #\:))))
+
+                 (apply execl ,(string-append tcc "/bin/tcc")
+                        ,(string-append tcc "/bin/tcc") ;argv[0]
+                        (append (cdr (command-line))
+                                (match (getenv "TCC_CPATH")
+                                  (#f '())
+                                  (str
+                                   (map (cut string-append "-I" <>)
+                                        (split str))))
+                                (match (getenv "TCC_LIBRARY_PATH")
+                                  (#f '())
+                                  (str
+                                   (map (cut string-append "-L" <>)
+                                        (split str)))))))
+              port)
+             (chmod port #o777)))
+         #t)))
+    (synopsis "Wrapper providing the 'cc' command for TCC")))
@@ -1,6 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,7 +38,7 @@
 (define-public libical
  (package
    (name "libical")
-    (version "1.0.1")
+    (version "2.0.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -44,14 +46,30 @@
                    version "/libical-" version ".tar.gz"))
              (sha256
               (base32
-                "14lmjj63zyx88rf1z71l0v9ms4c2vpdhmixksjjxgywp5p2f7708"))))
+                "1njn2kr0rrjqv5g3hdhpdzrhankyj4fl1bgn76z3g4n1b7vi2k35"))))
    (build-system cmake-build-system)
    (arguments
-     '(#:tests? #f)) ; test suite appears broken
+     '(#:tests? #f ; test suite appears broken
+       #:configure-flags
+       (list (string-append "-DCMAKE_INSTALL_RPATH="
+                            (assoc-ref %outputs "out") "/lib:"
+                            (assoc-ref %outputs "out") "/lib64"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-paths
+           (lambda _
+             (let ((tzdata (assoc-ref %build-inputs "tzdata")))
+               (substitute* "src/libical/icaltz-util.c"
+                 (("char \\*search_paths \\[\\] =.*$")
+                  (string-append
+                   "char *search_paths [] = "
+                   "{\"" tzdata "/share/zoneinfo\"};\n"))))
+             #t)))))
    (native-inputs
     `(("perl" ,perl)))
    (inputs
-     `(("icu4c" ,icu4c)))
+     `(("icu4c" ,icu4c)
+       ("tzdata" ,tzdata)))
    (home-page "https://libical.github.io/libical/")
    (synopsis "iCalendar protocols and data formats implementation")
    (description
@@ -79,12 +97,25 @@ data units.")
    (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
+        (add-after 'unpack 'disable-tests
          (lambda _
+            ;; Bug reported for test_only_update_old_event:
+            ;; https://github.com/geier/khal/issues/309
            (substitute* "tests/khalendar_test.py"
                         (("test_only_update_old_event")
-                          "disabled_only_update_old_event"))))
+                           "disabled_only_update_old_event"))
+
+            ;; Bug reported for test_dt_two_tz:
+            ;; https://github.com/pimutils/khal/issues/382
+            (substitute* "tests/event_test.py"
+                         (("test_dt_two_tz")
+                           "disabled_dt_two_tz"))
+            ;; Another timezone / DST issue:
+            ;; https://github.com/pimutils/khal/issues/146
+            (substitute* "tests/event_test.py"
+                         (("test_raw_dt")
+                           "disabled_raw_dt"))))
+
        ;; Building the manpage requires khal to be installed.
        (add-after 'install 'manpage
          (lambda* (#:key outputs #:allow-other-keys)
@@ -95,6 +126,7 @@ data units.")
            (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)
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,7 +29,7 @@
 (define-public ccache
  (package
    (name "ccache")
-    (version "3.2.4")
+    (version "3.2.5")
    (source
     (origin
      (method url-fetch)
@@ -36,16 +37,18 @@
                          version ".tar.xz"))
      (sha256
       (base32
-        "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w"))))
+        "11db1g109g0g5si0s50yd99ja5f8j4asxb081clvx78r9d9i2w0i"))))
    (build-system gnu-build-system)
-    (native-inputs `(("perl" ,perl)))   ;for test.sh
+    (native-inputs `(("perl" ,perl)     ;for test.sh
+                     ("which" ,(@ (gnu packages base) which))))
    (inputs `(("zlib" ,zlib)))
    (arguments
     '(#:phases (alist-cons-before
                 'check 'setup-tests
                 (lambda _
                   (substitute* '("test/test_hashutil.c" "test.sh")
-                     (("#!/bin/sh") (string-append "#!" (which "sh"))))
+                     (("#!/bin/sh") (string-append "#!" (which "sh")))
+                     (("which") (which "which")))
                   #t)
                 %standard-phases)))
    (home-page "https://ccache.samba.org/")
@@ -4,6 +4,7 @@
 ;;; 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>
+;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,10 +25,13 @@
  #:use-module (guix download)
  #:use-module (guix packages)
  #:use-module ((guix licenses) #:select (lgpl2.1+ gpl2 gpl2+ gpl3+))
+  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages)
  #:use-module (gnu packages acl)
+  #:use-module (gnu packages bison)
  #:use-module (gnu packages compression)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages man)
@@ -47,8 +51,8 @@
    (version "1.3.2")
    (source (origin
             (method url-fetch)
-             (uri (string-append "mirror://sourceforge/libcddb/libcddb-"
-                                 version ".tar.bz2"))
+             (uri (string-append "mirror://sourceforge/libcddb/libcddb/" version
+                                 "/libcddb-" version ".tar.bz2"))
             (sha256
              (base32
               "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim"))))
@@ -126,14 +130,14 @@ libcdio.")
 (define-public xorriso
  (package
    (name "xorriso")
-    (version "1.4.2")
+    (version "1.4.4")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/xorriso/xorriso-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "1cq4a0904lnz6nygbgarnlq49cz4qnfdyvz90s3nfk5as7gbwhr8"))))
+               "1izv8dvwacyh432vv1rm6lyjrq0v205kyakfra6iwa146c9m9fgr"))))
    (build-system gnu-build-system)
    (inputs
     `(("acl" ,acl)
@@ -141,7 +145,7 @@ libcdio.")
       ("bzip2" ,bzip2)
       ("zlib" ,zlib)
       ("libcdio" ,libcdio)))
-    (home-page "http://www.gnu.org/software/xorriso/")
+    (home-page "https://www.gnu.org/software/xorriso/")
    (synopsis "Create, manipulate, burn ISO-9660 filesystems")
    (description
     "GNU Xorriso is a tool for copying files to and from ISO 9660 Rock
@@ -164,7 +168,7 @@ files.")
             (sha256
              (base32
               "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"))
-             (patches (list (search-patch "cdparanoia-fpic.patch")))
+             (patches (search-patches "cdparanoia-fpic.patch"))
             (modules '((guix build utils)))
             (snippet
              ;; Make libraries respect LDFLAGS.
@@ -230,16 +234,21 @@ capacity is user-selectable.")
 (define-public libcue
  (package
    (name "libcue")
-    (version "1.4.0")
+    (version "2.1.0")
    (source (origin
             (method url-fetch)
-             (uri (string-append "https://github.com/lipnitsk/libcue/archive/v"
-                                 version ".tar.bz2"))
+             (uri (string-append
+                   "https://github.com/lipnitsk/libcue/archive/v"
+                   version ".tar.gz"))
+             (file-name (string-append name "-" version ".tar.gz"))
             (sha256
              (base32
-               "17kjd7rjz1bvfn44n3n2bjb7a1ywd0yc0g4sqp5ihf9b5bn7cwlb"))))
-    (build-system gnu-build-system)
-    (home-page "http://libcue.sourceforge.net/")
+               "1fradl3dx0pyy9rn1a0gak9gzgg40wax61f2s00zks7rwl0xv398"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("bison" ,bison)
+       ("flex" ,flex)))
+    (home-page "https://github.com/lipnitsk/libcue")
    (synopsis "C library to parse cue sheets")
    (description "Libcue is a C library to parse so-called @dfn{cue sheets}
 which contain meta-data for CD/DVD tracks.  It provides an API to manipulate
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,7 +25,6 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system trivial)
  #:use-module (gnu packages)
-  #:use-module (gnu packages gnuzilla)
  #:use-module (gnu packages python)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages tls))
@@ -71,8 +71,20 @@
   (home-page "http://pkgs.fedoraproject.org/cgit/ca-certificates.git/")))

 (define-public nss-certs
-  (package (inherit nss) ; to reuse the source, version and some metadata
+  (package
    (name "nss-certs")
+    (version "3.23")
+    (source (origin
+              (method url-fetch)
+              (uri (let ((version-with-underscores
+                          (string-join (string-split version #\.) "_")))
+                     (string-append
+                      "https://ftp.mozilla.org/pub/mozilla.org/security/nss/"
+                      "releases/NSS_" version-with-underscores "_RTM/src/"
+                      "nss-" version ".tar.gz")))
+              (sha256
+               (base32
+                "1kqidv91icq96m9m8zx50n7px08km2l88458rkgyjwcn3kiq7cwl"))))
    (build-system gnu-build-system)
    (outputs '("out"))
    (native-inputs
@@ -123,5 +135,7 @@
                '(set-paths install-locale unpack)))))
    (synopsis "CA certificates from Mozilla")
    (description
-      "This package provides certificates for Certification Authorities (CA)
-taken from the NSS package and thus ultimately from the Mozilla project.")))
+     "This package provides certificates for Certification Authorities (CA)
+taken from the NSS package and thus ultimately from the Mozilla project.")
+    (home-page "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS")
+    (license license:mpl2.0)))
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
+;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,7 @@
 (define-module (gnu packages check)
  #:use-module (gnu packages)
  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages python)
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
@@ -35,17 +37,17 @@
 (define-public check
  (package
    (name "check")
-    (version "0.9.14")
+    (version "0.10.0")
    (source
     (origin
      (method url-fetch)
-      (uri (string-append "mirror://sourceforge/check/check/"
-                          version "/check-" version ".tar.gz"))
+      (uri (string-append "https://github.com/libcheck/check/files/71408/"
+                          "/check-" version ".tar.gz"))
      (sha256
       (base32
-        "02l4g79d81s07hzywcv1knwj5dyrwjiq2pgxaz7kidxi8m364wn2"))))
+        "0lhhywf5nxl3dd0hdakra3aasl590756c9kmvyifb3vgm9k0gxgm"))))
    (build-system gnu-build-system)
-    (home-page "http://check.sourceforge.net/")
+    (home-page "https://libcheck.github.io/check/")
    (synopsis "Unit test framework for C")
    (description
     "Check is a unit testing framework for C.  It features a simple
@@ -193,3 +195,62 @@ 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+)))
+
+(define-public googletest
+  (package
+    (name "googletest")
+    (version "1.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/google/googletest/archive/"
+                           "release-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1k0nf1l9cb3prdmsvaajl5i31bx86c1mw0d5jgzykz7rzm36afpp"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("python-2" ,python-2)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'autoconf
+           (lambda _
+             (zero? (system* "autoreconf" "-vfi"))))
+         (add-before 'autoconf 'generate-headers
+           (lambda _
+             (begin
+               (delete-file "include/gtest/gtest-param-test.h")
+               (system* "python2" "scripts/pump.py"
+                        "include/gtest/gtest-param-test.h.pump")
+               (delete-file "include/gtest/internal/gtest-tuple.h")
+               (system* "python2" "scripts/pump.py"
+                        "include/gtest//internal/gtest-tuple.h.pump")
+               (delete-file
+                "include/gtest/internal/gtest-param-util-generated.h")
+               (system*
+                "python2" "scripts/pump.py"
+                "include/gtest/internal/gtest-param-util-generated.h.pump")
+               (delete-file "include/gtest/internal/gtest-type-util.h")
+               (system* "python2" "scripts/pump.py"
+                        "include/gtest/internal/gtest-type-util.h.pump"))))
+         (replace 'install
+           (lambda _
+             (let ((out (assoc-ref %outputs "out")))
+               (begin
+                 (install-file "lib/.libs/libgtest_main.a"
+                               (string-append out "/lib"))
+                 (install-file "lib/.libs/libgtest.a"
+                               (string-append out "/lib"))
+                 (copy-recursively "include"
+                  (string-append out "/include")))))))))
+    (home-page "https://github.com/google/googletest/")
+    (synopsis "Test discovery and XUnit test framework")
+    (description "Google Test features an XUnit test framework, automated test
+discovery, death tests, assertions, parameterized tests and XML test report
+generation.")
+    (license bsd-3)))
@@ -39,10 +39,10 @@
  #:use-module (guix build-system gnu))

 (define-public hydra
-  (let ((commit "4c0e3e4"))
+  (let ((commit "4c0e3e47034545ad3e9e86dd069138bcebb8ccee"))
    (package
      (name "hydra")
-      (version (string-append "20150407." commit))
+      (version (string-append "20150407." (string-take commit 7)))
      (source (origin
                (method git-fetch)
                (uri (git-reference
@@ -52,10 +52,10 @@
                (sha256
                 (base32
                  "08vc76xb7f42hh65j7qvjf58hw36aki5ml343170pq94vk75b1nh"))
-                (patches (map search-patch
-                              '("hydra-automake-1.15.patch"
-                                ;; TODO: Remove once we have a darcs input
-                                "hydra-disable-darcs-test.patch")))))
+                (patches (search-patches
+                          "hydra-automake-1.15.patch"
+                          ;; TODO: Remove once we have a darcs input
+                          "hydra-disable-darcs-test.patch"))))
      (build-system gnu-build-system)
      (native-inputs
       `(("unzip" ,unzip)
@@ -4,6 +4,7 @@
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,7 +37,7 @@
 (define-public cmake
  (package
    (name "cmake")
-    (version "3.3.2")
+    (version "3.5.2")
    (source (origin
             (method url-fetch)
             (uri (string-append "https://www.cmake.org/files/v"
@@ -44,62 +45,67 @@
                                 "/cmake-" version ".tar.gz"))
             (sha256
              (base32
-               "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7"))
-             (patches (list (search-patch "cmake-fix-tests.patch")))))
+               "0ap6nlmv6nda942db43k9k9mhnm5dm3fsapzvy0vh6wq7l6l3n4j"))
+             (patches (search-patches "cmake-fix-tests.patch"))))
    (build-system gnu-build-system)
    (arguments
     `(#:test-target "test"
-       #:phases (alist-cons-before
-                 'configure 'patch-bin-sh
-                 (lambda _
-                   ;; Replace "/bin/sh" by the right path in... a lot of
-                   ;; files.
-                   (substitute*
-                       '("Modules/CompilerId/Xcode-3.pbxproj.in"
-                         "Modules/CompilerId/Xcode-1.pbxproj.in"
-                         "Modules/CompilerId/Xcode-2.pbxproj.in"
-                         "Modules/CPack.RuntimeScript.in"
-                         "Source/cmakexbuild.cxx"
-                         "Source/cmGlobalXCodeGenerator.cxx"
-                         "Source/CTest/cmCTestBatchTestHandler.cxx"
-                         "Source/cmLocalUnixMakefileGenerator3.cxx"
-                         "Source/cmExecProgramCommand.cxx"
-                         "Utilities/cmbzip2/Makefile-libbz2_so"
-                         "Utilities/Release/release_cmake.cmake"
-                         "Utilities/cmlibarchive/libarchive/\
-archive_write_set_format_shar.c"
-                         "Tests/CMakeLists.txt"
-                         "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
-                     (("/bin/sh") (which "sh"))))
-                 (alist-cons-before
-                  'configure 'set-paths
-                  (lambda _
-                    ;; 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"))
-                      ;; Get verbose output from failed tests
-                      (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE")))
-                  (alist-replace
-                   'configure
-                   (lambda* (#:key outputs #:allow-other-keys)
-                     (let ((out (assoc-ref outputs "out")))
-                       (zero? (system*
-                               "./configure"
-                               (string-append "--prefix=" out)
-                               "--system-libs"
-                               "--no-system-jsoncpp" ; not packaged yet
-                               ;; By default, the man pages and other docs land
-                               ;; in PREFIX/man and PREFIX/doc, but we want them
-                               ;; in share/{man,doc}.  Note that unlike
-                               ;; autoconf-generated configure scripts, cmake's
-                               ;; configure prepends "PREFIX/" to what we pass
-                               ;; to --mandir and --docdir.
-                               "--mandir=share/man"
-                               ,(string-append
-                                 "--docdir=share/doc/cmake-"
-                                 (version-major+minor version))))))
-                   %standard-phases)))))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-bin-sh
+           (lambda _
+           ;; Replace "/bin/sh" by the right path in... a lot of
+           ;; files.
+           (substitute*
+               '("Modules/CompilerId/Xcode-3.pbxproj.in"
+                 "Modules/CompilerId/Xcode-1.pbxproj.in"
+                 "Modules/CompilerId/Xcode-2.pbxproj.in"
+                 "Modules/CPack.RuntimeScript.in"
+                 "Source/cmakexbuild.cxx"
+                 "Source/cmGlobalXCodeGenerator.cxx"
+                 "Source/CTest/cmCTestBatchTestHandler.cxx"
+                 "Source/cmLocalUnixMakefileGenerator3.cxx"
+                 "Source/cmExecProgramCommand.cxx"
+                 "Utilities/cmbzip2/Makefile-libbz2_so"
+                 "Utilities/Release/release_cmake.cmake"
+                 "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c"
+                 "Tests/CMakeLists.txt"
+                 "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
+               (("/bin/sh") (which "sh")))))
+         (add-before 'configure 'set-paths
+           (lambda _
+             ;; 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"))
+               ;; Get verbose output from failed tests
+               (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE"))))
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (zero? (system*
+                       "./configure"
+                       (string-append "--prefix=" out)
+                       "--system-libs"
+                       "--no-system-jsoncpp" ; not packaged yet
+                       ;; By default, the man pages and other docs land
+                       ;; in PREFIX/man and PREFIX/doc, but we want them
+                       ;; in share/{man,doc}.  Note that unlike
+                       ;; autoconf-generated configure scripts, cmake's
+                       ;; configure prepends "PREFIX/" to what we pass
+                       ;; to --mandir and --docdir.
+                       "--mandir=share/man"
+                       ,(string-append
+                         "--docdir=share/doc/cmake-"
+                         (version-major+minor version)))))))
+         (add-after 'unpack 'remove-libarchive-version-test
+           ; This test check has been failing consistantly over libarchive 3.2.x
+           ; and cmake 3.4.x and 3.5.x so we disable it for now
+           (lambda _
+               (substitute*
+               "Tests/CMakeOnly/AllFindModules/CMakeLists.txt"
+               (("LibArchive") ""))
+               #t)))))
    (inputs
     `(("file"       ,file)
       ("curl"       ,curl)
@@ -43,18 +43,18 @@
 (define-public cflow
  (package
    (name "cflow")
-    (version "1.4")
+    (version "1.5")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/cflow/cflow-"
                                  version ".tar.bz2"))
              (sha256
               (base32
-                "1jkbq97ajcf834z68hbn3xfhiz921zhn39gklml1racf0kb3jzh3"))))
+                "0yq33k5ap1zpnja64n89iai4zh018ffr72wki5a6mzczd880mr3g"))))
    (build-system gnu-build-system)

    ;; Needed to have cflow-mode.el installed.
-    (native-inputs `(("emacs" ,emacs-no-x)))
+    (native-inputs `(("emacs" ,emacs-minimal)))

    (home-page "http://www.gnu.org/software/cflow/")
    (synopsis "Create a graph of control flow within a program")
@@ -92,14 +92,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.4")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/global/global-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "07qx3dbjwkbd1dn42qs7zgj77rxdj2psfrf7bx7yx9al38f87z60"))))
+               "19hxajpwld6qx0faz4rzyh1hfs25ycjmws6bas8pavx4hskf05mg"))))
    (build-system gnu-build-system)
    (inputs `(("ncurses" ,ncurses)
              ("libltdl" ,libltdl)
@@ -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.32.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -198,7 +198,7 @@ COCOMO model or user-provided parameters.")
                    version ".tar.gz"))
              (sha256
               (base32
-                "1a3xncsq3x8pci194k484s5mdqij2sirpz6dj6711n2p8mzq5g31"))
+                "1k543cjpignwvy8avhchz8pkqrqcgcryps36ycy8mz2w5rbhicn5"))
              (file-name (string-append name "-" version ".tar.gz"))))
    (build-system gnu-build-system)
    (native-inputs
@@ -229,6 +229,29 @@ files, but compared to grep is much faster and respects files like .gitignore,
 .hgignore, etc.")
    (license license:asl2.0)))

+(define-public trio
+  (package
+    (name "trio")
+    (version "1.16")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/ctrio/trio/trio-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "02pwd5m5vq7hbrffgm2na1dfc249z50yyr5jv73vdw15bd7ygl44"))))
+    (build-system gnu-build-system)
+    (home-page "http://daniel.haxx.se/projects/trio/")
+    (synopsis "Portable and extendable printf and string functions")
+    (description
+     "Trio is a set of @code{printf} and string functions designed be used by
+applications with a focus on portability or with the need for additional
+features that are not supported by the standard @code{stdio} implementation.")
+    ;; This license is very similar to the ISC license, but the wording is
+    ;; slightly different.
+    (license (license:non-copyleft
+              "http://sourceforge.net/p/ctrio/git/ci/master/tree/README"))))
+
 (define-public withershins
  (package
    (name "withershins")
@@ -287,8 +310,8 @@ stack traces.")
    (version "1.12")
    (source (origin
              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/ltp/lcov-"
-                                  version ".tar.gz"))
+              (uri (string-append "mirror://sourceforge/ltp/Coverage%20Analysis"
+                                  "/LCOV-" version "/lcov-" version ".tar.gz"))
              (sha256
               (base32
                "19wfifdpxxivhq9adbphanjfga9bg9spms9v7c3589wndjff8x5l"))))
@@ -270,21 +270,24 @@
                (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))))
+                 ;; At the very least, this must not depend on GCC & co.
+                 (let ((args `(#:disallowed-references
+                               ,(list %bootstrap-binutils))))
+                   (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))))

 (define (linux-libre-headers-boot0)
  "Return Linux-Libre header files for the bootstrap environment."
@@ -306,7 +309,12 @@
  ;; Also, use %BOOT0-INPUTS to avoid building Perl once more.
  (let ((texinfo (package (inherit texinfo)
                   (native-inputs '())
-                   (inputs `(("perl" ,perl-boot0))))))
+                   (inputs `(("perl" ,perl-boot0)))
+
+                   ;; Some of Texinfo 6.1's tests would fail with "Couldn't
+                   ;; set UTF-8 character type in locale" but we don't have a
+                   ;; UTF-8 locale at this stage, so skip them.
+                   (arguments '(#:tests? #f)))))
    (package-with-bootstrap-guile
     (package-with-explicit-inputs texinfo %boot0-inputs
                                   (current-source-location)
@@ -355,7 +363,7 @@
                                   "export CPATH\n"
                                   all "\n"))))
               ,phases)))))
-     (propagated-inputs `(("linux-headers" ,(linux-libre-headers-boot0))))
+     (propagated-inputs `(("kernel-headers" ,(linux-libre-headers-boot0))))
     (native-inputs
      `(("texinfo" ,texinfo-boot0)
        ("perl" ,perl-boot0)))
@@ -685,8 +693,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
    ,@(alist-delete "bash" %boot3-inputs)))

 (define-public guile-final
+  ;; This package must be public because other modules refer to it.  However,
+  ;; mark it as hidden so that 'fold-packages' ignores it.
  (package-with-bootstrap-guile
-   (package-with-explicit-inputs guile-2.0/fixed
+   (package-with-explicit-inputs (hidden-package guile-2.0/fixed)
                                 %boot4-inputs
                                 (current-source-location)
                                 #:guile %bootstrap-guile)))
@@ -879,4 +889,7 @@ and binaries, plus debugging symbols in the 'debug' output), and Binutils.")
 (define-public gcc-toolchain-5
  (gcc-toolchain gcc-5))

+(define-public gcc-toolchain-6
+  (gcc-toolchain gcc-6))
+
 ;;; commencement.scm ends here
@@ -3,12 +3,14 @@
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
-;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015, 2016 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 © 2016 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,6 +35,9 @@
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system perl)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages assembly)
+  #:use-module (gnu packages autotools)
  #:use-module (gnu packages backup)
  #:use-module (gnu packages base)
  #:use-module (gnu packages perl)
@@ -108,35 +113,51 @@ utility.  Instead of being written in Java, FastJar is written in C.")
 (define-public libtar
  (package
   (name "libtar")
-   (version "1.2.11")
+   (version "1.2.20")
   (source (origin
            (method url-fetch)
-            (uri (string-append
-                  "ftp://ftp.feep.net/pub/software/libtar/libtar-"
-                  version ".tar.gz"))
+            (uri (list
+                   (string-append
+                     "ftp://ftp.feep.net/pub/software/libtar/libtar-"
+                     version ".tar.gz")
+                   (string-append
+                     "mirror://debian/pool/main/libt/libtar/libtar_"
+                     version ".orig.tar.gz")))
            (sha256
             (base32
-              "1f3vx1wa69a6c5y0z0aakd81gygirdcm0vimazg433q8nyvfybja"))))
+              "02cihzl77ia0dcz7z2cga2412vyhhs5pa2355q4wpwbyga2lrwjh"))
+            (patches (search-patches "libtar-CVE-2013-4420.patch"))))
   (build-system gnu-build-system)
-   (arguments `(#:tests? #f)) ;no "check" target
+   (arguments
+    `(#:tests? #f ;no "check" target
+      #:phases
+      (modify-phases %standard-phases
+        (add-after 'unpack 'autoconf
+          (lambda _ (zero? (system* "sh" "autoreconf" "-vfi")))))))
+   (native-inputs
+    `(("autoconf" ,autoconf)
+      ("automake" ,automake)
+      ("libtool" ,libtool)))
+   (inputs
+    `(("zlib" ,zlib)))
   (synopsis "C library for manipulating POSIX tar files")
   (description
    "libtar is a C library for manipulating POSIX tar files.  It handles
 adding and extracting files to/from a tar archive.")
-   (home-page "http://www.feep.net/libtar/")
+   (home-page "https://repo.or.cz/libtar.git")
   (license license:bsd-3)))

 (define-public gzip
  (package
   (name "gzip")
-   (version "1.6")
+   (version "1.8")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/gzip/gzip-"
-                                version ".tar.gz"))
+                                version ".tar.xz"))
            (sha256
             (base32
-              "0zlgdm4v3dndrbiz7b67mbbj25dpwqbmbzjiycssvrfrcfvq7swp"))))
+              "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz"))))
   (build-system gnu-build-system)
   (synopsis "General file (de)compression (using lzw)")
   (arguments
@@ -230,6 +251,29 @@ decompression.")
                                  "See LICENSE in the distribution."))
      (home-page "http://www.bzip.org/"))))

+(define-public lbzip2
+  (package
+    (name "lbzip2")
+    (version "2.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.lbzip2.org/lbzip2-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6"))))
+    (build-system gnu-build-system)
+    (synopsis "Parallel bzip2 compression utility")
+    (description
+     "lbzip2 is a multi-threaded compression utility with support for the
+bzip2 compressed file format.  lbzip2 can process standard bz2 files in
+parallel.  It uses POSIX threading model (pthreads), which allows it to take
+full advantage of symmetric multiprocessing (SMP) systems.  It has been proven
+to scale linearly, even to over one hundred processor cores.  lbzip2 is fully
+compatible with bzip2 – both at file format and command line level.")
+    (home-page "http://www.lbzip2.org/")
+    (license license:gpl3+)))
+
 (define-public pbzip2
  (package
    (name "pbzip2")
@@ -424,16 +468,17 @@ with the sfArk algorithm.")
    (license license:gpl3+)))

 (define-public sfarkxtc
+ (let ((commit "b5e0a2ba3921f019d74d4b92bd31c36dd19d2cf1"))
  (package
    (name "sfarkxtc")
-    (version "b5e0a2ba39")
+    (version (string-take commit 10))
    (source (origin
              ;; There are no release tarballs, so we just fetch the latest
              ;; commit at this time.
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/raboof/sfarkxtc.git")
-                    (commit version)))
+                    (commit commit)))
              (sha256
               (base32
                "0f5x6i46qfl6ry21s7g2p4sd4b2r1g4fb03yqi2vv4kq3saryhvj"))))
@@ -454,7 +499,7 @@ with the sfArk algorithm.")
    (synopsis "Basic sfArk decompressor")
    (description "SfArk extractor converts SoundFonts in the compressed legacy
 sfArk file format to the uncompressed sf2 format.")
-    (license license:gpl3+)))
+    (license license:gpl3+))))

 (define-public libmspack
  (package
@@ -590,7 +635,8 @@ time for compression ratio.")
    (version "4.3")
    (source (origin
              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/squashfs/"
+              (uri (string-append "mirror://sourceforge/squashfs/squashfs/"
+                                  "squashfs" version "/"
                                  "squashfs" version ".tar.gz"))
              (sha256
               (base32
@@ -688,3 +734,140 @@ 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)))
+
+(define-public brotli
+  (let ((commit "e992cce7a174d6e2b3486616499d26bb0bad6448")
+        (revision "1"))
+    (package
+      (name "brotli")
+      (version (string-append "0.1-" revision "."
+                              (string-take commit 7)))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/bagder/libbrotli.git")
+                      (commit commit)
+                      (recursive? #t)))
+                (file-name (string-append name "-" version ".tar.xz"))
+                (sha256
+                 (base32
+                  "1qxxsasvwbbbh6dl3138y9h3fg0q2v7xdk5jjc690bdg7g1wrj6n"))
+                (modules '((guix build utils)))
+                (snippet
+                 ;; This is a recursive submodule that is unnecessary for this
+                 ;; package, so delete it.
+                 '(delete-file-recursively "brotli/terryfy"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       `(("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("libtool" ,libtool)))
+      (arguments
+       `(#:phases (modify-phases %standard-phases
+                    (add-after 'unpack 'autogen
+                      (lambda _
+                        (mkdir "m4")
+                        (zero? (system* "autoreconf" "-vfi")))))))
+      (home-page "https://github.com/bagder/libbrotli/")
+      (synopsis "Implementation of the Brotli compression algorithm")
+      (description
+       "Brotli is a general-purpose lossless compression algorithm.  It is
+similar in speed to deflate but offers denser compression.  This package
+provides encoder and a decoder libraries: libbrotlienc and libbrotlidec,
+respectively, based on the reference implementation from Google.")
+      (license license:expat))))
+
+(define-public cabextract
+ (package
+   (name "cabextract")
+   (version "1.6")
+   (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://cabextract.org.uk/cabextract-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf"))))
+    (build-system gnu-build-system)
+    (arguments '(#:configure-flags '("--with-external-libmspack")))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libmspack" ,libmspack)))
+    (home-page "http://www.cabextract.org.uk/")
+    (synopsis "Tool to unpack Cabinet archives")
+    (description "Extracts files out of Microsoft Cabinet (.cab) archives")
+    ;; Some source files specify gpl2+, lgpl2+, however COPYING is gpl3.
+    (license license:gpl3+)))
+
+(define-public xdelta
+  (package
+    (name "xdelta")
+    (version "3.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/jmacd/xdelta/archive/v"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "17g2pbbqy6h20qgdjq7ykib7kg5ajh8fwbsfgyjqg8pwg19wy5bm"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (snippet
+        ;; This file isn't freely distributable and has no effect on building.
+        '(delete-file "xdelta3/draft-korn-vcdiff.txt"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'enter-build-directory
+           (lambda _ (chdir "xdelta3")))
+         (add-before 'configure 'autoconf
+           (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
+    (home-page "http://xdelta.com")
+    (synopsis "Delta encoder for binary files")
+    (description "xdelta encodes only the differences between two binary files
+using the VCDIFF algorithm and patch file format described in RFC 3284.  It can
+also be used to apply such patches.  xdelta is similar to @command{diff} and
+@command{patch}, but is not limited to plain text and does not generate
+human-readable output.")
+    (license license:asl2.0)))
+
+(define-public lrzip
+  (package
+    (name "lrzip")
+    (version "0.630")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://ck.kolivas.org/apps/lrzip/lrzip-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "01ykxliqw4cavx9f2gawxfa9wf52cjy1qx28cnkrh6i3lfzzcq94"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(;; nasm is only required when building for 32-bit x86 platforms
+       ,@(if (string-prefix? "i686" (or (%current-target-system)
+                                        (%current-system)))
+             `(("nasm" ,nasm))
+             '())
+       ("perl" ,perl)))
+    (inputs
+     `(("bzip2" ,bzip2)
+       ("lzo" ,lzo)
+       ("zlib" ,zlib)))
+    (home-page "http://ck.kolivas.org/apps/lrzip/")
+    (synopsis "Large file compressor with a very high compression ratio")
+    (description "lrzip is a compression utility that uses long-range
+redundancy reduction to improve the subsequent compression ratio of
+larger files.  It can then further compress the result with the ZPAQ or
+LZMA algorithms for maximum compression, or LZO for maximum speed.  This
+choice between size or speed allows for either better compression than
+even LZMA can provide, or a higher speed than gzip while compressing as
+well as bzip2.")
+    (license (list license:gpl3+
+                   license:public-domain)))) ; most files in lzma/
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
 ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,16 +29,16 @@
 (define-public conkeror
  (package
    (name "conkeror")
-    (version "1.0pre1.20150730")
+    (version "1.0.3")
    (source (origin
              (method url-fetch)
              (uri
-               (string-append "http://repo.or.cz/w/conkeror.git/snapshot/"
-                              "a1f7e879b129df5cf14ea4ce80a9c1407380ed58"
-                              ".tar.gz")) ; tag: debian-1.0--pre-1+git150730-1
+               (string-append "http://repo.or.cz/conkeror.git/snapshot/"
+                              version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
              (sha256
               (base32
-                "1q45hc30733gz3ca2ixvw0rzzcbi7rlay7gx7kvzjv17a030nyk0"))))
+                "0ybmincxw3msnrfpby9gnckbq2x94c7fra2m66zham54cjc7mav3"))))
    (build-system gnu-build-system)
    (inputs `(("icecat" ,icecat)))
    (arguments
@@ -32,7 +32,7 @@
 (define-public conky
  (package
    (name "conky")
-    (version "1.10.0")
+    (version "1.10.3")
    (source
     (origin
       (method url-fetch)
@@ -40,10 +40,15 @@
                           version ".tar.gz"))
       (file-name (string-append name "-" version ".tar.gz"))
       (sha256
-        (base32 "1szq4ckfkvyabv5llf9nkdxipn7429sralsxyr7z0dyc3zwz74pk"))))
+        (base32 "1m9byrmpc2sprzk44v447yaqjzsvw230a0mlw7y1ngz3m3y44qs5"))))
    (build-system cmake-build-system)
    (arguments
     `(#:tests? #f ; there are no tests
+       #:configure-flags
+       '("-DRELEASE=true"
+         ;; XXX: it checks ncurses with pkg-config.
+         ;; TODO: add 'ncurses.pc' to the ncurses package.
+         "-DBUILD_NCURSES=false")
       #:phases
       (alist-cons-after
        'unpack 'add-freetype-to-search-path
@@ -67,6 +72,7 @@
       ("libx11" ,libx11)
       ("libxdamage" ,libxdamage)
       ("libxft" ,libxft)
+       ("libxinerama" ,libxinerama)
       ("lua" ,lua)))
    (native-inputs
     `(("pkg-config" ,pkg-config)))
@@ -0,0 +1,89 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;;
+;;; 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 connman)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix licenses)
+  #:use-module (guix utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages samba)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages vpn))
+
+(define-public connman
+  (package
+    (name "connman")
+    (version "1.32")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "mirror://kernel.org/linux/network/connman/"
+                            name "-" version ".tar.xz"))
+    (sha256
+     (base32
+      "0k4kw2j78gwxf0rq79a099qkzl6wi4v5i7rfs4rn0si0fd68d19i"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "--enable-nmcompat"
+             ;; "--enable-polkit"
+             "--enable-openconnect"
+             "--enable-openvpn"
+             "--enable-vpnc"
+             "--enable-pptp"
+             "--enable-l2tp"
+             (string-append
+              "--with-dbusconfdir=" (assoc-ref %outputs "out") "/etc")
+             (string-append
+              "--with-dbusdatadir=" (assoc-ref %outputs "out") "/share"))))
+    (native-inputs
+     `(("pkg-config", pkg-config)
+       ("python" ,python-2)))
+    (inputs
+     `(("dbus" ,dbus)
+       ("glib" ,glib)
+       ("gnutls" ,gnutls)
+       ("iptables" ,iptables)
+       ;; ("polkit" ,polkit) ; pkg-config cannot find polkit.pc
+       ("readline" ,readline)
+       ;; These inputs are needed for connman to include the interface to
+       ;; these technologies so IF they are installed they can be used.
+       ;; TODO: add neard, ofono
+       ("openconnect" ,openconnect)
+       ("openvpn" ,openvpn)
+       ("ppp", ppp)
+       ("vpnc" ,vpnc)
+       ("wpa-supplicant" ,wpa-supplicant)))
+    (home-page "https://01.org/connman")
+    (synopsis "Connection management daemon")
+    (description "Connman provides a daemon for managing Internet connections.
+The Connection Manager is designed to be slim and to use as few resources as
+possible. It is fully modular system that can be extended through plug-ins.
+The plug-in approach allows for easy adaption and modification for various use
+cases.  Connman implements DNS resolving and caching, DHCP clients for both
+IPv4 and IPv6, link-local IPv4 address handling and tethering (IP connection
+sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
+    (license gpl2)))
@@ -33,9 +33,7 @@
    (source
     (origin
       (method url-fetch)
-       (uri (string-append
-             "http://miller.emu.id.au/pmiller/software/cook/cook-" version
-             ".tar.gz"))
+       (uri "http://fossies.org/linux/misc/old/cook-2.34.tar.gz")
       (sha256
        (base32
         "104saqnqql1l7zr2pm3f718fdky3ds8j07c6xvwrs1rfkhrw58yw"))))
@@ -36,7 +36,7 @@
             (sha256
              (base32
               "0vi9q475h1rki53100zml75vxsykzyhrn70hidy41s5c2rc8r6bh"))
-             (patches (list (search-patch "cpio-CVE-2016-2037.patch")))))
+             (patches (search-patches "cpio-CVE-2016-2037.patch"))))
    (build-system gnu-build-system)
    (home-page "https://www.gnu.org/software/cpio/")
    (synopsis "Manage cpio and tar file archives")
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -120,6 +121,14 @@ may be either a libc package or #f.)"
                               "--disable-libquadmath"
                               "--disable-decimal-float" ;would need libc
                               "--disable-libcilkrts"
+
+                               ;; When target is any OS other than 'none' these
+                               ;; libraries will fail if there is no libc
+                               ;; present. See
+                               ;; <https://lists.gnu.org/archive/html/guix-devel/2016-02/msg01311.html>
+                               "--disable-libitm"
+                               "--disable-libvtv"
+                               "--disable-libsanitizer"
                               )))

                 ,(if libc
@@ -166,34 +175,39 @@ may be either a libc package or #f.)"
              `(alist-cons-before
                'configure 'set-cross-path
                (lambda* (#:key inputs #:allow-other-keys)
-                  ;; Add the cross Linux headers to CROSS_CPATH, and remove them
+                  ;; Add the cross kernel headers to CROSS_CPATH, and remove them
                  ;; from CPATH.
                  (let ((libc  (assoc-ref inputs "libc"))
-                        (linux (assoc-ref inputs "xlinux-headers")))
+                        (kernel (assoc-ref inputs "xkernel-headers")))
                    (define (cross? x)
                      ;; Return #t if X is a cross-libc or cross Linux.
                      (or (string-prefix? libc x)
-                          (string-prefix? linux x)))
-
-                    (setenv "CROSS_CPATH"
-                            (string-append libc "/include:"
-                                           linux "/include"))
+                          (string-prefix? kernel x)))
+                    (let ((cpath (string-append
+                                  libc "/include"
+                                  ":" kernel "/include")))
+                      (for-each (cut setenv <> cpath)
+                                '("CROSS_C_INCLUDE_PATH"
+                                  "CROSS_CPLUS_INCLUDE_PATH"
+                                  "CROSS_OBJC_INCLUDE_PATH"
+                                  "CROSS_OBJCPLUS_INCLUDE_PATH")))
                    (setenv "CROSS_LIBRARY_PATH"
-                            (string-append libc "/lib"))
-
-                    (let ((cpath   (search-path-as-string->list
-                                    (getenv "C_INCLUDE_PATH")))
-                          (libpath (search-path-as-string->list
-                                    (getenv "LIBRARY_PATH"))))
-                      (setenv "CPATH"
-                              (list->search-path-as-string
-                               (remove cross? cpath) ":"))
-                      (for-each unsetenv
-                                '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"))
-                      (setenv "LIBRARY_PATH"
-                              (list->search-path-as-string
-                               (remove cross? libpath) ":"))
-                      #t)))
+                            (string-append libc "/lib:"
+                                           kernel "/lib")) ;for Hurd's libihash
+                    (for-each
+                     (lambda (var)
+                       (and=> (getenv var)
+                              (lambda (value)
+                                (let* ((path (search-path-as-string->list value))
+                                       (native-path (list->search-path-as-string
+                                                     (remove cross? path) ":")))
+                                  (setenv var native-path)))))
+                              '("C_INCLUDE_PATH"
+                                "CPLUS_INCLUDE_PATH"
+                                "OBJC_INCLUDE_PATH"
+                                "OBJCPLUS_INCLUDE_PATH"
+                                "LIBRARY_PATH"))
+                    #t))
                ,phases)
              phases)))))))

@@ -201,7 +215,7 @@ may be either a libc package or #f.)"
  "Return GCC patches needed for TARGET."
  (cond ((string-prefix? "xtensa-" target)
         ;; Patch by Qualcomm needed to build the ath9k-htc firmware.
-         (list (search-patch "ath9k-htc-firmware-gcc.patch")))
+         (search-patches "ath9k-htc-firmware-gcc.patch"))
        (else '())))

 (define* (cross-gcc target
@@ -250,18 +264,28 @@ GCC that does not target a libc; otherwise, target that libc."
                               (alist-delete "libc" %final-inputs))))
           (if libc
               `(("libc" ,libc)
-                 ("xlinux-headers"                ;the target headers
+                 ("xkernel-headers"                ;the target headers
                  ,@(assoc-ref (package-propagated-inputs libc)
-                               "linux-headers"))
+                               "kernel-headers"))
                 ,@inputs)
               inputs))))

    (inputs '())

    ;; Only search target inputs, not host inputs.
+    ;; Note: See <http://bugs.gnu.org/22186> for why not 'CPATH'.
    (search-paths
     (list (search-path-specification
-            (variable "CROSS_CPATH")
+            (variable "CROSS_C_INCLUDE_PATH")
+            (files '("include")))
+           (search-path-specification
+            (variable "CROSS_CPLUS_INCLUDE_PATH")
+            (files '("include")))
+           (search-path-specification
+            (variable "CROSS_OBJC_INCLUDE_PATH")
+            (files '("include")))
+           (search-path-specification
+            (variable "CROSS_OBJCPLUS_INCLUDE_PATH")
            (files '("include")))
           (search-path-specification
            (variable "CROSS_LIBRARY_PATH")
@@ -308,23 +332,32 @@ XBINUTILS and the cross tool chain."
           ;; itself.
           #:implicit-cross-inputs? #f

+           ;; We need SRFI 26.
+           #:modules ((guix build gnu-build-system)
+                      (guix build utils)
+                      (srfi srfi-26))
+
           ,@(package-arguments glibc))
       ((#:configure-flags flags)
        `(cons ,(string-append "--host=" target)
               ,flags))
       ((#:phases phases)
        `(alist-cons-before
-          'configure 'set-cross-linux-headers-path
+          'configure 'set-cross-kernel-headers-path
          (lambda* (#:key inputs #:allow-other-keys)
-            (let ((linux (assoc-ref inputs "linux-headers")))
-              (setenv "CROSS_CPATH"
-                      (string-append linux "/include"))
+            (let* ((kernel (assoc-ref inputs "kernel-headers"))
+                   (cpath (string-append kernel "/include")))
+              (for-each (cut setenv <> cpath)
+                        '("CROSS_C_INCLUDE_PATH"
+                          "CROSS_CPLUS_INCLUDE_PATH"
+                          "CROSS_OBJC_INCLUDE_PATH"
+                          "CROSS_OBJCPLUS_INCLUDE_PATH"))
              #t))
          ,phases))))

-    ;; Shadow the native "linux-headers" because glibc's recipe expects the
-    ;; "linux-headers" input to point to the right thing.
-    (propagated-inputs `(("linux-headers" ,xlinux-headers)))
+    ;; Shadow the native "kernel-headers" because glibc's recipe expects the
+    ;; "kernel-headers" input to point to the right thing.
+    (propagated-inputs `(("kernel-headers" ,xlinux-headers)))

    ;; FIXME: 'static-bash' should really be an input, not a native input, but
    ;; to do that will require building an intermediate cross libc.
@@ -352,12 +385,6 @@ XBINUTILS and the cross tool chain."
                               (package-supported-systems xgcc)
                               '("mips64el-linux" "i686-linux"))))))

-(define-public xgcc-avr
-  ;; AVR cross-compiler, used to build AVR-Libc.
-  (let ((triplet "avr"))
-    (cross-gcc triplet
-               (cross-binutils triplet))))
-
 (define-public xgcc-xtensa
  ;; Bare-bones Xtensa cross-compiler, used to build the Atheros firmware.
  (cross-gcc "xtensa-elf"))
@@ -1,6 +1,9 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox>
+;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,7 +22,19 @@

 (define-module (gnu packages crypto)
  #:use-module (gnu packages)
-  #:use-module (guix licenses)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages libbsd)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages nettle)
+  #:use-module (gnu packages password-utils)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages serialization)
+  #:use-module (gnu packages tls)
+  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu))
@@ -27,7 +42,7 @@
 (define-public libsodium
  (package
    (name "libsodium")
-    (version "1.0.0")
+    (version "1.0.10")
    (source (origin
            (method url-fetch)
            (uri (list (string-append
@@ -38,11 +53,173 @@
                        "releases/old/libsodium-" version ".tar.gz")))
            (sha256
             (base32
-              "19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff"))))
+              "1gn45g956lyz8l6iq187yc6l627vyivyp8qc5dkr6dnhdnlqddvi"))))
    (build-system gnu-build-system)
    (synopsis "Portable NaCl-based crypto library")
    (description
     "Sodium is a new easy-to-use high-speed software library for network
 communication, encryption, decryption, signatures, etc.")
-    (license isc)
+    (license license:isc)
    (home-page "http://libsodium.org")))
+
+(define-public signify
+  (package
+    (name "signify")
+    (version "18")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/aperezdc/signify/"
+                                  "archive/v" version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "00lbjiy0gv1b1fvrd6ni4qah96ah4qf6aig05vd2hji4vs00jgwg"))))
+    (build-system gnu-build-system)
+    ;; TODO Build with libwaive (described in README.md), to implement something
+    ;; like OpenBSD's pledge().
+    (arguments
+     `(#:tests? #f ; no test suite
+       #:make-flags
+       (list "CC=gcc"
+             (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libbsd" ,libbsd)))
+    (synopsis "Create and verify cryptographic signatures")
+    (description "The signify utility creates and verifies cryptographic
+signatures using the elliptic curve Ed25519.  This is a Linux port of the
+OpenBSD tool of the same name.")
+    (home-page "https://github.com/aperezdc/signify")
+    ;; This package includes third-party code that was originally released under
+    ;; various non-copyleft licenses. See the source files for clarification.
+    (license (list license:bsd-3 license:bsd-4 license:expat license:isc
+                   license:public-domain (license:non-copyleft
+                                          "file://base64.c"
+                                          "See base64.c in the distribution for
+                                           the license from IBM.")))))
+
+
+(define-public opendht
+  (package
+    (name "opendht")
+    (version "0.6.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://github.com/savoirfairelinux/" name
+         "/archive/" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (delete-file-recursively "src/argon2")
+           (substitute* "src/Makefile.am"
+             (("./argon2/libargon2.la") "")
+             (("SUBDIRS = argon2") ""))
+           (substitute* "src/crypto.cpp"
+             (("argon2/argon2.h") "argon2.h"))
+           (substitute* "configure.ac"
+             (("src/argon2/Makefile") ""))))
+       (sha256
+        (base32
+         "09yvkmbqbym3b5md4n96qc1s9sf2n8ji404hagih45rmsj49599x"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gnutls" ,gnutls)
+       ("nettle" ,nettle)
+       ("msgpack" ,msgpack)
+       ("readline" ,readline)
+       ("argon2" ,argon2)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("pkg-config" ,pkg-config)
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
+    (arguments
+     `(#:configure-flags '("--disable-tools" "--disable-python")
+       #:phases (modify-phases %standard-phases
+                  (add-before 'configure 'autoconf
+                    (lambda _
+                      (zero? (system* "autoreconf" "-vfi")))))))
+    (home-page "https://github.com/savoirfairelinux/opendht/")
+    (synopsis "Distributed Hash Table (DHT) library")
+    (description "OpenDHT is a Distributed Hash Table (DHT) library.  It may
+be used to manage peer-to-peer network connections as needed for real time
+communication.")
+    (license license:gpl3)))
+
+(define rlog
+  (package
+    (name "rlog")
+    (version "1.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "http://rlog.googlecode.com/files/rlog-"
+                       version ".tar.gz"))
+       (sha256
+        (base32
+         "0y9zg0pd7vmnskwac1qdyzl282z7kb01nmn57lsg2mjdxgnywf59"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-before 'configure 'patch-/bin/sh
+                    (lambda _
+                      (substitute* "docs/Makefile.in"
+                        (("/bin/sh") "sh")))))))
+    (home-page "http://www.arg0.net/rlog")
+    (synopsis "Flexible message logging library for EncFS")
+    (description
+     "RLog provides message logging for EncFS.  It is no longer maintained.")
+    (license license:lgpl2.1+)))
+
+(define-public encfs
+  (package
+    (name "encfs")
+    (version "1.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://github.com/vgough/encfs/releases/download/v"
+                       version "/encfs-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1lfmcsk187qr6ahy8c8959p7jrk9d5rd9kcsx572850ca3zmf0la"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--with-boost-serialization=boost_wserialization"
+                           "--with-boost-filesystem=boost_filesystem")
+       #:phases (modify-phases %standard-phases
+                  (add-before 'configure 'autoconf
+                    (lambda _
+                      (zero? (system* "autoreconf" "-vfi")))))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gettext" ,gnu-gettext)
+       ("libtool" ,libtool)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("boost" ,boost)
+       ("fuse" ,fuse)
+       ("openssl" ,openssl)
+       ("rlog" ,rlog)))
+    (home-page "https://vgough.github.io/encfs")
+    (synopsis "Encrypted virtual file system")
+    (description
+     "EncFS creates a virtual encrypted file system in user-space.  Each file
+created under an EncFS mount point is stored as a separate encrypted file on
+the underlying file system.  Like most encrypted file systems, EncFS is meant
+to provide security against off-line attacks, such as a drive falling into
+the wrong hands.")
+    (license (list license:lgpl3+                 ;encfs library
+                   license:gpl3+))))              ;command-line tools
@@ -1,7 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,6 +27,10 @@
  #:use-module (gnu packages)
  #:use-module (gnu packages avahi)
  #:use-module (gnu packages compression)
+  #:use-module (gnu packages libusb)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages scanner)
  #:use-module (gnu packages image)
  #:use-module (gnu packages fonts) ;font-dejavu
  #:use-module (gnu packages fontutils)
@@ -130,20 +135,17 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
       ;; cups-filters package.
       #:tests? #f
       #:phases
-       (alist-cons-before
-        'configure
-        'patch-makedefs
-        (lambda _
-          (substitute* "Makedefs.in"
-            (("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@")
-            (("/bin/sh") (which "sh"))))
-        (alist-cons-before
-         'build
-         'patch-tests
-         (lambda _
-           (substitute* "test/ippserver.c"
-             (("#  else /\\* HAVE_AVAHI \\*/") "#elif defined(HAVE_AVAHI)")))
-         %standard-phases))))
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-makedefs
+           (lambda _
+             (substitute* "Makedefs.in"
+               (("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@")
+               (("/bin/sh") (which "sh")))))
+         (add-before 'build 'patch-tests
+           (lambda _
+             (substitute* "test/ippserver.c"
+               (("#  else /\\* HAVE_AVAHI \\*/")
+                "#elif defined(HAVE_AVAHI)")))))))
    (native-inputs
     `(("pkg-config" ,pkg-config)))
    (inputs
@@ -297,3 +299,113 @@ device-specific programs to convert and print many types of files.")
       ("gnutls" ,gnutls)
       ("cups-filters" ,cups-filters)
       ("zlib"  ,zlib)))))
+
+(define-public hplip
+  (package
+    (name "hplip")
+    (version "3.16.7")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/hplip/hplip/" version
+                                  "/hplip-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1hpzyf9ifs0vilsbwxcgpv8g9557p1x8w5qwgz5l0avgcd10dzlx"))))
+    (build-system gnu-build-system)
+    (home-page "http://hplipopensource.com/")
+    (synopsis "HP Printer Drivers")
+    (description "Hewlett-Packard Printer Drivers and PPDs.")
+
+    ;; The 'COPYING' file lists directories where each of these 3 licenses
+    ;; applies.
+    (license (list license:gpl2+ license:bsd-3 license:expat))
+
+    ;; TODO install apparmor profile files eventually.
+    (arguments
+     `(#:configure-flags
+       `("--disable-network-build"
+         ,(string-append "--prefix=" (assoc-ref %outputs "out"))
+         ,(string-append "--sysconfdir=" (assoc-ref %outputs "out") "/etc")
+         ;; Disable until mime.types merging works (FIXME).
+         "--disable-fax-build"
+         "--enable-hpcups-install"
+         "--enable-new-hpcups"
+         "--enable-cups_ppd_install"
+         "--enable-cups_drv_install"
+         ;; TODO add foomatic drv install eventually.
+         ;; TODO --enable-policykit eventually.
+         ,(string-append "--with-cupsfilterdir="
+                         (assoc-ref %outputs "out") "/lib/cups/filter")
+         ,(string-append "--with-cupsbackenddir="
+                         (assoc-ref %outputs "out") "/lib/cups/backend")
+         ,(string-append "--with-icondir="
+                         (assoc-ref %outputs "out") "/share/applications")
+         ,(string-append "--with-systraydir="
+                         (assoc-ref %outputs "out") "/etc/xdg"))
+
+       #:imported-modules ((guix build python-build-system)
+                           ,@%gnu-build-system-modules)
+       #:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  ((guix build python-build-system) #:prefix python:))
+
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'fix-hard-coded-file-names
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out"))
+                            ;; FIXME: use merged ppds (I think actually only
+                            ;; drvs need to be merged).
+                            (cupsdir (assoc-ref inputs "cups-minimal")))
+                        (substitute* "base/g.py"
+                          (("'/usr/share;[^']*'")
+                           (string-append "'" cupsdir "/share'"))
+                          (("'/etc/hp/hplip.conf'")
+                           (string-append "'" out
+                                          "/etc/hp/hplip.conf" "'")))
+
+                        (substitute* "Makefile.in"
+                          (("[[:blank:]]check-plugin\\.py[[:blank:]]") " ")
+                          ;; FIXME Use beginning-of-word in regexp.
+                          (("[[:blank:]]plugin\\.py[[:blank:]]") " ")
+                          (("/usr/include/libusb-1.0")
+                           (string-append (assoc-ref inputs "libusb")
+                                          "/include/libusb-1.0"))
+                          (("^\tinstall-dist_hplip_stateDATA")
+                           ;; Remove dependencies on
+                           ;; 'install-dist_hplip_stateDATA' so we don't bail
+                           ;; out while trying to create /var/lib/hplip.
+                           "\t")
+                          (("hplip_confdir = /etc/hp")
+                           ;; This is only used for installing the default config.
+                           (string-append "hplip_confdir = " out
+                                          "/etc/hp"))
+                          (("halpredir = /usr/share/hal/fdi/preprobe/10osvendor")
+                           ;; Note: We don't use hal.
+                           (string-append "halpredir = " out
+                                          "/share/hal/fdi/preprobe/10osvendor"))
+                          (("rulesdir = /etc/udev/rules.d")
+                           ;; udev rules will be merged by base service.
+                           (string-append "rulesdir = " out
+                                          "/lib/udev/rules.d"))
+                          (("rulessystemdir = /usr/lib/systemd/system")
+                           ;; We don't use systemd.
+                           (string-append "rulessystemdir = " out
+                                          "/lib/systemd/system"))
+                          (("/etc/sane.d")
+                           (string-append out "/etc/sane.d"))))))
+
+                  ;; Wrap bin/* so that the Python libs are found.
+                  (add-after 'install 'wrap-binaries
+                    (assoc-ref python:%standard-phases 'wrap)))))
+
+    ;; Python3 support is available starting from hplip@3.15.2.
+    (inputs `(("libjpeg" ,libjpeg)
+              ("cups-minimal" ,cups-minimal)
+              ("libusb" ,libusb)
+              ("sane-backends" ,sane-backends)
+              ("dbus" ,dbus)
+              ("python-wrapper" ,python-wrapper)
+              ("python" ,python)
+              ;; TODO: Make hp-setup find python-dbus.
+              ("python-dbus" ,python-dbus)))
+    (native-inputs `(("pkg-config" ,pkg-config)))))
@@ -34,7 +34,7 @@
   (source (origin
            (method url-fetch)
            (uri (list (string-append
-                        "http://cyrusimap.org/releases/cyrus-sasl-"
+                        "https://cyrusimap.org/releases/cyrus-sasl-"
                        version ".tar.gz")
                       (string-append
                        "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-"
@@ -63,4 +63,4 @@ library makes supporting various SASL mechanisms easy for both client and
 server writers.")
   (license (license:non-copyleft "file://COPYING"
                                  "See COPYING in the distribution."))
-   (home-page "http://cyrusimap.web.cmu.edu/index.php")))
+   (home-page "http://cyrusimap.web.cmu.edu")))
@@ -1,14 +1,15 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2012, 2014, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
-;;; Copyright © 2014 David Thompson <davet@gnu.org>
+;;; Copyright © 2014, 2016 David Thompson <davet@gnu.org>
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 Nils Gillmann <niasterisk@grrlz.net>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,8 +28,12 @@

 (define-module (gnu packages databases)
  #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages avahi)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages boost)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages glib)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages language)
  #:use-module (gnu packages linux)
@@ -40,14 +45,17 @@
  #:use-module (gnu packages check)
  #:use-module (gnu packages algebra)
  #:use-module (gnu packages curl)
+  #:use-module (gnu packages cyrus-sasl)
  #:use-module (gnu packages gnupg)
  #:use-module (gnu packages python)
  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages rdf)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages jemalloc)
  #:use-module ((guix licenses)
-                #:select (gpl2 gpl3+ lgpl2.1+ lgpl3+ x11-style non-copyleft
+                #:select (gpl2 gpl3 gpl3+ lgpl2.1+ lgpl3+ x11-style non-copyleft
                          bsd-2 bsd-3 public-domain))
  #:use-module (guix packages)
  #:use-module (guix download)
@@ -58,17 +66,62 @@
  #:use-module (srfi srfi-26)
  #:use-module (ice-9 match))

+(define-public 4store
+  (package
+    (name "4store")
+    (version "1.1.6")
+    (source (origin
+      (method url-fetch)
+      (uri (string-append "https://github.com/garlik/4store/archive/v"
+                          version ".tar.gz"))
+      (file-name (string-append name "-" version ".tar.gz"))
+      (sha256
+       (base32 "004fmcf1w75zhc1x3zc6kc97j4jqn2v5nhk6yb3z3cpfrhzi9j50"))
+      (patches (list (search-patch "4store-fix-buildsystem.patch")))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("perl" ,perl)
+       ("python" ,python-2)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gettext" ,gnu-gettext)
+       ("libtool" ,libtool)
+       ("pcre" ,pcre "bin")                       ;for 'pcre-config'
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("glib" ,glib)
+       ("rasqal" ,rasqal)
+       ("libxml2" ,libxml2)
+       ("raptor2" ,raptor2)
+       ("readline" ,readline)
+       ("avahi" ,avahi)
+       ("cyrus-sasl" ,cyrus-sasl)
+       ("openssl" ,openssl)
+       ("util-linux" ,util-linux)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'generate-configure
+           (lambda _
+             (zero? (system* "./autogen.sh")))))))
+    ;; http://www.4store.org has been down for a while now.
+    (home-page "https://github.com/garlik/4store")
+    (synopsis "Clustered RDF storage and query engine")
+    (description "4store is a RDF/SPARQL store written in C, supporting
+either single machines or networked clusters.")
+      (license gpl3+)))
+
 (define-public gdbm
  (package
    (name "gdbm")
-    (version "1.11")
+    (version "1.12")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/gdbm/gdbm-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "1hz3jgh3pd4qzp6jy0l8pd8x01g9abw7csnrlnj1a2sxy122z4cd"))))
+                "1smwz4x5qa4js0zf1w3asq6z7mh20zlgwbh2bk5dczw6xrk22yyr"))))
    (arguments `(#:configure-flags '("--enable-libgdbm-compat")))
    (build-system gnu-build-system)
    (home-page "http://www.gnu.org/software/gdbm/")
@@ -83,18 +136,20 @@ and provides interfaces to the traditional file format.")
 (define-public bdb
  (package
    (name "bdb")
-    (version "5.3.21")
+    (version "6.2.23")
    (source (origin
              (method url-fetch)
-              (uri (string-append "http://download.oracle.com/berkeley-db/db-" version
-                                  ".tar.gz"))
-              (sha256 (base32
-                       "1f2g2612lf8djbwbwhxsvmffmf9d7693kh2l20195pqp0f9jmnfx"))))
+              (uri (string-append "http://download.oracle.com/berkeley-db/db-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"))))
    (build-system gnu-build-system)
    (outputs '("out"                             ; programs, libraries, headers
               "doc"))                           ; 94 MiB of HTML docs
    (arguments
     '(#:tests? #f                            ; no check target available
+       #:disallowed-references ("doc")
       #:phases
       (alist-replace
        'configure
@@ -112,6 +167,9 @@ and provides interfaces to the traditional file format.")
                      (string-append "CONFIG_SHELL=" (which "bash"))
                      (string-append "SHELL=" (which "bash"))

+                      ;; Remove 7 MiB of .a files.
+                      "--disable-static"
+
                      ;; The compatibility mode is needed by some packages,
                      ;; notably iproute2.
                      "--enable-compat185"
@@ -130,10 +188,22 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
    (home-page
     "http://www.oracle.com/us/products/database/berkeley-db/overview/index.html")))

+(define-public bdb-5.3
+  (package (inherit bdb)
+    (name "bdb")
+    (version "5.3.28")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://download.oracle.com/berkeley-db/db-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"))))))
+
 (define-public mysql
  (package
    (name "mysql")
-    (version "5.7.11")
+    (version "5.7.13")
    (source (origin
             (method url-fetch)
             (uri (list (string-append
@@ -143,9 +213,10 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
                        (string-append
                          "http://downloads.mysql.com/archives/get/file/"
                          name "-" version ".tar.gz")))
+             (patches (search-patches "mysql-fix-failing-test.patch"))
             (sha256
              (base32
-               "03hzd2ikabxhh5ch2yvml2nks2wpv3qbkqmx3520in6khypwgy2l"))))
+               "11qbib1xpy0zkki7j9ip17hks5kp5zgpcj7x8gy3a4m66lb1mgsh"))))
    (build-system cmake-build-system)
    (arguments
     '(#:configure-flags
@@ -206,7 +277,7 @@ Language.")
 (define-public mariadb
  (package
    (name "mariadb")
-    (version "10.1.12")
+    (version "10.1.16")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://downloads.mariadb.org/f/"
@@ -214,7 +285,7 @@ Language.")
                                  name "-" version ".tar.gz"))
              (sha256
               (base32
-                "1rzlc2ns84x540asbkgdp9562haxhlszfpdqh64i9pz4q1m4cpvr"))))
+                "14s3wq1c25n62n75hkixl8n7cni4m73w055nsx4czm655k33bjv7"))))
    (build-system cmake-build-system)
    (arguments
     '(#:configure-flags
@@ -274,14 +345,14 @@ as a drop-in replacement of MySQL.")
 (define-public postgresql
  (package
    (name "postgresql")
-    (version "9.5.1")
+    (version "9.5.3")
    (source (origin
              (method url-fetch)
-              (uri (string-append "http://ftp.postgresql.org/pub/source/v"
+              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                  version "/postgresql-" version ".tar.bz2"))
              (sha256
               (base32
-                "1ljvijaja5zy4i5b1450drbj8m3fcm3ly1zzaakp75x30s2rsc3b"))))
+                "1d500d2qsdzysnis6qi84xchnz5xh8kx8sjfmkbsijwaqlfw11bk"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
@@ -328,7 +399,7 @@ pictures, sounds, or video.")
                                      (assoc-ref %build-inputs "bash:include")
                                      "/include/bash"))))

-    (native-inputs `(("emacs" ,emacs-no-x)
+    (native-inputs `(("emacs" ,emacs-minimal)
                     ("bc" ,bc)
                     ("bash:include" ,bash "include")
                     ("libuuid" ,util-linux)))
@@ -347,10 +418,71 @@ types are supported, as is encryption.")
    (license gpl3+)
    (home-page "http://www.gnu.org/software/recutils/")))

+(define-public sparql-query
+  (package
+    (name "sparql-query")
+    (version "1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/tialaramex/"
+                                  name "/archive/" version ".tar.gz"))
+              (sha256
+               (base32 "0yq3k20472rv8npcc420q9ab6idy584g5y0q501d360k5q0ggr8w"))
+              (file-name (string-append name "-" version ".tar.gz"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("readline" ,readline)
+       ("ncurses" ,ncurses)
+       ("glib" ,glib)
+       ("libxml2" ,libxml2)
+       ("curl" ,curl)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     `(#:make-flags '("CC=gcc")
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         ;; The Makefile uses git to obtain versioning information. This phase
+         ;; substitutes the git invocation with the package version.
+         (add-after 'unpack 'remove-git-dependency
+           (lambda _
+             (substitute* "Makefile"
+               (("^gitrev :=.*$")
+                (string-append "gitrev = \"v" ,version "\"")))))
+         ;; The install phase of the Makefile assumes $PREFIX/usr/local/bin.
+         ;; This replacement does the same thing, except for using $PREFIX/bin
+         ;; instead.
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin")))
+               (install-file "sparql-query" bin)
+               (system* "ln" "--symbolic"
+                        (string-append bin "/sparql-query")
+                        (string-append bin "/sparql-update")))))
+         (replace 'check
+           (lambda* (#:key make-flags #:allow-other-keys)
+             (and
+              (zero? (apply system* "make" `(,@make-flags "scan-test")))
+              (zero? (system "./scan-test"))))))))
+    (home-page "https://github.com/tialaramex/sparql-query/")
+    (synopsis "Command-line tool for accessing SPARQL endpoints over HTTP")
+    (description "Sparql-query is a command-line tool for accessing SPARQL
+endpoints over HTTP.  It has been intentionally designed to 'feel' similar to
+tools for interrogating SQL databases.  For example, you can enter a query over
+several lines, using a semi-colon at the end of a line to indicate the end of
+your query.  It also supports readline so that you can more easily recall and
+edit previous queries, even across sessions.  It can be used non-interactively,
+for example from a shell script.")
+    ;; Some files (like scan-sparql.c) contain a GPLv3+ license header, while
+    ;; others (like sparql-query.c) contain a GPLv2+ license header.
+    (license (list gpl3+))))
+
 (define-public sqlite
  (package
   (name "sqlite")
-   (version "3.10.0")
+   (version "3.12.2")
   (source (origin
            (method url-fetch)
            ;; TODO: Download from sqlite.org once this bug :
@@ -381,7 +513,7 @@ types are supported, as is encryption.")
                   ))
            (sha256
             (base32
-              "0hhhv6si0pyf5i8bv7a71953m0b4gk6s3j2h09caf7vif0njkk23"))))
+              "1fwss0i2lixv39b27gkqiibdd2syym90wh3qbiaxnfgxk867f07x"))))
   (build-system gnu-build-system)
   (inputs `(("readline" ,readline)))
   (arguments
@@ -402,14 +534,14 @@ is in the public domain.")
 (define-public tdb
  (package
    (name "tdb")
-    (version "1.3.8")
+    (version "1.3.9")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://www.samba.org/ftp/tdb/tdb-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "1cg6gmpgn36dd4bsp3j9k3hyrm87d8hdigqyyqxw5jga4w2aq186"))))
+                "1ll4q17scax1arg12faj8p25jq1f7q9irc3pwla0ziymwqkgf0bi"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases (alist-replace
@@ -439,7 +571,7 @@ extremely small.")
 (define-public perl-dbi
  (package
    (name "perl-dbi")
-    (version "1.631")
+    (version "1.636")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -447,11 +579,11 @@ extremely small.")
                    version ".tar.gz"))
              (sha256
               (base32
-                "04fmrnchhwi7jx4niaiv93vmi343hdm3xj04w9zr2m9hhqh782np"))))
+                "0v37vnr5p0bx396cj0lb5kb69jbryq2mspp602hbgd04gklxqzcg"))))
    (build-system perl-build-system)
    (synopsis "Database independent interface for Perl")
    (description "This package provides an database interface for Perl.")
-    (home-page "http://search.cpan.org/~timb/DBI-1.631/DBI.pm")
+    (home-page "http://search.cpan.org/dist/DBI")
    (license (package-license perl))))

 (define-public perl-dbix-class
@@ -633,21 +765,22 @@ columns, primary keys, unique constraints and relationships.")
       ("postgresql" ,postgresql)))
    (home-page "http://search.cpan.org/dist/DBD-Pg")
    (synopsis "DBI PostgreSQL interface")
-    (description "")
+    (description "This package provides a PostgreSQL driver for the Perl5
+@dfn{Database Interface} (DBI).")
    (license (package-license perl))))

 (define-public perl-dbd-mysql
  (package
    (name "perl-dbd-mysql")
-    (version "4.033")
+    (version "4.035")
    (source
     (origin
       (method url-fetch)
-       (uri (string-append "mirror://cpan/authors/id/C/CA/CAPTTOFU/"
+       (uri (string-append "mirror://cpan/authors/id/M/MI/MICHIELB/"
                           "DBD-mysql-" version ".tar.gz"))
       (sha256
        (base32
-         "0769xakykps0cx368g4vaips4w3bjk383rianiavq7sq6g6bp66c"))))
+         "0dqrnrk8yjl06xl8hld5wyalk77z0h9j5h1gdk4z9g0nx9js7v5p"))))
    (build-system perl-build-system)
    ;; Tests require running MySQL server
    (arguments `(#:tests? #f))
@@ -764,14 +897,15 @@ valid SQL query.")
 (define-public unixodbc
  (package
   (name "unixodbc")
-   (version "2.3.2")
+   (version "2.3.4")
   (source (origin
            (method url-fetch)
            (uri
             (string-append
-              "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-" version ".tar.gz"))
+              "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-"
+              version ".tar.gz"))
            (sha256
-             (base32 "16jw5fq7wgfky6ak1h2j2pqx99jivsdl4q8aq6immpr55xs5jd4w"))))
+             (base32 "0f8y88rcc2akjvjv5y66yx7k0ms9h1s0vbcfy25j93didflhj59f"))))
   (build-system gnu-build-system)
   (synopsis "Data source abstraction library")
   (description "Unixodbc is a library providing an API with which to access
@@ -810,14 +944,14 @@ similar to BerkeleyDB, LevelDB, etc.")
 (define-public redis
  (package
    (name "redis")
-    (version "3.0.4")
+    (version "3.2.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "http://download.redis.io/releases/redis-"
                                  version".tar.gz"))
              (sha256
               (base32
-                "1kqjc4qrasadgnl3cg71x3g5qpw2rilyk4pwl151698rb2nr0pm3"))))
+                "0ql7zp061xr66a1dzpa6a0ijm8zm133dd364va7q5h8avkrim7wq"))))
    (build-system gnu-build-system)
    (arguments
     '(#:tests? #f ; tests related to master/slave and replication fail
@@ -860,3 +994,73 @@ sets, bitmaps and hyperloglogs.")
 and B+ Tree data storage models.  It is a fast key-value lightweight
 database and supports many programming languages.  It is a NoSQL database.")
    (license gpl3+)))
+
+(define-public wiredtiger
+  (package
+    (name "wiredtiger")
+    (version "2.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://source.wiredtiger.com/releases/wiredtiger-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "1qh7y5paisdxq19jgg81ld7i32lz920n5k30hdpxnr8ll9c4hgjr"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags '("--enable-lz4" "--enable-zlib")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'disable-test/fops
+           (lambda _
+             ;; XXX: timed out after 3600 seconds of silence
+             (substitute* "Makefile"
+               (("test/fops") ""))
+             #t)))))
+    (inputs
+     `(("lz4" ,lz4)
+       ("zlib" ,zlib)))
+    (home-page "http://source.wiredtiger.com/")
+    (synopsis "NoSQL data engine")
+    (description
+     "WiredTiger is an extensible platform for data management.  It supports
+row-oriented storage (where all columns of a row are stored together),
+column-oriented storage (where columns are stored in groups, allowing for
+more efficient access and storage of column subsets) and log-structured merge
+trees (LSM), for sustained throughput under random insert workloads.")
+    (license gpl3) ; or GPL-2
+    ;; configure.ac: WiredTiger requires a 64-bit build.
+    (supported-systems '("x86_64-linux" "mips64el-linux"))))
+
+(define-public perl-db-file
+ (package
+  (name "perl-db-file")
+  (version "1.838")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "mirror://cpan/authors/id/P/PM/PMQS/DB_File-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "0yp5d5zr8dk9g6xdh7ygi5bq63q7nxvhd58dk2i3ki4nb7yv2yh9"))))
+  (build-system perl-build-system)
+  (inputs `(("bdb" ,bdb)))
+  (native-inputs `(("perl-test-pod" ,perl-test-pod)))
+  (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-before
+                   'configure 'modify-config.in
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (substitute* "config.in"
+                       (("/usr/local/BerkeleyDB") (assoc-ref inputs "bdb")))
+                     #t)))))
+  (home-page "http://search.cpan.org/dist/DB_File")
+  (synopsis
+    "Perl5 access to Berkeley DB version 1.x")
+  (description
+    "The DB::File module provides Perl bindings to the Berkeley DB version 1.x.")
+  (license (package-license perl))))
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -70,3 +71,24 @@ probing.  This method is space-efficient -- there is no pointer overhead --
 and time-efficient for good hash functions.")
    (home-page "https://github.com/sparsehash/sparsehash")
    (license license:bsd-3)))
+
+(define-public ssdeep
+  (package
+    (name "ssdeep")
+    (version "2.13")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/ssdeep/"
+                                  name "-" version "/"
+                                  name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f"))))
+    (build-system gnu-build-system)
+    (home-page "http://ssdeep.sourceforge.net")
+    (synopsis "Context-triggered piecewise hashing algorithm")
+    (description "ssdeep computes and matches context triggered piecewise
+hashes (CTPH), also called fuzzy checksums.  It can identify similar files
+that have sequences of identical bytes in the same order, even though bytes
+in between these sequences may be different in both content and length.")
+    (license license:gpl2+)))
@@ -52,13 +52,13 @@ clients.")
 (define-public vdirsyncer
  (package
    (name "vdirsyncer")
-    (version "0.9.2")
+    (version "0.11.3")
    (source (origin
             (method url-fetch)
-             (uri (pypi-uri "vdirsyncer" version))
+             (uri (pypi-uri name version))
             (sha256
              (base32
-               "1g1107cz4sk41d2z6k6pn9n2fzd26m72j8aj33zn483vfvmyrc4q"))))
+               "10majl58vdpxgbddjqgwblvl7akvvr4c2c8iaxnf3kgyh01jq6k9"))))
    (build-system python-build-system)
    (arguments
      `(#:phases (modify-phases %standard-phases
@@ -100,7 +100,6 @@ clients.")
       ("python-click" ,python-click)
       ("python-click-log" ,python-click-log)
       ("python-click-threading" ,python-click-threading)
-       ("python-lxml" ,python-lxml)
       ("python-requests-toolbelt" ,python-requests-toolbelt)))
    (synopsis "Synchronize calendars and contacts")
    (description "Vdirsyncer synchronizes your calendars and addressbooks
@@ -169,7 +169,7 @@ tools that process C/C++ code.")
                   (_                "UNSUPPORTED"))))
    (package
      (name "american-fuzzy-lop")
-      (version "1.96b")             ;It seems all releases have the 'b' suffix
+      (version "2.15b")             ;It seems all releases have the 'b' suffix
      (source
       (origin
         (method url-fetch)
@@ -177,7 +177,7 @@ tools that process C/C++ code.")
                             "afl-" version ".tgz"))
         (sha256
          (base32
-           "0z7j231p6v2h1dxxijgdzj1lq1lxr8cxllwf6iyv7p4ki5pv1gh3"))))
+           "04n2jfkchpz6a07w694b0im1vcmc3220ryqcaasa7vix7784wzs2"))))
      (build-system gnu-build-system)
      (inputs
       `(("custom-qemu"
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -43,9 +43,9 @@
             (sha256
              (base32
               "04pjks075x20d19l623mj50bw64g8i41s63z4kzzqcbg9qg96x64"))
-             (patches (map search-patch
-                           '("cpio-gets-undeclared.patch"
-                             "dico-libtool-deterministic.patch")))))
+             (patches (search-patches "cpio-gets-undeclared.patch"
+                                      "dico-libtool-deterministic.patch"
+                                      "dico-idxgcide-bug.patch"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags (list (string-append "--with-guile-site-dir=" %output
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +22,7 @@
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
  #:use-module (guix build-system trivial)
  #:use-module (gnu packages base)
  #:use-module (gnu packages texinfo)
@@ -76,3 +78,63 @@
     "V.E.R.A. (Virtual Entity of Relevant Acronyms) is a list of computing
 acronyms distributed as an info document.")
    (license fdl1.3+)))
+
+(define-public gcide
+  (package
+    (name "gcide")
+    (version "0.51")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://gnu/gcide/gcide-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1wm0s51ygc6480dq8gwahzr35ls8jgpf34yiwl5yqcaa0i19fdv7"))))
+    (build-system trivial-build-system)
+    (arguments
+     '(#:builder (begin
+                   (use-modules (guix build utils))
+                   (let* ((src     (assoc-ref %build-inputs "source"))
+                          (tar     (assoc-ref %build-inputs "tar"))
+                          (xz      (assoc-ref %build-inputs "xz"))
+                          (out     (assoc-ref %outputs "out"))
+                          (datadir (string-append out "/share/gcide")))
+                     (set-path-environment-variable "PATH" '("bin")
+                                                    (list tar xz))
+                     (mkdir-p datadir)
+                     (zero? (system* "tar" "-C" datadir
+                                     "--strip-components=1"
+                                     "-xvf" src))))
+       #:modules ((guix build utils))))
+    (native-inputs
+     `(("tar" ,tar)
+       ("xz" ,xz)))
+    (synopsis "GNU Collaborative International Dictionary of English")
+    (description
+     "GCIDE is a free dictionary based on a combination of sources.  It can
+be used via the GNU Dico program or accessed online at
+http://gcide.gnu.org.ua/")
+    (home-page "http://gcide.gnu.org.ua/")
+    (license gpl3+)))
+
+(define-public diction
+  ;; Not quite a dictionary, not quite a spell checker either…
+  (package
+    (name "diction")
+    (version "1.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/diction/diction-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1xi4l1x1vvzmzmbhpx0ghmfnwwrhabjwizrpyylmy3fzinzz3him"))))
+    (build-system gnu-build-system)
+    (synopsis "Identifies wordy and commonly misused phrases")
+    (description
+     "A package providing two classic Unix commands, style and diction.
+Diction is used to identify wordy and commonly misused phrases in a
+body of text.  Style instead analyzes surface aspects of a written
+work, such as sentence length and other readability measures.")
+    (home-page "https://www.gnu.org/software/diction/")
+    (license gpl3+)))
--- a/Show More
+++ b/Show More