Update NEWS.

build: Update PO files as per 'make dist'.
Update NEWS.
2014-07-25 01:01:51 +02:00 · 2014-07-25 00:56:50 +02:00 · 2014-07-25 00:44:43 +02:00 · 2014-07-25 00:29:47 +02:00 · 2014-07-25 00:26:55 +02:00 · 2014-07-25 00:26:29 +02:00
410 changed files with 55408 additions and 10514 deletions
@@ -6,8 +6,10 @@
 (scheme-mode
  .
  ((indent-tabs-mode . nil)
+   (eval . (put 'eval-when 'scheme-indent-function 1))
   (eval . (put 'test-assert 'scheme-indent-function 1))
   (eval . (put 'test-equal 'scheme-indent-function 1))
+   (eval . (put 'test-eq 'scheme-indent-function 1))
   (eval . (put 'call-with-input-string 'scheme-indent-function 1))
   (eval . (put 'guard 'scheme-indent-function 1))
   (eval . (put 'lambda* 'scheme-indent-function 1))
@@ -15,17 +17,30 @@
   (eval . (put 'with-directory-excursion 'scheme-indent-function 1))
   (eval . (put 'package 'scheme-indent-function 0))
   (eval . (put 'origin 'scheme-indent-function 0))
+   (eval . (put 'operating-system 'scheme-indent-function 0))
+   (eval . (put 'file-system 'scheme-indent-function 0))
   (eval . (put 'manifest-entry 'scheme-indent-function 0))
   (eval . (put 'manifest-pattern 'scheme-indent-function 0))
   (eval . (put 'substitute-keyword-arguments 'scheme-indent-function 1))
+   (eval . (put 'with-store 'scheme-indent-function 1))
   (eval . (put 'with-error-handling 'scheme-indent-function 0))
   (eval . (put 'with-mutex 'scheme-indent-function 1))
+   (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 'signature-case 'scheme-indent-function 1))

   (eval . (put 'syntax-parameterize 'scheme-indent-function 1))
   (eval . (put 'with-monad 'scheme-indent-function 1))
   (eval . (put 'mlet* 'scheme-indent-function 2))
   (eval . (put 'mlet 'scheme-indent-function 2))
-   (eval . (put 'run-with-store 'scheme-indent-function 1))))
+   (eval . (put 'run-with-store 'scheme-indent-function 1))
+
+   ;; Recognize '~' and '$', as used for gexps, as quotation symbols.  This
+   ;; notably allows '(' in Paredit to not insert a space when the preceding
+   ;; symbol is one of these.
+   (eval . (modify-syntax-entry ?~ "'"))
+   (eval . (modify-syntax-entry ?$ "'"))))
 (emacs-lisp-mode . ((indent-tabs-mode . nil)))
 (texinfo-mode    . ((indent-tabs-mode . nil)
                     (fill-column . 72))))
@@ -22,21 +22,40 @@ config.cache
 /m4/nls.m4
 /m4/po.m4
 /m4/progtest.m4
-/po/ChangeLog
-/po/Makefile.in.in
-/po/Makevars.template
-/po/POTFILES
-/po/Rules-quot
-/po/boldquot.sed
-/po/en@boldquot.header
-/po/en@quot.header
-/po/insert-header.sin
-/po/quot.sed
-/po/remove-potcdate.sin
-/po/stamp-po
-/po/guix.pot
-/po/*.mo
-/po/*.gmo
+/po/guix/ChangeLog
+/po/guix/Makefile.in.in
+/po/guix/Makevars.template
+/po/guix/POTFILES
+/po/guix/Rules-quot
+/po/guix/boldquot.sed
+/po/guix/en@boldquot.*
+/po/guix/en@quot.*
+/po/guix/insert-header.sin
+/po/guix/*.insert-header
+/po/guix/quot.sed
+/po/guix/remove-potcdate.sed
+/po/guix/remove-potcdate.sin
+/po/guix/stamp-po
+/po/guix/guix.pot
+/po/guix/*.mo
+/po/guix/*.gmo
+/po/packages/ChangeLog
+/po/packages/Makefile.in.in
+/po/packages/Makevars.template
+/po/packages/POTFILES
+/po/packages/Rules-quot
+/po/packages/boldquot.sed
+/po/packages/en@boldquot.*
+/po/packages/en@quot.*
+/po/packages/insert-header.sin
+/po/packages/*.insert-header
+/po/packages/quot.sed
+/po/packages/remove-potcdate.sed
+/po/packages/remove-potcdate.sin
+/po/packages/stamp-po
+/po/packages/guix-packages.pot
+/po/packages/*.mo
+/po/packages/*.gmo
 /tests/*.trs
 /INSTALL
 /m4/*
@@ -46,8 +65,8 @@ config.cache
 /doc/guix.pdf
 /doc/stamp-vti
 /doc/version.texi
-/gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
-/gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
+/gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz
+/gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz
 /gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz
 /guix/config.scm
 /nix/nix-daemon/nix-daemon.cc
@@ -84,3 +103,5 @@ GPATH
 GRTAGS
 GTAGS
 /nix-setuid-helper
+/nix/scripts/guix-authenticate
+/nix/scripts/offload
@@ -1,3 +1,3 @@
 [submodule "nix-upstream"]
 	path = nix-upstream
-	url = http://github.com/NixOS/nix.git
+	url = https://github.com/NixOS/nix.git
@@ -10,12 +10,18 @@ alphabetical order):

           Eric Bavier <bavier@member.fsf.org>
        Ludovic Courtès <ludo@gnu.org>
-           John Darrington <john@darrington.wattle.id.au>
+           John Darrington <jmd@gnu.org>
        Andreas Enge <andreas@enge.fr>
+         Alírio Eyng <alirioeyng@gmail.com>
            Guy Grant <gzg@riseup.net>
+         Raimon Grau <raimonster@gmail.com>
         Nikita Karetnikov <nikita@karetnikov.org>
        Aljosha Papsch <misc@rpapsch.de>
+        Manolis Ragkousis <manolis837@gmail.com>
          Cyril Roelandt <tipecaml@gmail.com>
           Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
+         Cyrill Schenkel <cyrill.schenkel@gmail.com>
+          Jason Self <j@jxself.org>
+    Sree Harsha Totakura <sreeharsha@totakura.in>
          David Thompson <dthompson2@worcester.edu>
        Mark H. Weaver <mhw@netris.org>
@@ -2,8 +2,9 @@

 #+TITLE: Hacking GNU Guix and Its Incredible Distro

-Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
+Copyright © 2014 Pierre-Antoine Rault <par@rigelk.eu>

  Copying and distribution of this file, with or without modification,
  are permitted in any medium without royalty provided the copyright
@@ -85,7 +86,11 @@ wrapping it, swallowing or rejecting the following s-expression, etc.
 Development is done using the Git distributed version control system.  Thus,
 access to the repository is not strictly necessary.  We welcome contributions
 in the form of patches as produced by ‘git format-patch’ sent to
-guix-devel@gnu.org.  Please write commit logs in the [[http://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Logs][GNU ChangeLog format]].
+guix-devel@gnu.org.  Please write commit logs in the [[http://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Logs][GNU ChangeLog
+format]]; you can check the commit history for examples.
+
+When posting a patch to the mailing list, use "[PATCH] ..." as a subject.  You
+may use your email client or the ‘git send-mail’ command.

 As you become a regular contributor, you may find it convenient to have write
 access to the repository (see below.)
@@ -154,7 +159,8 @@ patches include fixing typos, etc.)
 For patches that just add a new package, and a simple one, it’s OK to commit,
 if you’re confident (which means you successfully built it in a chroot setup,
 and have done a reasonable copyright and license auditing.)  Likewise for
-package upgrades.  We have a mailing list for commit notifications
+package upgrades, except upgrades that trigger a lot of rebuilds (for example,
+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’.

@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
 #
 # This file is part of GNU Guix.
@@ -28,11 +28,16 @@ include gnu-system.am

 MODULES =					\
  guix/base32.scm				\
+  guix/base64.scm				\
  guix/records.scm				\
  guix/hash.scm					\
+  guix/pk-crypto.scm				\
+  guix/pki.scm					\
  guix/utils.scm				\
  guix/download.scm				\
+  guix/git-download.scm				\
  guix/monads.scm				\
+  guix/gexp.scm					\
  guix/profiles.scm				\
  guix/serialization.scm			\
  guix/nar.scm					\
@@ -49,9 +54,11 @@ MODULES =					\
  guix/http-client.scm				\
  guix/gnupg.scm				\
  guix/store.scm				\
+  guix/svn-download.scm				\
  guix/ui.scm					\
  guix/build/download.scm			\
  guix/build/cmake-build-system.scm		\
+  guix/build/git.scm				\
  guix/build/gnu-build-system.scm		\
  guix/build/gnu-dist.scm			\
  guix/build/linux-initrd.scm			\
@@ -59,30 +66,50 @@ MODULES =					\
  guix/build/python-build-system.scm		\
  guix/build/utils.scm				\
  guix/build/union.scm				\
+  guix/build/pull.scm				\
  guix/build/rpath.scm				\
+  guix/build/svn.scm				\
+  guix/build/vm.scm				\
+  guix/build/install.scm			\
+  guix/build/activation.scm			\
+  guix/build/syscalls.scm			\
  guix/packages.scm				\
  guix/snix.scm					\
  guix/scripts/download.scm			\
  guix/scripts/build.scm			\
+  guix/scripts/archive.scm			\
  guix/scripts/import.scm			\
  guix/scripts/package.scm			\
  guix/scripts/gc.scm				\
  guix/scripts/hash.scm				\
  guix/scripts/pull.scm				\
  guix/scripts/substitute-binary.scm		\
+  guix/scripts/authenticate.scm			\
  guix/scripts/refresh.scm			\
+  guix/scripts/system.scm			\
  guix.scm					\
  $(GNU_SYSTEM_MODULES)

+if BUILD_DAEMON_OFFLOAD
+
+MODULES +=					\
+  guix/scripts/offload.scm
+
+endif BUILD_DAEMON_OFFLOAD
+
 # Because of the autoload hack in (guix build download), we must build it
 # first to avoid errors on systems where (gnutls) is unavailable.
 guix/scripts/download.go: guix/build/download.go
 guix/download.go: guix/build/download.go

+# Linux-Libre configurations.
+KCONFIGS =					\
+  gnu/packages/linux-libre-i686.conf		\
+  gnu/packages/linux-libre-x86_64.conf

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

-nobase_dist_guilemodule_DATA = $(MODULES)
+nobase_dist_guilemodule_DATA = $(MODULES) $(KCONFIGS)
 nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm

 # Do we need to provide our own non-broken (srfi srfi-37) module?
@@ -104,7 +131,11 @@ clean-go:

 SCM_TESTS =					\
  tests/base32.scm				\
+  tests/base64.scm				\
  tests/hash.scm				\
+  tests/pk-crypto.scm				\
+  tests/pki.scm					\
+  tests/substitute-binary.scm			\
  tests/builders.scm				\
  tests/derivations.scm				\
  tests/ui.scm					\
@@ -115,16 +146,21 @@ SCM_TESTS =					\
  tests/snix.scm				\
  tests/store.scm				\
  tests/monads.scm				\
+  tests/gexp.scm				\
  tests/nar.scm					\
  tests/union.scm				\
-  tests/profiles.scm
+  tests/profiles.scm				\
+  tests/syscalls.scm

 SH_TESTS =					\
  tests/guix-build.sh				\
  tests/guix-download.sh			\
  tests/guix-gc.sh				\
  tests/guix-hash.sh				\
-  tests/guix-package.sh
+  tests/guix-package.sh				\
+  tests/guix-system.sh				\
+  tests/guix-archive.sh				\
+  tests/guix-authenticate.sh

 if BUILD_DAEMON

@@ -152,27 +188,41 @@ tests/guix-gc.log:							\
  $(patsubst %.sh,%.log,$(filter-out tests/guix-gc.sh,$(SH_TESTS)))	\
  $(SCM_TESTS:%.scm=%.log)

+# Public key used to sign substitutes from hydra.gnu.org.
+dist_pkgdata_DATA = hydra.gnu.org.pub

-EXTRA_DIST =					\
-  HACKING					\
-  ROADMAP					\
-  TODO						\
-  .dir-locals.el				\
-  build-aux/hydra/gnu-system.scm		\
-  build-aux/hydra/guix.scm			\
-  build-aux/check-available-binaries.scm	\
-  build-aux/download.scm			\
-  build-aux/list-packages.scm			\
-  build-aux/sync-descriptions.scm		\
-  srfi/srfi-37.scm.in				\
-  srfi/srfi-64.scm				\
-  srfi/srfi-64.upstream.scm			\
-  tests/test.drv				\
-  build-aux/config.rpath			\
-  bootstrap					\
-  release.nix					\
+EXTRA_DIST =						\
+  HACKING						\
+  ROADMAP						\
+  TODO							\
+  .dir-locals.el					\
+  build-aux/hydra/gnu-system.scm			\
+  build-aux/hydra/demo-os.scm				\
+  build-aux/hydra/guix.scm				\
+  build-aux/check-available-binaries.scm		\
+  build-aux/check-final-inputs-self-contained.scm	\
+  build-aux/download.scm				\
+  build-aux/list-packages.scm				\
+  build-aux/sync-descriptions.scm			\
+  srfi/srfi-37.scm.in					\
+  srfi/srfi-64.scm					\
+  srfi/srfi-64.upstream.scm				\
+  tests/test.drv					\
+  tests/signing-key.pub					\
+  tests/signing-key.sec					\
+  build-aux/config.rpath				\
+  bootstrap						\
+  release.nix						\
  $(TESTS)

+if !BUILD_DAEMON_OFFLOAD
+
+EXTRA_DIST +=					\
+  guix/scripts/offload.scm
+
+endif !BUILD_DAEMON_OFFLOAD
+
+
 CLEANFILES =					\
  $(GOBJECTS)					\
  $(SCM_TESTS:tests/%.scm=%.log)
@@ -202,7 +252,8 @@ SUFFIXES = .go
 guix_install_go_files = install-nobase_nodist_guilemoduleDATA
 $(guix_install_go_files): install-nobase_dist_guilemoduleDATA

-SUBDIRS = po
+SUBDIRS = po/guix po/packages
+BUILT_SOURCES =

 include doc.am

@@ -215,11 +266,12 @@ endif BUILD_DAEMON
 ACLOCAL_AMFLAGS = -I m4
 AM_DISTCHECK_CONFIGURE_FLAGS =			\
  --with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)"	\
+  --with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)"	\
  --with-nix-prefix="$(NIX_PREFIX)"		\
  --enable-daemon

 dist-hook: sync-descriptions gen-ChangeLog assert-no-store-file-names
-distcheck-hook: assert-binaries-available
+distcheck-hook: assert-binaries-available assert-final-inputs-self-contained

 sync-descriptions:
 	-$(top_builddir)/pre-inst-env $(GUILE)		\
@@ -233,7 +285,7 @@ gen-ChangeLog:
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;	\
 	fi

-# Make sure we're not shipping a file that embeds a local /nix/store file name.
+# Make sure we're not shipping a file that embeds a local /gnu/store file name.
 assert-no-store-file-names:
 	if grep -r --exclude=*.texi --exclude=*.info				\
 	     "$(storedir)/[a-z0-9]{32}-" $(distdir) ;				\
@@ -247,5 +299,11 @@ assert-binaries-available:
 	$(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:
+	$(top_builddir)/pre-inst-env "$(GUILE)"				\
+	  "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm"
+
 .PHONY: sync-descriptions gen-ChangeLog clean-go
 .PHONY: assert-no-store-file-names assert-binaries-available
+.PHONY: assert-final-inputs-self-contained
@@ -2,7 +2,7 @@
 #+TITLE: Guix NEWS – history of user-visible changes
 #+STARTUP: content hidestars

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

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

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

+* Changes in 0.7 (since 0.6)
+** Package management
+*** Binaries for mips64el-linux now available from hydra.gnu.org
+
+These come in addition to the x86_64-linux and i686-linux binaries already
+provided, thanks to our generous donor and friendly admins.  See
+“Substitutes” in the manual.
+
+*** ‘guix package’ has a new ‘--show’ option
+*** ‘guix refresh’ has a new ‘--list-dependent’ option
+
+** Programming interfaces
+*** New (guix gexp) module, which implements “G-expressions”
+
+G-expressions are a new mechanism to embed build-side code in host-side
+code.  See “G-Expressions” in the manual.
+
+*** (gnu system) and related modules now use G-expressions
+
+This greatly simplifies code, and guarantees that build code carries
+references to the packages or derivations it uses.
+
+*** ‘build-expression->derivation’ is deprecated in favor of G-expressions
+*** The (gnu system) module has been largely augmented and factorized
+*** New (guix build vm) module, support for virtual machine images
+*** New (guix build activation) module, for “system activation”
+*** New (guix build syscalls) module
+*** New (guix build install) and module for whole system installation
+*** New (gnu system install) module, for the installation system
+*** New (gnu system file-systems) module, for ‘file-system’ declarations
+*** New (gnu) module, which aggregates common (gnu …) modules
+*** ‘service’ records now have an optional ‘activate’ field
+
+This allows services to specify code to run at system activation time.
+
+** GNU distribution
+*** An image to install the GNU system from a USB stick is provided
+
+This is the first time an installation image is provided.  See “System
+Installation” in the manual for details.  This is work in progress as noted
+in “Limitations”.  Your feedback and help are welcome!
+
+*** Support for more parameters in ‘operating-system’ declarations
+
+Operating system declarations can now provide a list of file systems, a list
+of setuid programs, bootloader options, and more.  See “System Configuration”
+in the manual.
+
+*** ‘guix system’ supports more actions
+
+Newly supported actions are ‘init’, ‘build’, ‘reconfigure’, and ‘disk-image’.
+See “Invoking guix system” in the manual.
+
+*** User accounts and groups are created at system activation time
+*** Virtual machine support uses para-virtualized devices
+*** GCC package now has an additional ‘lib’ output, for run-time support libs
+*** GLib package now has a separate “bin” output (<http://bugs.gnu.org/17853>)
+*** 134 new packages
+
+abbaye, aegis, attica, babl, barcode, behave, btar, busybox, ccache, ccrtp,
+chess, clucene, cmatrix, commoncpp, conkeror, cook, cssc, datamash, diffstat,
+doxygen, dropbear, dtach, duplicity, e2fsck-static, exosip, fftw-openmpi,
+fish, gconf, gegl, gimp, gmsh, gnome-mime-data, gnome-vfs, gnumeric, goffice,
+gsegrafix, guile-opengl, guile-static-stripped, hdup, hwloc, inotify-tools,
+jrnl, kbd, kmod, lftp, libarchive, libart-lgpl, libbonobo, libbonoboui,
+libcroco, libdbusmenu-qt, libftdi, libglade, libgnome, libgnomecanvas,
+libgnomeprint, libgnomeprintui, libgnomeui, libgsf, libidl, libmcrypt,
+libmhash, librsvg, librsync, libsodium, libuv, libvpx, links, lzop, man-pages,
+maxima, mcrypt, mosh, mpg123, mplayer, mu, ncmpcpp, node, notmuch, numactl,
+offlineimap, openmpi, orbit2, osip, pangox-compat, perl-io-tty, petsc,
+petsc-complex, petsc-complex-openmpi, petsc-openmpi, pingus, podofo, protobuf,
+pt-scotch, python-enum34, python-keyring, python-lockfile, python-mock,
+python-parse, python-parse-type, python-parsedatetime, python-pycrypto,
+python-six, python-tzlocal, python2-lockfile, python2-mock, qjson, qrencode,
+rasqal, rdiff-backup, rdup, redland, rottlog, scotch, sipwitch, sshfs-fuse,
+strigi, sudo, superlu, superlu-dist, talkfilters, talloc, tcpdump, tinyproxy,
+transmission, ucommon, udev, vlc, vtk, wakelan, wireless-tools,
+wpa-supplicant, xboard, youtube-dl
+
+*** 87 package updates
+
+bitlbee-3.2.2, cursynth-1.5, ddrescue-1.18.1, dfc-3.0.4, dmd-0.2,
+docbook-xml-4.3, docbook-xml-4.4, docbook-xsl-1.78.1, dvdisaster-0.72.6,
+ffmpeg-2.3, fftw-3.3.4, fftwf-3.3.4, flac-1.3.0, gawk-4.1.1, gcc-4.7.4,
+gcc-4.8.3, gcc-4.8.3, gcc-4.9.1, gcc-cross-mips64el-linux-gnuabi64-4.8.3,
+gcc-objc++-4.8.3, gcc-objc-4.8.3, gcc-stripped-tarball-4.8.3,
+gcc-toolchain-4.8.3, gcc-toolchain-4.9.1, gccgo-4.8.3, gdb-7.7.1,
+gettext-0.19.2, gfortran-4.8.3, glib-2.40.0, global-6.3, gmp-6.0.0a,
+gnupg-1.4.18, gnupg-2.0.25, gnutls-3.2.15, gp2c-0.0.9pl1, grep-2.20,
+gst-plugins-base-1.0.10, gstreamer-0.10.36, gtk+-3.10.1, gtkmm-2.24.2,
+guile-2.0.11, guile-2.0.11, guix-0.6, guix-0.6.0ae8c15, htop-1.0.3,
+icu4c-53.1, imagemagick-6.8.9-0, json-c-0.12, libdrm-2.4.33, libgc-7.2e,
+libgcrypt-1.5.3, libgpg-error-1.13, libjpeg-8d, libmicrohttpd-0.9.37,
+libogg-1.3.2, libotr-4.0.0, libtasn1-3.6, libvorbis-1.3.4, lightning-2.0.4,
+linux-libre-3.15.6, lua-5.1.5, lua-5.2.3, mcron-1.0.8, moe-1.6, nano-2.3.6,
+neon-0.29.6, nettle-3.0, openssl-1.0.1h, parallel-20140722, pari-gp-2.7.1,
+pspp-0.8.3, python-2.7.6, python-dateutil-2.2, python2-dateutil-2.2,
+qemu-2.0.0, qemu-headless-2.0.0, qt-4.8.6, qt-5.2.1, readline-6.2,
+screen-4.2.1, soprano-2.9.4, texinfo-5.2, texlive-2014, tor-0.2.4.22,
+wdiff-1.2.2, xorriso-1.3.8, xterm-304
+
+** Native language support
+*** New translations: de (German), and hu (Hungarian)
+*** Updated translations: eo, pt_BR, sr, vi
+*** Package descriptions moved from the ‘guix’ text domain to ‘guix-packages’
+** Bugs fixed
+*** Downloads are now faster (<http://bugs.gnu.org/15368>)
+*** ‘guix authenticate’ properly writes signatures to stdout
+    (<http://bugs.gnu.org/17312>)
+*** Progress report of downloads is now properly displayed
+*** Error reporting of pk-crypto errors has been improved
+*** The 'patches' field now works for origins with no extension
+*** Synchronization and GC issues fixed in the offload hook
+*** (guix ftp-client) emits USER commands suitable for all servers
+
+* Changes in 0.6 (since 0.5)
+** Package management
+*** Default store directory changed to /gnu/store
+
+Although it is still possible to configure Guix to use the old store
+directory, we recommend that you start with a fresh install to /gnu/store.
+
+*** Substitutes from hydra.gnu.org must now be signed and authorized
+*** Support for offloading builds to other Guix machines over SSH
+*** New ‘guix archive’ command
+*** New ‘guix system’ command; it can currently build VM images
+*** ‘guix package’ accepts several arguments after -i, -r, and -u
+*** Updating a profile with ‘guix package’ is now noticeably faster
+*** ‘guix build’ can override a package’s source with the new ‘--with-source’
+*** ‘guix build’ has a new ‘--no-build-hook’ option
+*** ‘guix’ commands that build packages have a common set of options
+*** ‘guix hash’ has a new ‘--recursive’ option
+*** Daemon no longer bind-mounts the host’s /dev (improves reproducibility)
+** Programming interfaces
+*** New (guix pk-crypto) and (guix pki) modules for public key cryptography
+*** New #:local-build? parameter for derivations that shouldn’t be offloaded
+*** (gnu system vm) has procedures to build VMs that share the host’s store
+*** New ‘text-file*’ procedure in (guix monads)
+*** System service definitions are now provided by the (guix services) modules
+*** New X and SLiM services in (gnu services xorg)
+*** New (guix git-download) and (guix svn-download) for git/svn checkouts
+** GNU distribution
+*** 91 new packages
+
+a2ps, asciidoc, aspell-dict-en, aspell-dict-eo, aspell-dict-es,
+aspell-dict-fr, aumix, bitlbee, bogofilter, boost, calcurse, clusterssh,
+corkscrew, cursynth, docbook-xml, docbook-xsl, elfutils, enscript, fftwf,
+fltk, fuse, gcc-toolchain, giflib, glade, gmime, gnome-desktop, gnubg, gnubik,
+gnumach-headers, gnunet, gnuplot, gnurl, gphoto2, gtkglext, guile-json,
+guile-reader-for-guile_2.0.11, gxmessage, hdf5, hurd-headers, inkscape, iotop,
+isc-dhcp, iso-codes, jnettop, libatomic-ops, libexif, libgphoto2, libmpcdec,
+libmpdclient, libotr, libpcap, libpeas, libpipeline, libtirpc, libwebsockets,
+ltrace, luajit, lynx, man-db, mc, mig, miniupnpc, moe, mpc123, mpd, ncdc,
+ncdu, ncmpc, neon, neon, octave, opus, paperkey, patchutils, perl-tk,
+perl-x11-protocol, pinentry, python2-element-tree, python2-pybugz, quilt,
+source-highlight, stalonetray, trueprint, ttf-dejavu, unionfs-fuse,
+unionfs-fuse-static, uucp, vera, windowmaker, xapian, xterm
+
+*** 90 package updates
+
+apl-1.3, autoconf-2.68, automake-1.14.1, bash-4.3, bash-light-4.3,
+bigloo-4.1a, binutils-2.24, binutils-static-stripped-tarball-2.24,
+coreutils-8.22, curl-7.35.0, ed-1.10, ffmpeg-2.1.4, file-5.18, freeipmi-1.4.1,
+gcc-4.8.2, gcc-4.8.2, gdb-7.7, gdbm-1.11, gettext-0.18.3.2, glib-2.39.1,
+glibc-2.19, glibc-stripped-tarball-2.19, global-6.2.12, glpk-4.54,
+gnu-pw-mgr-1.2, gnupg-1.4.16, gnutls-3.2.12, gp2c-0.0.8pl1, grep-2.18,
+gst-plugins-base-0.10.36, gstreamer-1.0.10, gtk+-3.10.1, gtkmm-2.24.2,
+guile-2.0.11, guile-ssh-0.6.0, guile-static-stripped-tarball-2.0.11,
+guile-wm-1.0, guile-xcb-1.3, guix-0.5, help2man-1.45.1, icu4c-52.1,
+imagemagick-6.8.8-10, inetutils-1.9.2, lapack-3.5.0, libcdio-0.92,
+libdrm-2.4.46, libextractor-1.3, libgc-7.2e, libgc-7.4.0, libgcrypt-1.6.1,
+libjpeg-9, libmicrohttpd-0.9.34, libssh-0.6.3, libtasn1-3.4, lightning-2.0.3,
+linux-libre-3.13.7, mpc-1.0.2, mutt-1.5.23, net-base-5.2, ocrad-0.23,
+openssh-6.6p1, openssl-1.0.1g, parallel-20140322, pari-gp-2.7.0, pspp-0.8.2,
+pulseaudio-5.0, python-2.7.6, python-3.3.5, python-wrapper-3.3.5,
+python2-pysqlite-2.6.3a, qemu-1.7.1, qemu-headless-1.7.1,
+qemu-with-multiple-smb-shares-1.7.1, qt-4.8.5, qt-5.2.0, readline-6.3,
+recutils-1.7, slim-1.3.6, sqlite-3.8.4.3, subversion-1.7.14, texinfo-4.13a,
+tor-0.2.4.21, tzdata-2014a, units-2.11, valgrind-3.9.0, vim-7.4, wget-1.15,
+xnee-3.18, xorriso-1.3.6.pl01, zile-2.4.11
+
+*** New ‘gcc-toolchain’ meta-package, makes it easy to install a GCC tool chain
+*** libc’s Info manual is now installed
+*** Binutils is built with --enable-deterministic-archives
+*** Packages that populated man/man* now populate share/man/man*
+*** Many other packaging improvements
+** Bugs fixed
+*** ‘guix pull’ consumes less memory, compiles in parallel
+*** ‘guix package --list-*’ gracefully handles EPIPE when used in a pipeline
+*** ‘guix package’ handles collisions between a symlink and a directory
+    (http://bugs.gnu.org/17083)
+*** HTTP downloads provide a ‘User-Agent’ field (http://bugs.gnu.org/16703)
+*** ‘guix package’ no longer shows misleading installed package number
+    (http://bugs.gnu.org/16484)
+*** Manual suggests ‘useradd --system’ (http://bugs.gnu.org/16289)
+*** Python is built with ctypes support (http://bugs.gnu.org/16569)
+*** HTTP/TLS connection not terminated properly (http://bugs.gnu.org/14884)
+*** Gracefully handle poorly behaved HTTP servers (http://bugs.gnu.org/15733)
+
 * Changes in 0.5 (since 0.4)
 ** Package management
 *** GNU package descriptions synchronized with the ‘gnumaint’ repository
@@ -52,7 +52,7 @@ To do so:
  - Install the dependencies (see 'Requirements' above) and build tools using
    Guix:

-      guix package --install={autoconf,automake,bzip2,gcc,binutils,ld-wrapper,glibc,gettext,guile,libgcrypt,pkg-config,sqlite}
+      guix package --install={autoconf,automake,bzip2,gcc-toolchain,gettext,guile,libgcrypt,pkg-config,sqlite}

  - set the environment variables that Guix recommends you to set during the
    package installation process:
@@ -2,7 +2,7 @@

 #+TITLE: Tentative GNU Guix Road Map

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

  Copying and distribution of this file, with or without modification,
  are permitted in any medium without royalty provided the copyright
@@ -15,10 +15,18 @@ The goals of the GNU Guix project are two-fold:

  - to use it to build a practical 100% free software distribution of
    GNU/Linux and possibly other GNU variants, with a focus on the
-    promotion and tight integration of GNU components.
+    promotion and tight integration of GNU components–the GNU system.

-This documents lists tentative milestones toward these goals.
+This document lists milestones toward these goals.

+The timeline below was written at the end of Dec. 2012.  An updated and more
+detailed list of the remaining milestones was posted at
+https://lists.gnu.org/archive/html/guix-devel/2013-12/msg00120.html .
+
+The actual timeline was of course slightly different than initially
+envisioned, and so was the feature set–things like cross-compilation support
+and the MIPS64 port were not planned back then.  See the news section at
+http://www.gnu.org/software/guix/ and ‘NEWS’ for the release history.

 * GNU Guix 0.1: Jan. 2013 (was: Dec. 2012)

@@ -6,18 +6,26 @@ Thanks to the following people who contributed to GNU Guix through
 suggestions, bug reports, patches, internationalization, or general
 infrastructure help:

-       Lluís Batlle i Rossell <viric@viric.name>
-      Felipe Castro <fefcas@gmail.com>
-      Daniel Clark <dclark@pobox.com>
-   Alexandru Cojocaru <xojoc@gmx.com>
-       Aleix Conchillo Flaqué <aconchillo@gmail.com>
-        John Darrington <john@cellform.com>
-      Rafael Ferreira <rafael.f.f1@gmail.com>
-   Christian Grothoff <christian@grothoff.org>
-     Jeffrin Jose <ahiliation@yahoo.co.in>
-     Matthew Lien <bluet@bluet.org>
-      Yutaka Niibe <gniibe@fsij.org>
-      Cyrill Schenkel <cyrill.schenkel@gmail.com>
-       Jason Self <jself@gnu.org>
-        Alen Skondro <askondro@gmail.com>
-    Matthias Wachs <wachs@net.in.tum.de>
+	    Lluís Batlle i Rossell <viric@viric.name>
+    Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
+            Marek Benc <merkur32@gmail.com>
+	   Carlos Carleos <carleos@uniovi.es>
+	   Felipe Castro <fefcas@gmail.com>
+	   Daniel Clark <dclark@pobox.com>
+	Alexandru Cojocaru <xojoc@gmx.com>
+	    Aleix Conchillo Flaqué <aconchillo@gmail.com>
+	     John Darrington <jmd@gnu.org>
+	   Rafael Ferreira <rafael.f.f1@gmail.com>
+	Christian Grothoff <christian@grothoff.org>
+	  Jeffrin Jose <ahiliation@yahoo.co.in>
+	     Kete <kete@ninthfloor.org>
+             Alex Kost <alezost@gmail.com>
+	  Matthew Lien <bluet@bluet.org>
+	    Niels Möller <nisse@lysator.liu.se>
+	   Yutaka Niibe <gniibe@fsij.org>
+             Adam Pribyl <pribyl@lowlevel.cz>
+	   Cyrill Schenkel <cyrill.schenkel@gmail.com>
+	    Benno Schulenberg <coordinator@translationproject.org>
+	    Jason Self <jself@gnu.org>
+	     Alen Skondro <askondro@gmail.com>
+	 Matthias Wachs <wachs@net.in.tum.de>
@@ -11,23 +11,6 @@ Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>

 * integrate needed Nix code

-** Remove dependency on OpenSSL
-
-The ‘openssl’ command-line tool is used in libstore to sign store paths
-to be exported, and to check such signatures.  The signing keys are
-usually in /etc/nix/signing-key.{pub,sec}.  They are a PKCS#8-encoded
-X.509 SubjectPublicKeyInfo.  These can be decoded with the [[http://lists.gnu.org/archive/html/help-gnutls/2012-12/msg00012.html][C API of
-GnuTLS]], but not yet with its Guile bindings.  There’s also
-‘gnutls_privkey_sign_data’ to sign, and related functions.
-
-
-** Add `guix publish' to publish the store using Guile's web server
-
-Generate narinfos and nars on the fly, upon HTTP GET requests.
-Ideally, extend .nix-cache-info to include the server's public key, and also
-reply to requests for .narinfo.sig.
-Optionally, use Guile-Avahi to publish the service.
-
 ** MAYBE Add a substituter that uses the GNUnet DHT or [[http://libswift.org][libswift]]

 Would be neat if binaries could be pushed to and pulled from the GNUnet DHT or
@@ -40,6 +23,13 @@ Use UPnP and similar to traverse NAT, like ‘filegive’ does.

 Like scripts/build-remote.pl in Nix.

+* Add `guix publish' to publish the store using Guile's web server
+
+Generate narinfos and nars on the fly, upon HTTP GET requests.
+Ideally, extend .nix-cache-info to include the server's public key, and also
+reply to requests for .narinfo.sig.
+Optionally, use Guile-Avahi to publish the service.
+
 * user interface
 ** Add a package.el (Emacs) back-end

@@ -48,17 +38,6 @@ package.el is quite monolithic, but we may be able to reuse/extend

 ** add guile-ncurses interface

-* extend <origin>
-** add OpenPGP signatures:
-
-   (origin
-     (method http-fetch)
-     (uri "http://.../foo.tgz")
-     (signature-uri (string-append uri ".sig"))
-     (signer-openpgp-fingerprint "..."))
-
-** allow <origin> to be a derivation/package or a file
-
 * extend <package>

 ** add ‘recommends’ field
@@ -84,28 +63,19 @@ create a new ‘dir’.
      ("i3" ,p3)))
 #+END_SRC

-
-* synchronize package descriptions with GSRC and/or the [[http://directory.fsf.org][FSD]]
+* synchronize non-GNU package descriptions with the [[http://directory.fsf.org][FSD]]

 Meta-data for GNU packages, including descriptions and synopses, can be
 dumped from the FSD:
 http://directory.fsf.org/wiki?title=GNU/Export&action=purge .
 We could periodically synchronize with that.

-See http://lists.gnu.org/archive/html/bug-guix/2013-04/msg00120.html for info
-on how to synchronize with GSRC's descriptions.
-
 * add a guildhall build system

 The Guildhall is Guile’s packaging system.  It should be easy to add a
 ‘guildhall-build-system’ that does the right thing based on guildhall
 recipes.

-* build-expression->derivation: define `%system' in the builder
-
-Would allow build expressions to have system-dependent code, like
-`glibc-dynamic-linker'.
-
 * add ‘allowed-references’ in <package>

 [[file:~/src/nix/src/libstore/build.cc::if%20(drv.env.find("allowedReferences")%20!%3D%20drv.env.end())%20{][See how Nix implements that internally]].
@@ -126,9 +96,6 @@ run when that is defined.
 Would download a substitute, and compare its contents against a (hopefully
 locally-built) copy.

-* guix package
-
-** add ‘--list-generations’, and ‘--delete-generations’

 * guix build utils
 ** MAYBE Change ‘ld-wrapper’ to add RPATH for libs passed by file name
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -48,6 +48,7 @@
                    drv)
            #f))))

+  (set-build-options store #:use-substitutes? #t)
  (let ((result (every (compose (warn (cut has-substitutes? store <>))
                                derivation->output-path)
                       total)))
@@ -0,0 +1,83 @@
+;;; 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/>.
+
+;;;
+;;; Check whether important binaries are available at hydra.gnu.org.
+;;;
+
+(use-modules (guix store)
+             (guix packages)
+             (guix derivations)
+             (guix ui)
+             (gnu packages base)
+             (ice-9 match)
+             (srfi srfi-1)
+             (srfi srfi-26))
+
+(define %supported-systems
+  '("x86_64-linux" "i686-linux"))
+
+(define (final-inputs store system)
+  "Return the list of outputs directories of the final inputs for SYSTEM."
+  (append-map (match-lambda
+               ((name package)
+                (let ((drv (package-derivation store package system)))
+                  ;; Libc's 'debug' output refers to gcc-cross-boot0, but it's
+                  ;; hard to avoid, so we tolerate it.  This should be the
+                  ;; only exception.
+                  (filter-map (match-lambda
+                               (("debug" . directory)
+                                (if (string=? "glibc" (package-name package))
+                                    #f
+                                    directory))
+                               ((_ . directory) directory))
+                              (derivation->output-paths drv)))))
+              %final-inputs))
+
+(define (assert-valid-substitute substitute)
+  "Make sure SUBSTITUTE does not refer to any bootstrap inputs, and bail out
+if it does."
+  (let ((references (substitutable-references substitute)))
+    (when (any (cut string-contains <> "boot") references)
+      (leave (_ "'~a' refers to bootstrap inputs: ~s~%")
+             (substitutable-path substitute) references))))
+
+(define (test-final-inputs store system)
+  "Check whether the final inputs for SYSTEM are clean---i.e., they don't
+refer to the bootstrap tools."
+  (format #t "checking final inputs for '~a'...~%" system)
+  (let* ((inputs    (final-inputs store system))
+         (available (substitutable-path-info store inputs)))
+    (for-each (lambda (dir)
+                (unless (find (lambda (substitute)
+                                (string=? (substitutable-path substitute)
+                                          dir))
+                              available)
+                  (leave (_ "~a (system: ~a) has no substitute~%")
+                         dir system)))
+              inputs)
+
+    (for-each assert-valid-substitute available)))
+
+;; Entry point.
+(with-store store
+  (set-build-options store #:use-substitutes? #t)
+
+  (for-each (cut test-final-inputs store <>)
+            %supported-systems))
+
@@ -0,0 +1,92 @@
+;;; 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/>.
+
+
+;;;
+;;; This file defines an operating system configuration for the demo virtual
+;;; machine images that we build.
+;;;
+
+(use-modules (gnu)
+
+             (gnu packages xorg)
+             (gnu packages avahi)
+             (gnu packages linux)
+             (gnu packages tor)
+
+             (gnu services networking)
+             (gnu services avahi)
+             (gnu services dbus)
+             (gnu services xorg))
+
+(operating-system
+ (host-name "gnu")
+ (timezone "Europe/Paris")
+ (locale "en_US.UTF-8")
+
+ (bootloader (grub-configuration
+              (device "/dev/sda")))
+ (file-systems
+  ;; We provide a dummy file system for /, but that's OK because the VM build
+  ;; code will automatically declare the / file system for us.
+  (cons* (file-system
+           (mount-point "/")
+           (device "dummy")
+           (type "dummy"))
+         ;; %fuse-control-file-system   ; needs fuse.ko
+         ;; %binary-format-file-system  ; needs binfmt.ko
+         %base-file-systems))
+
+ (users (list (user-account
+               (name "guest")
+               (group "users")
+               (supplementary-groups '("wheel"))  ; allow use of sudo
+               (password "")
+               (comment "Guest of GNU")
+               (home-directory "/home/guest"))))
+
+ (issue "
+This is an alpha preview of the GNU system.  Welcome.
+
+This image features the GNU Guix package manager, which was used to
+build it (http://www.gnu.org/software/guix/).  The init system is
+GNU dmd (http://www.gnu.org/software/dmd/).
+
+You can log in as 'guest' or 'root' with no password.
+")
+
+ (services (cons* (slim-service #:auto-login? #t
+                                #:default-user "guest")
+
+                  ;; QEMU networking settings.
+                  (static-networking-service "eth0" "10.0.2.10"
+                                             #:name-servers '("10.0.2.3")
+                                             #:gateway "10.0.2.2")
+
+                  (avahi-service)
+                  (dbus-service (list avahi))
+                  (tor-service)
+
+                  %base-services))
+ (pam-services
+  ;; Explicitly allow for empty passwords.
+  (base-pam-services #:allow-empty-passwords? #t))
+
+ (packages (cons* strace
+                  tor torsocks
+                  xterm avahi %base-packages)))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,11 +36,16 @@
                     dir)
             (set! %load-path (cons dir %load-path))))))

-(use-modules (guix store)
+(use-modules (guix config)
+             (guix store)
             (guix packages)
             (guix derivations)
+             (guix monads)
+             ((guix licenses) #:select (gpl3+))
             ((guix utils) #:select (%current-system))
+             ((guix scripts system) #:select (read-operating-system))
             (gnu packages)
+             (gnu packages gcc)
             (gnu packages base)
             (gnu packages gawk)
             (gnu packages guile)
@@ -48,6 +53,9 @@
             (gnu packages compression)
             (gnu packages multiprecision)
             (gnu packages make-bootstrap)
+             (gnu system)
+             (gnu system vm)
+             (gnu system install)
             (srfi srfi-1)
             (srfi srfi-26)
             (ice-9 match))
@@ -66,7 +74,11 @@
    (long-description . ,(package-description package))
    (license . ,(package-license package))
    (home-page . ,(package-home-page package))
-    (maintainers . ("bug-guix@gnu.org"))))
+    (maintainers . ("bug-guix@gnu.org"))
+
+    ;; Work around versions of 'hydra-eval-guile-jobs' before Hydra commit
+    ;; 61448ca (27 Feb. 2014) which used a default timeout of 2h.
+    (timeout . 72000)))

 (define (package-job store job-name package system)
  "Return a job called JOB-NAME that builds PACKAGE on SYSTEM."
@@ -83,7 +95,11 @@ SYSTEM."
           (cut package-cross-derivation <> <> target <>))))

 (define %core-packages
-  (list gmp mpfr mpc coreutils findutils diffutils patch sed grep
+  ;; Note: Don't put the '-final' package variants because (1) that's
+  ;; implicit, and (2) they cannot be cross-built (due to the explicit input
+  ;; chain.)
+  (list gcc-4.8 gcc-4.7 glibc binutils
+        gmp mpfr mpc coreutils findutils diffutils patch sed grep
        gawk gnu-gettext hello guile-2.0 zlib gzip xz
        %bootstrap-binaries-tarball
        %binutils-bootstrap-tarball
@@ -99,18 +115,50 @@ SYSTEM."
  '("mips64el-linux-gnu"
    "mips64el-linux-gnuabi64"))

+(define (demo-os)
+  "Return the \"demo\" 'operating-system' structure."
+  (let* ((dir  (dirname (assoc-ref (current-source-location) 'filename)))
+         (file (string-append dir "/demo-os.scm")))
+    (read-operating-system file)))
+
+(define (qemu-jobs store system)
+  "Return a list of jobs that build QEMU images for SYSTEM."
+  (define (->alist drv)
+    `((derivation . ,(derivation-file-name drv))
+      (description . "Stand-alone QEMU image of the GNU system")
+      (long-description . "This is a demo stand-alone QEMU image of the GNU
+system.")
+      (license . ,gpl3+)
+      (home-page . ,%guix-home-page-url)
+      (maintainers . ("bug-guix@gnu.org"))))
+
+  (define (->job name drv)
+    (let ((name (symbol-append name (string->symbol ".")
+                               (string->symbol system))))
+      `(,name . ,(cut ->alist drv))))
+
+  (define MiB
+    (expt 2 20))
+
+  (if (member system '("x86_64-linux" "i686-linux"))
+      (list (->job 'qemu-image
+                   (run-with-store store
+                     (system-qemu-image (demo-os)
+                                        #:disk-image-size
+                                        (* 1400 MiB)))) ; 1.4 GiB
+            (->job 'usb-image
+                   (run-with-store store
+                     (system-disk-image installation-os
+                                        #:disk-image-size
+                                        (* 630 MiB)))))
+      '()))
+
 (define (hydra-jobs store arguments)
  "Return Hydra jobs."
  (define systems
-    (match (filter-map (match-lambda
-                        (('system . value)
-                         value)
-                        (_ #f))
-                       arguments)
-      ((lst ..1)
-       lst)
-      (_
-       (list (%current-system)))))
+    ;; Systems we want to build for.
+    '("x86_64-linux" "i686-linux"
+      "mips64el-linux"))

  (define subset
    (match (assoc-ref arguments 'subset)
@@ -121,12 +169,29 @@ SYSTEM."
    (compose string->symbol package-full-name))

  (define (cross-jobs system)
+    (define (from-32-to-64? target)
+      ;; Return true if SYSTEM is 32-bit and TARGET is 64-bit.
+      ;; This hacks prevents known-to-fail cross-builds from i686-linux to
+      ;; mips64el-linux-gnuabi64.
+      (and (string-prefix? "i686-" system)
+           (string-suffix? "64" target)))
+
+    (define (same? target)
+      ;; Return true if SYSTEM and TARGET are the same thing.  This is so we
+      ;; don't try to cross-compile to 'mips64el-linux-gnu' from
+      ;; 'mips64el-linux'.
+      (string-contains target system))
+
+    (define (either proc1 proc2)
+      (lambda (x)
+        (or (proc1 x) (proc2 x))))
+
    (append-map (lambda (target)
                  (map (lambda (package)
                         (package-cross-job store (job-name package)
                                            package target system))
                       %packages-to-cross-build))
-                %cross-targets))
+                (remove (either from-32-to-64? same?) %cross-targets)))

  ;; Return one job for each package, except bootstrap packages.
  (let ((base-packages (delete-duplicates
@@ -147,7 +212,8 @@ SYSTEM."
                                          (cons (package-job store (job-name package)
                                                             package system)
                                                result)))
-                                    (cross-jobs system)))
+                                    (append (qemu-jobs store system)
+                                            (cross-jobs system))))
                    ((core)
                     ;; Build core packages only.
                     (append (map (lambda (package)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,6 +29,9 @@
  ;; newer, even though they may not correspond.
  (set! %fresh-auto-compile #t)

+  ;; Display which files are loaded.
+  (set! %load-verbosely #t)
+
  (and=> (assoc-ref (current-source-location) 'filename)
         (lambda (file)
           (let ((dir (string-append (dirname file) "/../..")))
@@ -4,7 +4,7 @@ exec guile -l "$0"                              \
             (cdr (command-line)))'
 !#
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -148,7 +148,8 @@ decreasing, is 1."

    `(div "status: "
          ,(url "x86_64-linux") " "
-          ,(url "i686-linux")))
+          ,(url "i686-linux") " "
+          ,(url "mips64el-linux")))

  (define (package-logo name)
    (and=> (lookup-gnu-package name)
@@ -38,13 +38,21 @@ if test "x$guix_build_daemon" = "xyes"; then
  case "$LIBGCRYPT_PREFIX" in
    no)
      LIBGCRYPT_CFLAGS=""
-      LIBGCRYPT_LIBS=""
      ;;
    *)
      LIBGCRYPT_CFLAGS="-I$LIBGCRYPT_PREFIX/include"
-      LIBGCRYPT_LIBS="-L$LIBGCRYPT_PREFIX/lib -lgcrypt"
      ;;
  esac
+
+  case "$LIBGCRYPT_LIBDIR" in
+    no)
+      LIBGCRYPT_LIBS="-lgcrypt"
+      ;;
+   *)
+      LIBGCRYPT_LIBS="-L$LIBGCRYPT_LIBDIR -lgcrypt"
+      ;;
+  esac
+
  AC_SUBST([LIBGCRYPT_CFLAGS])
  AC_SUBST([LIBGCRYPT_LIBS])

@@ -67,9 +75,14 @@ if test "x$guix_build_daemon" = "xyes"; then
  AC_CHECK_FUNCS([chroot unshare])
  AC_CHECK_HEADERS([sched.h sys/param.h sys/mount.h])

-  dnl Check for lutimes, optionally used for changing the mtime of
-  dnl symlinks.
-  AC_CHECK_FUNCS([lutimes])
+  dnl lutimes and lchown: used when canonicalizing store items.
+  dnl posix_fallocate: used when extracting archives.
+  dnl vfork: to speed up spawning of helper programs.
+  dnl sched_setaffinity: to improve RPC locality.
+  dnl statvfs: to detect disk-full conditions.
+  dnl strsignal: for error reporting.
+  AC_CHECK_FUNCS([lutimes lchown posix_fallocate vfork sched_setaffinity \
+     statvfs nanosleep strsignal])

  dnl Check whether the store optimiser can optimise symlinks.
  AC_MSG_CHECKING([whether it is possible to create a link to a symlink])
@@ -95,6 +108,17 @@ if test "x$guix_build_daemon" = "xyes"; then
  dnl Check for <linux/fs.h> (for immutable file support).
  AC_CHECK_HEADERS([linux/fs.h])

+  dnl Check whether the 'offload' build hook can be built (uses
+  dnl 'restore-file-set', which requires unbuffered custom binary input
+  dnl ports from Guile >= 2.0.10.)
+  GUIX_CHECK_UNBUFFERED_CBIP
+  guix_build_daemon_offload="$ac_cv_guix_cbips_support_setvbuf"
+
+  if test "x$guix_build_daemon_offload" = "xyes"; then
+    AC_DEFINE([HAVE_DAEMON_OFFLOAD_HOOK], [1],
+      [Define if the daemon's 'offload' build hook is being built.])
+  fi
+
  dnl Temporary directory used to store the daemon's data.
  AC_MSG_CHECKING([for unit test root])
  GUIX_TEST_ROOT="`pwd`/test-tmp"
@@ -105,6 +129,13 @@ if test "x$guix_build_daemon" = "xyes"; then
    [chmod +x nix/scripts/list-runtime-roots])
  AC_CONFIG_FILES([nix/scripts/substitute-binary],
    [chmod +x nix/scripts/substitute-binary])
+  AC_CONFIG_FILES([nix/scripts/guix-authenticate],
+    [chmod +x nix/scripts/guix-authenticate])
+  AC_CONFIG_FILES([nix/scripts/offload],
+    [chmod +x nix/scripts/offload])
 fi

 AM_CONDITIONAL([BUILD_DAEMON], [test "x$guix_build_daemon" = "xyes"])
+AM_CONDITIONAL([BUILD_DAEMON_OFFLOAD],			\
+  [test "x$guix_build_daemon" = "xyes"			\
+   && test "x$guix_build_daemon_offload" = "xyes"])
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.

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

@@ -26,20 +26,29 @@ GUIX_ASSERT_SUPPORTED_SYSTEM

 AC_ARG_WITH(store-dir,
  AC_HELP_STRING([--with-store-dir=PATH],
-    [path of the store (defaults to /nix/store)]),
+    [file name of the store (defaults to /gnu/store)]),
  [storedir="$withval"],
-  [storedir="/nix/store"])
+  [storedir="/gnu/store"])
 AC_SUBST(storedir)

+dnl Better be verbose.
+AC_MSG_CHECKING([for the store directory])
+AC_MSG_RESULT([$storedir])
+
 AC_ARG_ENABLE([daemon],
  [AS_HELP_STRING([--disable-daemon], [build the Nix daemon (C++)])],
  [guix_build_daemon="$enableval"],
  [guix_build_daemon="yes"])

-# Prepare a version of $localstatedir that does not contain references
+# Prepare a version of $localstatedir & co. that does not contain references
 # to shell variables.
-guix_localstatedir="`eval echo $localstatedir | sed -e "s|NONE|/usr/local|g"`"
+guix_prefix="`eval echo $prefix | sed -e"s|NONE|/usr/local|g"`"
+guix_localstatedir="`eval echo $localstatedir | sed -e "s|NONE|$guix_prefix|g"`"
+guix_sysconfdir="`eval echo $sysconfdir | sed -e "s|NONE|$guix_prefix|g"`"
+guix_sbindir="`eval echo $sbindir | sed -e "s|NONE|$guix_prefix|g"`"
 AC_SUBST([guix_localstatedir])
+AC_SUBST([guix_sysconfdir])
+AC_SUBST([guix_sbindir])

 dnl We require the pkg.m4 set of macros from pkg-config.
 dnl Make sure it's available.
@@ -60,7 +69,8 @@ GUIX_CHECK_SRFI_37
 AM_CONDITIONAL([INSTALL_SRFI_37], [test "x$ac_cv_guix_srfi_37_broken" = xyes])

 AC_ARG_WITH([nix-prefix],
-  [AS_HELP_STRING([--with-nix-prefix=DIR], [search for Nix in DIR])],
+  [AS_HELP_STRING([--with-nix-prefix=DIR],
+    [search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])],
  [case "$withval" in
    yes|no) ;;
    *)
@@ -84,7 +94,8 @@ if test "x$NIX_INSTANTIATE" = "x"; then
 fi

 AC_ARG_WITH([nixpkgs],
-  [AS_HELP_STRING([--with-nixpkgs=DIR], [search for Nixpkgs in DIR])],
+  [AS_HELP_STRING([--with-nixpkgs=DIR],
+    [search for Nixpkgs in DIR (for testing purposes only)])],
  [case "$withval" in
    yes|no) AC_MSG_ERROR([Please use `--with-nixpkgs=DIR'.]);;
    *)      NIXPKGS="$withval";;
@@ -105,19 +116,44 @@ AC_ARG_WITH([libgcrypt-prefix],
    yes|no)
      LIBGCRYPT="libgcrypt"
      LIBGCRYPT_PREFIX="no"
+      LIBGCRYPT_LIBDIR="no"
      ;;
    *)
      LIBGCRYPT="$withval/lib/libgcrypt"
      LIBGCRYPT_PREFIX="$withval"
+      LIBGCRYPT_LIBDIR="$withval/lib"
      ;;
   esac],
-  [LIBGCRYPT="libgcrypt"])
+  [LIBGCRYPT="libgcrypt"
+   LIBGCRYPT_PREFIX="no"
+   LIBGCRYPT_LIBDIR="no"])
+
+AC_ARG_WITH([libgcrypt-libdir],
+  [AS_HELP_STRING([--with-libgcrypt-libdir=DIR],
+     [search for GNU libgcrypt's shared library in DIR])],
+  [case "$withval" in
+    yes|no)
+      LIBGCRYPT="libgcrypt"
+      LIBGCRYPT_LIBDIR="no"
+      ;;
+    *)
+      LIBGCRYPT="$withval/libgcrypt"
+      LIBGCRYPT_LIBDIR="$withval"
+      ;;
+   esac],
+  [if test "x$LIBGCRYPT" = x; then
+      LIBGCRYPT="libgcrypt"
+   fi
+   if test "x$LIBGCRYPT_LIBDIR" = x; then
+      LIBGCRYPT_LIBDIR="no"
+   fi])

 dnl Library name suitable for `dynamic-link'.
 AC_MSG_CHECKING([for libgcrypt shared library name])
 AC_MSG_RESULT([$LIBGCRYPT])
 AC_SUBST([LIBGCRYPT])
 AC_SUBST([LIBGCRYPT_PREFIX])
+AC_SUBST([LIBGCRYPT_LIBDIR])

 GUIX_ASSERT_LIBGCRYPT_USABLE

@@ -130,7 +166,8 @@ dnl See `HACKING' for more info.
 AM_MISSING_PROG([DOT], [dot])

 AC_CONFIG_FILES([Makefile
-                 po/Makefile.in
+                 po/guix/Makefile.in
+                 po/packages/Makefile.in
 		 guix/config.scm])

 AC_CONFIG_FILES([scripts/guix], [chmod +x scripts/guix])
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -20,12 +20,13 @@
 # Integration of the `guix-daemon' code taken from upstream Nix.
 #

-BUILT_SOURCES = nix/libstore/schema.sql.hh
+BUILT_SOURCES += nix/libstore/schema.sql.hh
 CLEANFILES += $(BUILT_SOURCES)

 noinst_LIBRARIES = libformat.a libutil.a libstore.a

-AM_CXXFLAGS = -Wall
+# Use '-std=c++0x' for 'std::shared_ptr'.
+AM_CXXFLAGS = -Wall -std=c++0x

 libformat_a_SOURCES =				\
  nix/boost/format/free_funcs.cc		\
@@ -33,10 +34,7 @@ libformat_a_SOURCES =				\
  nix/boost/format/format_implementation.cc

 libformat_headers =				\
-  nix/boost/weak_ptr.hpp			\
  nix/boost/throw_exception.hpp			\
-  nix/boost/checked_delete.hpp			\
-  nix/boost/shared_ptr.hpp			\
  nix/boost/format.hpp				\
  nix/boost/assert.hpp				\
  nix/boost/format/macros_default.hpp		\
@@ -46,16 +44,14 @@ libformat_headers =				\
  nix/boost/format/group.hpp			\
  nix/boost/format/feed_args.hpp		\
  nix/boost/format/internals_fwd.hpp		\
-  nix/boost/format/internals.hpp		\
-  nix/boost/detail/workaround.hpp		\
-  nix/boost/detail/shared_count.hpp		\
-  nix/boost/enable_shared_from_this.hpp
+  nix/boost/format/internals.hpp

 libformat_a_CPPFLAGS =				\
  -I$(top_srcdir)/nix

 libutil_a_SOURCES =				\
  nix/libutil/archive.cc			\
+  nix/libutil/affinity.cc			\
  nix/libutil/serialise.cc			\
  nix/libutil/util.cc				\
  nix/libutil/xml-writer.cc			\
@@ -63,6 +59,7 @@ libutil_a_SOURCES =				\
  nix/libutil/gcrypt-hash.cc

 libutil_headers =				\
+  nix/libutil/affinity.hh			\
  nix/libutil/hash.hh				\
  nix/libutil/serialise.hh			\
  nix/libutil/xml-writer.hh			\
@@ -110,14 +107,14 @@ libstore_a_CPPFLAGS =				\
  -I$(top_builddir)/nix/libstore		\
  -DNIX_STORE_DIR=\"$(storedir)\"		\
  -DNIX_DATA_DIR=\"$(datadir)\"			\
-  -DNIX_STATE_DIR=\"$(localstatedir)/nix\"	\
-  -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\"	\
-  -DNIX_CONF_DIR=\"$(sysconfdir)/nix\"		\
+  -DNIX_STATE_DIR=\"$(localstatedir)/guix\"	\
+  -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\"	\
+  -DNIX_CONF_DIR=\"$(sysconfdir)/guix\"		\
  -DNIX_LIBEXEC_DIR=\"$(libexecdir)\"		\
  -DNIX_BIN_DIR=\"$(bindir)\"			\
-  -DOPENSSL_PATH="\"openssl\""
+  -DOPENSSL_PATH="\"guix-authenticate\""

-libstore_a_CXXFLAGS =				\
+libstore_a_CXXFLAGS = $(AM_CXXFLAGS)		\
  $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)

 bin_PROGRAMS = guix-daemon
@@ -153,16 +150,6 @@ guix_register_LDADD =				\
  $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS)


-libexec_PROGRAMS = nix-setuid-helper
-nix_setuid_helper_SOURCES =			\
-  nix/nix-setuid-helper/nix-setuid-helper.cc
-
-nix_setuid_helper_CPPFLAGS =			\
-  $(libutil_a_CPPFLAGS)
-
-nix_setuid_helper_LDADD =			\
-  libutil.a libformat.a
-
 noinst_HEADERS =						\
  $(libformat_headers) $(libutil_headers) $(libstore_headers)	\
  $(guix_daemon_headers)
@@ -180,6 +167,18 @@ nodist_pkglibexec_SCRIPTS =			\
  nix/scripts/list-runtime-roots		\
  nix/scripts/substitute-binary

+if BUILD_DAEMON_OFFLOAD
+
+nodist_pkglibexec_SCRIPTS +=			\
+  nix/scripts/offload
+
+endif BUILD_DAEMON_OFFLOAD
+
+
+# XXX: It'd be better to hide it in $(pkglibexecdir).
+nodist_libexec_SCRIPTS =			\
+  nix/scripts/guix-authenticate
+
 EXTRA_DIST +=					\
  nix/sync-with-upstream			\
  nix/libstore/schema.sql			\
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
 #
 # This file is part of GNU Guix.
@@ -24,6 +24,15 @@ EXTRA_DIST +=					\
  doc/images/bootstrap-graph.eps		\
  doc/images/bootstrap-graph.pdf

+# Bundle this file so that makeinfo finds it in out-of-source-tree builds.
+BUILT_SOURCES        += doc/os-config.texi
+EXTRA_DIST           += doc/os-config.texi
+MAINTAINERCLEANFILES  = doc/os-config.texi
+
+doc/os-config.texi: gnu/system/os-config.tmpl
+	$(MKDIR_P) "`dirname "$@"`"
+	cp "$<" "$@"
+
 infoimagedir = $(infodir)/images
 dist_infoimage_DATA = doc/images/bootstrap-graph.png

@@ -1,7 +1,7 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
-# Copyright © 2013 Andreas Enge <andreas@enge.fr>
-# Copyright © 2013 Mark H Weaver <mhw@netris.org>
+# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
+# Copyright © 2013, 2014 Mark H Weaver <mhw@netris.org>
 #
 # This file is part of GNU Guix.
 #
@@ -22,46 +22,69 @@
 # binaries.

 GNU_SYSTEM_MODULES =				\
+  gnu.scm					\
  gnu/packages.scm				\
  gnu/packages/acct.scm				\
  gnu/packages/acl.scm				\
+  gnu/packages/admin.scm			\
  gnu/packages/algebra.scm			\
+  gnu/packages/aidc.scm 			\
  gnu/packages/apl.scm				\
  gnu/packages/apr.scm				\
+  gnu/packages/asciidoc.scm			\
  gnu/packages/aspell.scm			\
  gnu/packages/attr.scm				\
  gnu/packages/autogen.scm			\
  gnu/packages/autotools.scm			\
  gnu/packages/avahi.scm			\
+  gnu/packages/backup.scm			\
  gnu/packages/base.scm				\
  gnu/packages/bash.scm				\
  gnu/packages/bdb.scm				\
  gnu/packages/bdw-gc.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/cflow.scm			\
  gnu/packages/check.scm			\
  gnu/packages/cmake.scm			\
  gnu/packages/compression.scm			\
  gnu/packages/complexity.scm			\
+  gnu/packages/conkeror.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/curl.scm				\
+  gnu/packages/cursynth.scm			\
  gnu/packages/cyrus-sasl.scm			\
+  gnu/packages/datamash.scm			\
+  gnu/packages/dc.scm				\
  gnu/packages/dejagnu.scm			\
-  gnu/packages/ddrescue.scm			\
+  gnu/packages/dictionaries.scm			\
+  gnu/packages/disk.scm				\
+  gnu/packages/docbook.scm			\
+  gnu/packages/doxygen.scm			\
  gnu/packages/dwm.scm				\
  gnu/packages/ed.scm				\
+  gnu/packages/elf.scm				\
  gnu/packages/emacs.scm			\
-  gnu/packages/fdisk.scm			\
  gnu/packages/file.scm				\
+  gnu/packages/fish.scm				\
  gnu/packages/flex.scm				\
+  gnu/packages/fltk.scm				\
  gnu/packages/fonts.scm			\
  gnu/packages/fontutils.scm			\
  gnu/packages/freeipmi.scm			\
+  gnu/packages/ftp.scm				\
+  gnu/packages/games.scm			\
  gnu/packages/gawk.scm				\
  gnu/packages/gcal.scm				\
  gnu/packages/gcc.scm				\
@@ -71,6 +94,8 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/geeqie.scm			\
  gnu/packages/gettext.scm			\
  gnu/packages/ghostscript.scm			\
+  gnu/packages/giflib.scm			\
+  gnu/packages/gimp.scm				\
  gnu/packages/gkrellm.scm			\
  gnu/packages/gl.scm				\
  gnu/packages/glib.scm				\
@@ -78,6 +103,7 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/gnome.scm			\
  gnu/packages/gnunet.scm			\
  gnu/packages/gnupg.scm			\
+  gnu/packages/gnustep.scm			\
  gnu/packages/gnutls.scm			\
  gnu/packages/gnuzilla.scm			\
  gnu/packages/gnu-pw-mgr.scm			\
@@ -93,13 +119,18 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/guile.scm			\
  gnu/packages/guile-wm.scm			\
  gnu/packages/gv.scm				\
-  gnu/packages/help2man.scm			\
+  gnu/packages/gxmessage.scm			\
  gnu/packages/hugs.scm				\
+  gnu/packages/hurd.scm				\
  gnu/packages/icu4c.scm			\
  gnu/packages/idutils.scm			\
+  gnu/packages/image.scm			\
  gnu/packages/imagemagick.scm			\
  gnu/packages/indent.scm			\
+  gnu/packages/inkscape.scm			\
  gnu/packages/irssi.scm			\
+  gnu/packages/iso-codes.scm			\
+  gnu/packages/jrnl.scm				\
  gnu/packages/kde.scm				\
  gnu/packages/ld-wrapper.scm			\
  gnu/packages/less.scm				\
@@ -108,55 +139,67 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/libdaemon.scm			\
  gnu/packages/libevent.scm			\
  gnu/packages/libffi.scm			\
+  gnu/packages/libftdi.scm			\
  gnu/packages/libidn.scm			\
-  gnu/packages/libjpeg.scm			\
  gnu/packages/libphidget.scm			\
-  gnu/packages/libpng.scm			\
  gnu/packages/libsigsegv.scm			\
-  gnu/packages/libtiff.scm			\
  gnu/packages/libunistring.scm			\
  gnu/packages/libusb.scm			\
  gnu/packages/libunwind.scm			\
  gnu/packages/lightning.scm			\
+  gnu/packages/links.scm			\
  gnu/packages/linux.scm			\
-  gnu/packages/linux-initrd.scm			\
+  gnu/packages/lisp.scm			\
  gnu/packages/lout.scm				\
  gnu/packages/lsh.scm				\
  gnu/packages/lsof.scm				\
  gnu/packages/lua.scm				\
  gnu/packages/lvm.scm				\
+  gnu/packages/lynx.scm				\
  gnu/packages/m4.scm				\
+  gnu/packages/man.scm				\
  gnu/packages/mail.scm				\
  gnu/packages/make-bootstrap.scm		\
  gnu/packages/maths.scm			\
+  gnu/packages/mc.scm				\
+  gnu/packages/mcrypt.scm			\
+  gnu/packages/messaging.scm			\
  gnu/packages/mit-krb5.scm			\
+  gnu/packages/moe.scm				\
+  gnu/packages/mpd.scm				\
  gnu/packages/mp3.scm				\
+  gnu/packages/mpi.scm				\
  gnu/packages/multiprecision.scm		\
  gnu/packages/mtools.scm			\
  gnu/packages/mysql.scm			\
  gnu/packages/nano.scm				\
+  gnu/packages/ncdu.scm				\
  gnu/packages/ncurses.scm			\
  gnu/packages/netpbm.scm			\
  gnu/packages/nettle.scm			\
+  gnu/packages/node.scm				\
  gnu/packages/noweb.scm			\
  gnu/packages/ocaml.scm			\
  gnu/packages/ocrad.scm			\
-  gnu/packages/oggvorbis.scm			\
+  gnu/packages/onc-rpc.scm			\
  gnu/packages/openldap.scm			\
  gnu/packages/openssl.scm			\
  gnu/packages/package-management.scm		\
  gnu/packages/parallel.scm			\
-  gnu/packages/parted.scm			\
-  gnu/packages/patchelf.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/popt.scm				\
  gnu/packages/pth.scm				\
  gnu/packages/pulseaudio.scm			\
+  gnu/packages/pretty-print.scm			\
+  gnu/packages/protobuf.scm			\
  gnu/packages/python.scm			\
  gnu/packages/qemu.scm				\
  gnu/packages/qt.scm				\
@@ -170,6 +213,7 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/scheme.scm			\
  gnu/packages/screen.scm			\
  gnu/packages/sdl.scm				\
+  gnu/packages/search.scm			\
  gnu/packages/serveez.scm			\
  gnu/packages/shishi.scm			\
  gnu/packages/skribilo.scm			\
@@ -177,27 +221,32 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/smalltalk.scm			\
  gnu/packages/sqlite.scm			\
  gnu/packages/ssh.scm				\
+  gnu/packages/stalonetray.scm			\
  gnu/packages/swig.scm				\
-  gnu/packages/system.scm			\
  gnu/packages/tcl.scm				\
  gnu/packages/tcsh.scm				\
+  gnu/packages/telephony.scm			\
  gnu/packages/texinfo.scm			\
  gnu/packages/texlive.scm			\
  gnu/packages/time.scm				\
  gnu/packages/tmux.scm				\
  gnu/packages/tor.scm				\
+  gnu/packages/uucp.scm				\
  gnu/packages/unrtf.scm			\
+  gnu/packages/upnp.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/web.scm				\
  gnu/packages/wget.scm				\
  gnu/packages/which.scm			\
  gnu/packages/wordnet.scm			\
+  gnu/packages/xiph.scm				\
  gnu/packages/xlockmore.scm			\
  gnu/packages/xml.scm				\
  gnu/packages/xnee.scm				\
@@ -206,10 +255,22 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/zile.scm				\
  gnu/packages/zip.scm				\
 						\
+  gnu/services.scm				\
+  gnu/services/avahi.scm			\
+  gnu/services/base.scm				\
+  gnu/services/dbus.scm				\
+  gnu/services/dmd.scm				\
+  gnu/services/networking.scm			\
+  gnu/services/ssh.scm				\
+  gnu/services/xorg.scm				\
+						\
  gnu/system.scm				\
-  gnu/system/dmd.scm				\
+  gnu/system/file-systems.scm			\
  gnu/system/grub.scm				\
+  gnu/system/install.scm			\
+  gnu/system/os-config.tmpl			\
  gnu/system/linux.scm				\
+  gnu/system/linux-initrd.scm			\
  gnu/system/shadow.scm				\
  gnu/system/vm.scm

@@ -221,38 +282,52 @@ dist_patch_DATA =						\
  gnu/packages/patches/avahi-localstatedir.patch		\
  gnu/packages/patches/bigloo-gc-shebangs.patch			\
  gnu/packages/patches/binutils-ld-new-dtags.patch		\
-  gnu/packages/patches/binutils-loongson-madd-fix.patch		\
  gnu/packages/patches/binutils-loongson-workaround.patch	\
+  gnu/packages/patches/ccache-stdc-predef-test.patch		\
  gnu/packages/patches/cdparanoia-fpic.patch			\
+  gnu/packages/patches/clucene-pkgconfig.patch			\
  gnu/packages/patches/cmake-fix-tests.patch			\
+  gnu/packages/patches/coreutils-dummy-man.patch		\
+  gnu/packages/patches/coreutils-skip-nohup.patch		\
  gnu/packages/patches/cpio-gets-undeclared.patch		\
+  gnu/packages/patches/cssc-gets-undeclared.patch               \
+  gnu/packages/patches/cssc-missing-include.patch               \
+  gnu/packages/patches/curl-fix-test172.patch			\
+  gnu/packages/patches/cursynth-wave-rand.patch			\
  gnu/packages/patches/dbus-localstatedir.patch			\
  gnu/packages/patches/diffutils-gets-undeclared.patch		\
-  gnu/packages/patches/dmd-getpw.patch				\
+  gnu/packages/patches/doxygen-test.patch			\
+  gnu/packages/patches/doxygen-tmake.patch			\
  gnu/packages/patches/emacs-configure-sh.patch			\
-  gnu/packages/patches/ffmpeg-check.patch			\
  gnu/packages/patches/findutils-absolute-paths.patch		\
-  gnu/packages/patches/flac-fix-memcmp-not-declared.patch	\
  gnu/packages/patches/flex-bison-tests.patch			\
  gnu/packages/patches/gawk-shell.patch				\
  gnu/packages/patches/gcc-cross-environment-variables.patch	\
  gnu/packages/patches/gd-mips64-deplibs-fix.patch		\
-  gnu/packages/patches/gdb-loongson-madd-fix.patch		\
  gnu/packages/patches/glib-tests-desktop.patch			\
  gnu/packages/patches/glib-tests-homedir.patch			\
-  gnu/packages/patches/glib-tests-newnet.patch			\
  gnu/packages/patches/glib-tests-prlimit.patch			\
+  gnu/packages/patches/glib-tests-timer.patch			\
  gnu/packages/patches/glibc-bootstrap-system.patch		\
  gnu/packages/patches/glibc-ldd-x86_64.patch			\
-  gnu/packages/patches/glibc-make-4.0.patch			\
+  gnu/packages/patches/gnunet-fix-scheduler.patch		\
+  gnu/packages/patches/gnunet-fix-tests.patch    		\
+  gnu/packages/patches/gobject-introspection-cc.patch		\
  gnu/packages/patches/grub-gets-undeclared.patch		\
  gnu/packages/patches/gstreamer-0.10-bison3.patch		\
  gnu/packages/patches/gstreamer-0.10-silly-test.patch		\
  gnu/packages/patches/guile-1.8-cpp-4.5.patch			\
  gnu/packages/patches/guile-default-utf8.patch			\
  gnu/packages/patches/guile-linux-syscalls.patch		\
+  gnu/packages/patches/guile-ncurses-tests.patch		\
  gnu/packages/patches/guile-relocatable.patch			\
+  gnu/packages/patches/guix-test-networking.patch		\
+  gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
  gnu/packages/patches/hop-bigloo-4.0b.patch			\
+  gnu/packages/patches/icu4c-test-date-format.patch		\
+  gnu/packages/patches/inkscape-stray-comma.patch               \
+  gnu/packages/patches/kmod-module-directory.patch		\
+  gnu/packages/patches/libbonobo-activation-test-race.patch	\
  gnu/packages/patches/libevent-dns-tests.patch			\
  gnu/packages/patches/libffi-mips-n32-fix.patch		\
  gnu/packages/patches/liboop-mips64-deplibs-fix.patch		\
@@ -260,26 +335,46 @@ dist_patch_DATA =						\
  gnu/packages/patches/libtheora-config-guess.patch		\
  gnu/packages/patches/libtool-skip-tests.patch			\
  gnu/packages/patches/libtool-skip-tests-for-mips.patch	\
+  gnu/packages/patches/libssh-CVE-2014-0017.patch		\
  gnu/packages/patches/luit-posix.patch				\
  gnu/packages/patches/m4-gets-undeclared.patch			\
  gnu/packages/patches/m4-readlink-EINVAL.patch			\
  gnu/packages/patches/make-impure-dirs.patch			\
+  gnu/packages/patches/mc-fix-ncurses-build.patch		\
  gnu/packages/patches/mcron-install.patch			\
+  gnu/packages/patches/mhash-keygen-test-segfault.patch		\
  gnu/packages/patches/mit-krb5-init-fix.patch			\
+  gnu/packages/patches/mpc123-initialize-ao.patch		\
+  gnu/packages/patches/module-init-tools-moduledir.patch	\
+  gnu/packages/patches/patchelf-page-size.patch			\
+  gnu/packages/patches/patchutils-xfail-gendiff-tests.patch	\
  gnu/packages/patches/perl-no-sys-dirs.patch			\
+  gnu/packages/patches/perl-tk-x11-discover.patch		\
+  gnu/packages/patches/petsc-fix-threadcomm.patch		\
+  gnu/packages/patches/pingus-sdl-libs-config.patch		\
  gnu/packages/patches/plotutils-libpng-jmpbuf.patch		\
  gnu/packages/patches/procps-make-3.82.patch			\
-  gnu/packages/patches/pspp-tests.patch				\
-  gnu/packages/patches/pulseaudio-test-timeouts.patch		\
-  gnu/packages/patches/python-fix-dbm.patch			\
-  gnu/packages/patches/qemu-make-4.0.patch			\
-  gnu/packages/patches/qemu-multiple-smb-shares.patch		\
+  gnu/packages/patches/pybugz-encode-error.patch		\
+  gnu/packages/patches/pybugz-stty.patch			\
+  gnu/packages/patches/python-fix-tests.patch			\
+  gnu/packages/patches/python-libffi-mips-n32-fix.patch		\
  gnu/packages/patches/qt4-tests.patch				\
+  gnu/packages/patches/ratpoison-shell.patch			\
  gnu/packages/patches/readline-link-ncurses.patch		\
  gnu/packages/patches/ripperx-libm.patch			\
  gnu/packages/patches/scheme48-tests.patch			\
+  gnu/packages/patches/scotch-test-threading.patch		\
+  gnu/packages/patches/slim-session.patch			\
+  gnu/packages/patches/slim-config.patch			\
+  gnu/packages/patches/slim-sigusr1.patch			\
+  gnu/packages/patches/soprano-find-clucene.patch		\
+  gnu/packages/patches/source-highlight-regexrange-test.patch	\
+  gnu/packages/patches/sqlite-large-page-size-fix.patch		\
+  gnu/packages/patches/superlu-dist-scotchmetis.patch		\
  gnu/packages/patches/tcsh-fix-autotest.patch			\
  gnu/packages/patches/teckit-cstdio.patch			\
+  gnu/packages/patches/udev-gir-libtool.patch			\
+  gnu/packages/patches/util-linux-perl.patch			\
  gnu/packages/patches/valgrind-glibc.patch			\
  gnu/packages/patches/vpnc-script.patch			\
  gnu/packages/patches/w3m-fix-compile.patch			\
@@ -0,0 +1,46 @@
+;;; 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))
+
+;;; Commentary:
+;;;
+;;; This composite module re-exports core parts the (gnu …) public modules.
+;;;
+;;; Code:
+
+(eval-when (eval load compile)
+  (begin
+    (define %public-modules
+      '((gnu system)
+        (gnu system file-systems)
+        (gnu system grub)                         ; 'grub-configuration'
+        (gnu system linux)                        ; 'base-pam-services'
+        (gnu system shadow)                       ; 'user-account'
+        (gnu system linux-initrd)
+        (gnu services)
+        (gnu services base)
+        (gnu packages)
+        (gnu packages base)))
+
+    (for-each (let ((i (module-public-interface (current-module))))
+                (lambda (m)
+                  (module-use! i (resolve-interface m))))
+              %public-modules)))
+
+;;; gnu.scm ends here
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,9 +32,16 @@
            search-bootstrap-binary
            %patch-directory
            %bootstrap-binaries-path
+
            fold-packages
+
            find-packages-by-name
-            find-newest-available-packages))
+            find-best-packages-by-name
+            find-newest-available-packages
+
+            package-direct-dependents
+            package-transitive-dependents
+            package-covering-dependents))

 ;;; Commentary:
 ;;;
@@ -148,24 +156,93 @@ then only return packages whose version is equal to VERSION."
                       result))
                 '()))

-(define (find-newest-available-packages)
-  "Return a vhash keyed by package names, and with
+(define find-newest-available-packages
+  (memoize
+   (lambda ()
+     "Return a vhash keyed by package names, and with
 associated values of the form

  (newest-version newest-package ...)

 where the preferred package is listed first."

-  ;; FIXME: Currently, the preferred package is whichever one
-  ;; was found last by 'fold-packages'.  Find a better solution.
-  (fold-packages (lambda (p r)
-                   (let ((name    (package-name p))
-                         (version (package-version p)))
-                     (match (vhash-assoc name r)
-                       ((_ newest-so-far . pkgs)
-                        (case (version-compare version newest-so-far)
-                          ((>) (vhash-cons name `(,version ,p) r))
-                          ((=) (vhash-cons name `(,version ,p ,@pkgs) r))
-                          ((<) r)))
-                       (#f (vhash-cons name `(,version ,p) r)))))
-                 vlist-null))
+     ;; FIXME: Currently, the preferred package is whichever one
+     ;; was found last by 'fold-packages'.  Find a better solution.
+     (fold-packages (lambda (p r)
+                      (let ((name    (package-name p))
+                            (version (package-version p)))
+                        (match (vhash-assoc name r)
+                          ((_ newest-so-far . pkgs)
+                           (case (version-compare version newest-so-far)
+                             ((>) (vhash-cons name `(,version ,p) r))
+                             ((=) (vhash-cons name `(,version ,p ,@pkgs) r))
+                             ((<) r)))
+                          (#f (vhash-cons name `(,version ,p) r)))))
+                    vlist-null))))
+
+(define (find-best-packages-by-name name version)
+  "If version is #f, return the list of packages named NAME with the highest
+version numbers; otherwise, return the list of packages named NAME and at
+VERSION."
+  (if version
+      (find-packages-by-name name version)
+      (match (vhash-assoc name (find-newest-available-packages))
+        ((_ version pkgs ...) pkgs)
+        (#f '()))))
+
+
+(define* (vhash-refq vhash key #:optional (dflt #f))
+  "Look up KEY in the vhash VHASH, and return the value (if any) associated
+with it.  If KEY is not found, return DFLT (or `#f' if no DFLT argument is
+supplied).  Uses `eq?' for equality testing."
+  (or (and=> (vhash-assq key vhash) cdr)
+      dflt))
+
+(define package-dependencies
+  (memoize
+   (lambda ()
+     "Return a vhash keyed by package, and with associated values that are a
+list of packages that depend on that package."
+     (fold-packages
+      (lambda (package dag)
+        (fold
+         (lambda (in d)
+           ;; Insert a graph edge from each of package's inputs to package.
+           (vhash-consq in
+                        (cons package (vhash-refq d in '()))
+                        (vhash-delq in d)))
+         dag
+         (match (package-direct-inputs package)
+           (((labels packages . _) ...)
+            packages) )))
+      vlist-null))))
+
+(define (package-direct-dependents packages)
+  "Return a list of packages from the distribution that directly depend on the
+packages in PACKAGES."
+  (delete-duplicates
+   (concatenate
+    (map (lambda (p)
+           (vhash-refq (package-dependencies) p '()))
+         packages))))
+
+(define (package-transitive-dependents packages)
+  "Return the transitive dependent packages of the distribution packages in
+PACKAGES---i.e. the dependents of those packages, plus their dependents,
+recursively."
+  (let ((dependency-dag (package-dependencies)))
+    (fold-tree
+     cons '()
+     (lambda (node) (vhash-refq dependency-dag node))
+     ;; Start with the dependents to avoid including PACKAGES in the result.
+     (package-direct-dependents packages))))
+
+(define (package-covering-dependents packages)
+  "Return a minimal list of packages from the distribution whose dependencies
+include all of PACKAGES and all packages that depend on PACKAGES."
+  (let ((dependency-dag (package-dependencies)))
+    (fold-tree-leaves
+     cons '()
+     (lambda (node) (vhash-refq dependency-dag node))
+     ;; Start with the dependents to avoid including PACKAGES in the result.
+     (package-direct-dependents packages))))
@@ -0,0 +1,764 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.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 admin)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system trivial)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages tcl)
+  #:use-module ((gnu packages base)
+                #:select (tar))
+  #:use-module ((gnu packages compression)
+                #:select (gzip))
+  #:use-module ((gnu packages openssl)
+                #:renamer (symbol-prefix-proc 'o:))
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages groff)
+  #:use-module (gnu packages xorg))
+
+(define-public dmd
+  (package
+    (name "dmd")
+    (version "0.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "ftp://alpha.gnu.org/gnu/dmd/dmd-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "10fl4k96f17gqx2fv8iw9c61ld26gsk4bbrlfqckdmiimz1k175z"))))
+    (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 gpl3+)
+    (home-page "http://www.gnu.org/software/dmd/")))
+
+(define-public dfc
+  (package
+   (name "dfc")
+   (version "3.0.4")
+   (source
+    (origin
+     (method url-fetch)
+      (uri (string-append
+            "http://projects.gw-computing.net/attachments/download/79/dfc-"
+            version ".tar.gz"))
+      (sha256
+       (base32
+        "0zk1ppx93ijimf4sbgqilxxikpsa2gmpbynknyh41xy7jbdjxp0b"))))
+   (build-system cmake-build-system)
+   (arguments '(#:tests? #f)) ; There are no tests.
+   (native-inputs `(("gettext" ,gnu-gettext)))
+   (home-page "http://projects.gw-computing.net/projects/dfc")
+   (synopsis "Display file system space usage using graphs and colors")
+   (description
+    "dfc (df color) is a modern version of df.  It uses colors, draws pretty
+graphs and can export its output to different formats.")
+   (license bsd-3)))
+
+(define-public htop
+  (package
+   (name "htop")
+   (version "1.0.3")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "http://hisham.hm/htop/releases/"
+                  version "/htop-" version ".tar.gz"))
+            (sha256
+             (base32
+              "0a8qbpsifzjwc4f45xfwm48jhm59g6q5hlib4bf7z13mgy95fp05"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(("ncurses" ,ncurses)))
+   (home-page "http://htop.sourceforge.net/")
+   (synopsis "Interactive process viewer")
+   (description
+    "This is htop, an interactive process viewer.  It is a text-mode
+application (for console or X terminals) and requires ncurses.")
+   (license gpl2)))
+
+(define-public pies
+  (package
+    (name "pies")
+    (version "1.2")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/pies/pies-"
+                          version ".tar.bz2"))
+      (sha256
+       (base32
+        "18w0dbg77i56cx1bwa789w0qi3l4xkkbascxcv2b6gbm0zmjg1g6"))))
+    (build-system gnu-build-system)
+    (home-page "http://www.gnu.org/software/pies/")
+    (synopsis "Program invocation and execution supervisor")
+    (description
+     "GNU pies is a program that supervises the invocation and execution of
+other programs.  It reads the list of programs to be started from its
+configuration file, executes them, and then monitors their status,
+re-executing them as necessary.")
+    (license gpl3+)))
+
+(define-public inetutils
+  (package
+    (name "inetutils")
+    (version "1.9.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/inetutils/inetutils-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "04wrm0v7l4890mmbaawd6wjwdv08bkglgqhpz0q4dkb0l50fl8q4"))))
+    (build-system gnu-build-system)
+    (arguments `(;; FIXME: `tftp.sh' relies on `netstat' from utils-linux,
+                 ;; which is currently missing.
+                 #:tests? #f))
+    (inputs `(("ncurses" ,ncurses)
+              ("readline" ,readline)))            ; for 'ftp'
+    (home-page "http://www.gnu.org/software/inetutils/")
+    (synopsis "Basic networking utilities")
+    (description
+     "Inetutils is a collection of common network programs, such as an ftp
+client and server, a telnet client and server, and an rsh client and server.")
+    (license gpl3+)))
+
+(define-public shadow
+  (package
+    (name "shadow")
+    (version "4.1.5.1")
+    (source (origin
+             ;; Shadow has no real upstream, and not even tarballs.
+             ;; See <https://lists.gnu.org/archive/html/guix-devel/2014-03/msg00233.html>.
+             (method git-fetch)
+             (uri (git-reference
+                   (url "git://git.debian.org/git/pkg-shadow/shadow")
+                   (commit (string-append "upstream/" version))))
+             (sha256
+              (base32
+               "1xx85d83kmacmjzqbamgydcjkwsqd5fi1s2wgwx6myq5wa39qx0n"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(;; Assume System V `setpgrp (void)', which is the default on GNU
+       ;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
+       #:configure-flags '("--with-libpam" "ac_cv_func_setpgrp_void=yes")
+
+       #:phases (alist-cons-before
+                 'build 'set-nscd-file-name
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   ;; Use the right file name for nscd.
+                   (let ((libc (assoc-ref inputs "libc")))
+                     (substitute* "lib/nscd.c"
+                       (("/usr/sbin/nscd")
+                        (string-append libc "/sbin/nscd")))))
+                 (alist-cons-after
+                  'install 'remove-groups
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    ;; Remove `groups', which is already provided by Coreutils.
+                    (let* ((out (assoc-ref outputs "out"))
+                           (bin (string-append out "/bin"))
+                           (man (string-append out "/share/man/man1")))
+                      (delete-file (string-append bin "/groups"))
+                      (for-each delete-file (find-files man "^groups\\."))
+                      #t))
+                  %standard-phases))))
+
+    (inputs (if (string-suffix? "-linux"
+                                (or (%current-target-system)
+                                    (%current-system)))
+                `(("linux-pam" ,linux-pam))
+                '()))
+    (home-page "http://pkg-shadow.alioth.debian.org/")
+    (synopsis "Authentication-related tools such as passwd, su, and login")
+    (description
+     "Shadow provides a number of authentication-related tools, including:
+login, passwd, su, groupadd, and useradd.")
+
+    ;; The `vipw' program is GPLv2+.
+    ;; libmisc/salt.c is public domain.
+    (license bsd-3)))
+
+(define-public mingetty
+  (package
+    (name "mingetty")
+    (version "1.08")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://sourceforge/mingetty/mingetty-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (alist-replace 'configure
+                               (lambda* (#:key inputs outputs
+                                         #:allow-other-keys)
+                                 (let* ((out    (assoc-ref outputs "out"))
+                                        (man8   (string-append
+                                                 out "/share/man/man8"))
+                                        (sbin   (string-append out "/sbin"))
+                                        (shadow (assoc-ref inputs "shadow"))
+                                        (login  (string-append shadow
+                                                               "/bin/login")))
+                                   (substitute* "Makefile"
+                                     (("^SBINDIR.*")
+                                      (string-append "SBINDIR = " out
+                                                     "/sbin\n"))
+                                     (("^MANDIR.*")
+                                      (string-append "MANDIR = " out
+                                                     "/share/man/man8\n")))
+
+                                   ;; Pick the right 'login' by default.
+                                   (substitute* "mingetty.c"
+                                     (("\"/bin/login\"")
+                                      (string-append "\"" login "\"")))
+
+                                   (mkdir-p sbin)
+                                   (mkdir-p man8)))
+                               %standard-phases)
+       #:tests? #f))                              ; no tests
+    (inputs `(("shadow" ,shadow)))
+
+    (home-page "http://sourceforge.net/projects/mingetty")
+    (synopsis "Getty for the text console")
+    (description
+     "Small console getty that is started on the Linux text console,
+asks for a login name and then transfers over to 'login'.  It is extended to
+allow automatic login and starting any app.")
+    (license gpl2+)))
+
+(define-public net-base
+  (package
+    (name "net-base")
+    (version "5.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "mirror://debian/pool/main/n/netbase/netbase_"
+                   version ".tar.gz"))
+             (sha256
+              (base32
+               "01rkvqrg7krkx8b432nz6bpi8w3s4cm5q5r891k23cdrc9nsaayn"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils)
+                                (srfi srfi-26))
+
+                   (let* ((source (assoc-ref %build-inputs "source"))
+                          (tar    (assoc-ref %build-inputs "tar"))
+                          (gzip   (assoc-ref %build-inputs "gzip"))
+                          (output (assoc-ref %outputs "out"))
+                          (etc    (string-append output "/etc")))
+                     (setenv "PATH" (string-append gzip "/bin"))
+                     (system* (string-append tar "/bin/tar") "xvf"
+                              source)
+                     (chdir ,(string-append "netbase-" version))
+                     (mkdir-p etc)
+                     (for-each copy-file
+                               '("etc-services" "etc-protocols" "etc-rpc")
+                               (map (cut string-append etc "/" <>)
+                                    '("services" "protocols" "rpc")))
+                     #t))))
+    (native-inputs `(("tar" ,tar)
+                     ("gzip" ,gzip)))
+    (synopsis "IANA protocol, port, and RPC number assignments")
+    (description
+     "This package provides the /etc/services, /etc/protocols, and /etc/rpc
+files, which contain information about the IANA-assigned port, protocol, and
+ONC RPC numbers")
+    (home-page "http://packages.debian.org/sid/netbase")
+    (license gpl2)))
+
+(define-public netcat
+  (package
+    (name "netcat")
+    (version "0.7.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://sourceforge/netcat/netcat-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       ;; By default, man and info pages are put in PREFIX/{man,info},
+       ;; but we want them in PREFIX/share/{man,info}.
+       (let ((out (assoc-ref %outputs "out")))
+         (list (string-append "--mandir=" out "/share/man")
+               (string-append "--infodir=" out "/share/info")))))
+    (home-page "http://netcat.sourceforge.net")
+    (synopsis "Read and write data over TCP/IP")
+    (description
+     "Netcat is a featured networking utility which reads and writes data
+across network connections, using the TCP/IP protocol.  It is designed to be a
+reliable \"back-end\" tool that can be used directly or easily driven by other
+programs and scripts. At the same time, it is a feature-rich network debugging
+and exploration tool, since it can create almost any kind of connection you
+would need and has several interesting built-in capabilities.")
+    (license gpl2+)))
+
+(define-public alive
+  (package
+    (name "alive")
+    (version "2.0.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/alive/alive-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "1vrzg51ai68x9yld7vbgl58sxaw5qpx8rbakwcxn4cqq6vpxj38j"))))
+    (build-system gnu-build-system)
+    (arguments '(#:configure-flags '("alive_cv_nice_ping=yes")))
+    (inputs `(("guile" ,guile-2.0)
+              ("inetutils" ,inetutils)))
+    (home-page "http://www.gnu.org/software/alive/")
+    (synopsis "Autologin and keep-alive daemon")
+    (description
+     "GNU Alive sends periodic pings to a server, generally to keep a
+connection alive.")
+    (license gpl3+)))
+
+(define-public isc-dhcp
+  (package
+    (name "isc-dhcp")
+    (version "4.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://ftp.isc.org/isc/dhcp/"
+                                  version "/dhcp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12mydvj6x3zcl3gla06bywfkkrgg03g66fijs94mwb7kbiym3dm7"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-cons-after
+                 'configure 'post-configure
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   ;; Point to the right client script, which will be
+                   ;; installed in a later phase.
+                   (substitute* "includes/dhcpd.h"
+                     (("#define[[:blank:]]+_PATH_DHCLIENT_SCRIPT.*")
+                      (let ((out (assoc-ref outputs "out")))
+                        (string-append "#define _PATH_DHCLIENT_SCRIPT \""
+                                       out "/libexec/dhclient-script"
+                                       "\"\n"))))
+
+                   ;; During the 'build' phase, 'bind.tar.gz' is extracted, so
+                   ;; we must patch shebangs in there and make sure the right
+                   ;; shell is used.
+                   (with-directory-excursion "bind"
+                     (substitute* "Makefile"
+                       (("\\./configure")
+                        (let ((sh (which "sh")))
+                          (string-append "./configure CONFIG_SHELL="
+                                         sh " SHELL=" sh))))
+
+                     (system* "tar" "xf" "bind.tar.gz")
+                     (for-each patch-shebang
+                               (find-files "bind-9.9.5" ".*"))
+                     (zero? (system* "tar" "cf" "bind.tar.gz"
+                                     "bind-9.9.5"))))
+                 (alist-cons-after
+                  'install 'post-install
+                  (lambda* (#:key inputs outputs #:allow-other-keys)
+                    ;; Install the dhclient script for GNU/Linux and make sure
+                    ;; if finds all the programs it needs.
+                    (let* ((out       (assoc-ref outputs "out"))
+                           (libexec   (string-append out "/libexec"))
+                           (coreutils (assoc-ref inputs "coreutils"))
+                           (net-tools (assoc-ref inputs "net-tools"))
+                           (sed       (assoc-ref inputs "sed")))
+                      (substitute* "client/scripts/linux"
+                        (("/sbin/ip")
+                         (string-append (assoc-ref inputs "iproute")
+                                        "/sbin/ip")))
+
+                      (mkdir-p libexec)
+                      (copy-file "client/scripts/linux"
+                                 (string-append libexec "/dhclient-script"))
+
+                      (wrap-program (string-append libexec "/dhclient-script")
+                                    `("PATH" ":" prefix
+                                      ,(map (lambda (dir)
+                                              (string-append dir "/bin:"
+                                                             dir "/sbin"))
+                                            (list net-tools coreutils sed))))))
+                  %standard-phases))))
+
+    (native-inputs `(("perl" ,perl)))
+
+    (inputs `(("net-tools" ,net-tools)
+              ("iproute" ,iproute)
+
+              ;; When cross-compiling, we need the cross Coreutils and sed.
+              ;; Otherwise just use those from %FINAL-INPUTS.
+              ,@(if (%current-target-system)
+                    `(("coreutils" ,coreutils)
+                      ("sed" ,sed))
+                    '())))
+
+    (home-page "http://www.isc.org/products/DHCP/")
+    (synopsis "Dynamic Host Configuration Protocol (DHCP) tools")
+    (description
+     "ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a
+reference implementation of all aspects of DHCP, through a suite of DHCP
+tools: server, client, and relay agent.")
+    (license isc)))
+
+(define-public libpcap
+  (package
+    (name "libpcap")
+    (version "1.5.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.tcpdump.org/release/libpcap-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "14wyjywrdi1ikaj6yc9c72m6m2r64z94lb0gm7k1a3q6q5cj3scs"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("bison" ,bison) ("flex" ,flex)))
+    (arguments '(#:tests? #f))                    ; no 'check' target
+    (home-page "http://www.tcpdump.org")
+    (synopsis "Network packet capture library")
+    (description
+     "libpcap is an interface for user-level packet capture.  It provides a
+portable framework for low-level network monitoring.  Applications include
+network statistics collection, security monitoring, network debugging, etc.")
+
+    ;; fad-*.c and a couple other files are BSD-4, but the rest is BSD-3.
+    (license bsd-3)))
+
+(define-public tcpdump
+  (package
+    (name "tcpdump")
+    (version "4.5.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.tcpdump.org/release/tcpdump-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql"))))
+    (build-system gnu-build-system)
+    (inputs `(("libpcap" ,libpcap)
+              ("openssl" ,o:openssl)))
+    (native-inputs `(("perl" ,perl)))        ; for tests
+    (home-page "http://www.tcpdump.org/")
+    (synopsis "Network packet analyzer")
+    (description
+     "Tcpdump is a command-line tool to analyze network traffic passing
+through the network interface controller.")
+    (license bsd-3)))
+
+(define-public jnettop
+  (package
+    (name "jnettop")
+    (version "0.13.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://jnettop.kubs.info/dist/jnettop-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("glib" ,glib)
+       ("ncurses" ,ncurses)
+       ("libpcap" ,libpcap)))
+    (home-page "http://jnettop.kubs.info/")
+    (synopsis "Visualize network traffic by bandwidth use")
+    (description
+     "Jnettop is a traffic visualiser, which captures traffic going
+through the host it is running from and displays streams sorted
+by bandwidth they use.")
+    (license gpl2+)))
+
+(define-public clusterssh
+  (package
+    (name "clusterssh")
+    (version "3.28")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/clusterssh/"
+                                  "clusterssh-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1bwggpvaj2al5blg1ynapviv2kpydffpzq2zkhi81najnvzc1rr7"))))
+    (build-system gnu-build-system)
+    (inputs `(("perl" ,perl)))
+    (propagated-inputs `(("xterm" ,xterm)
+                         ("perl-tk" ,perl-tk)
+                         ("perl-x11-protocol" ,perl-x11-protocol)))
+    (arguments
+     `(#:phases
+       (alist-cons-after
+        'install 'set-load-paths
+        (lambda* (#:key inputs outputs #:allow-other-keys)
+          ;; Put the perl-tk and perl-x11-protocol modules in the perl inc
+          ;; path for PROG
+          (let* ((out  (assoc-ref outputs "out"))
+                 (prog (string-append out "/bin/cssh"))
+                 (perl-ver ,(package-version perl))
+                 (x11-inc (string-append
+                           (assoc-ref inputs "perl-x11-protocol")
+                           "/lib/perl5/site_perl/" perl-ver))
+                 (tk-inc (string-append
+                          (assoc-ref inputs "perl-tk")
+                          "/lib/perl5/site_perl/" perl-ver
+                          "/x86_64-linux")))
+            (wrap-program
+             prog
+             `("PERL5LIB" ":" prefix (,x11-inc ,tk-inc)))))
+        %standard-phases)))
+    ;; The clusterssh.sourceforge.net address requires login to view
+    (home-page "http://sourceforge.net/projects/clusterssh/")
+    (synopsis "Secure concurrent multi-server terminal control")
+    (description
+     "ClusterSSH controls a number of xterm windows via a single graphical
+console window to allow commands to be interactively run on multiple servers
+over ssh connections.")
+    (license gpl2+)))
+
+(define-public rottlog
+  (package
+    (name "rottlog")
+    (version "0.72.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/rottlog/rottlog-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "0751mb9l2f0jrk3vj6q8ilanifd121dliwk0c34g8k0dlzsv3kd7"))
+              (modules '((guix build utils)))
+              (snippet
+               '(substitute* "Makefile.in"
+                  (("-o \\$\\{LOG_OWN\\} -g \\$\\{LOG_GROUP\\}")
+                   ;; Don't try to chown root.
+                   "")
+                  (("mkdir -p \\$\\(ROTT_STATDIR\\)")
+                   ;; Don't attempt to create /var/lib/rottlog.
+                   "true")))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags (list (string-append "ROTT_ETCDIR="
+                                              (assoc-ref %outputs "out")
+                                              "/etc")
+                               "--localstatedir=/var")
+       #:phases (alist-cons-after
+                 'install 'install-info
+                 (lambda _
+                   (zero? (system* "make" "install-info")))
+                 %standard-phases)))
+    (native-inputs `(("texinfo" ,texinfo)
+                     ("util-linux" ,util-linux))) ; for 'cal'
+    (home-page "http://www.gnu.org/software/rottlog/")
+    (synopsis "Log rotation and management")
+    (description
+     "GNU Rot[t]log is a program for managing log files.  It is used to
+automatically rotate out log files when they have reached a given size or
+according to a given schedule.  It can also be used to automatically compress
+and archive such logs.  Rot[t]log will mail reports of its activity to the
+system administrator.")
+    (license gpl3+)))
+
+(define-public sudo
+  (package
+    (name "sudo")
+    (version "1.8.10p3")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (list (string-append "http://www.sudo.ws/sudo/dist/sudo-"
+                                    version ".tar.gz")
+                     (string-append "ftp://ftp.sudo.ws/pub/sudo/OLD/sudo-"
+                                    version ".tar.gz")))
+              (sha256
+               (base32
+                "002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags '("--with-logpath=/var/log/sudo.log")
+       #:phases (alist-cons-before
+                 'configure 'pre-configure
+                 (lambda _
+                   (substitute* "configure"
+                     ;; Refer to the right executables.
+                     (("/usr/bin/mv") (which "mv"))
+                     (("/usr/bin/sh") (which "sh")))
+                   (substitute* (find-files "." "Makefile\\.in")
+                     (("-O [[:graph:]]+ -G [[:graph:]]+")
+                      ;; Allow installation as non-root.
+                      "")
+                     (("^install: (.*)install-sudoers(.*)" _ before after)
+                      ;; Don't try to create /etc/sudoers.
+                      (string-append "install: " before after "\n"))))
+                 %standard-phases)
+
+       ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but
+       ;; the chroot's /etc/passwd doesn't have it.  Turn off the tests.
+       #:tests? #f))
+    (inputs
+     `(("groff" ,groff)
+       ("linux-pam" ,linux-pam)
+       ("coreutils" ,coreutils)))
+    (home-page "http://www.sudo.ws/")
+    (synopsis "Run commands as root")
+    (description
+     "Sudo (su \"do\") allows a system administrator to delegate authority to
+give certain users (or groups of users) the ability to run some (or all)
+commands as root or another user while providing an audit trail of the
+commands and their arguments.")
+
+    ;; See <http://www.sudo.ws/sudo/license.html>.
+    (license x11)))
+
+(define-public wpa-supplicant
+  (package
+    (name "wpa-supplicant")
+    (version "2.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://hostap.epitest.fi/releases/wpa_supplicant-"
+                    version
+                    ".tar.gz"))
+              (sha256
+               (base32
+                "1vf8jc4yyksbxf86narvsli3vxfbm8nbnim2mdp66nd6d3yvin70"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-replace
+                 'configure
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (chdir "wpa_supplicant")
+                   (copy-file "defconfig" ".config")
+                   (let ((port (open-file ".config" "al")))
+                     (display "
+      CONFIG_DEBUG_SYSLOG=y
+      CONFIG_CTRL_IFACE_DBUS=y
+      CONFIG_CTRL_IFACE_DBUS_NEW=y
+      CONFIG_CTRL_IFACE_DBUS_INTRO=y
+      CONFIG_DRIVER_NL80211=y
+      CFLAGS += $(shell pkg-config libnl-3.0 --cflags)
+      CONFIG_LIBNL32=y
+      CONFIG_READLINE=y\n" port)
+                     (close-port port)))
+                 %standard-phases)
+
+      #:make-flags (list "CC=gcc"
+                         (string-append "BINDIR=" (assoc-ref %outputs "out")
+                                        "/sbin")
+                         (string-append "LIBDIR=" (assoc-ref %outputs "out")
+                                        "/lib"))
+      #:tests? #f))
+    (inputs
+     `(("readline" ,readline)
+       ("libnl" ,libnl)
+       ("dbus" ,dbus)
+       ("openssl" ,o:openssl)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://hostap.epitest.fi/wpa_supplicant/")
+    (synopsis "Connecting to WPA and WPA2-protected wireless networks")
+    (description
+     "wpa_supplicant is a WPA Supplicant with support for WPA and WPA2 (IEEE
+802.11i / RSN).  Supplicant is the IEEE 802.1X/WPA component that is used in
+the client stations.  It implements key negotiation with a WPA Authenticator
+and it controls the roaming and IEEE 802.11 authentication/association of the
+WLAN driver.
+
+This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
+
+    ;; In practice, this is linked against Readline, which makes it GPLv3+.
+    (license bsd-3)))
+
+(define-public wakelan
+  (package
+    (name "wakelan")
+    (version "1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "ftp://ftp.gwdg.de/pub/linux/metalab/system/network/misc/wakelan-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-replace
+                 'configure
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let ((out (assoc-ref outputs "out")))
+                     (mkdir-p (string-append out "/bin"))
+                     (mkdir-p (string-append out "/share/man/man1"))
+
+                     ;; It's an old configure script that doesn't understand
+                     ;; the extra options we pass.
+                     (setenv "CONFIG_SHELL" (which "bash"))
+                     (zero?
+                      (system* "./configure"
+                               (string-append "--prefix=" out)
+                               (string-append "--mandir=" out
+                                              "/share/man")))))
+                 %standard-phases)
+       #:tests? #f))
+    (home-page "http://kernel.org")               ; really, no home page
+    (synopsis "Send a wake-on-LAN packet")
+    (description
+     "WakeLan broadcasts a properly formatted UDP packet across the local area
+network, which causes enabled computers to power on.")
+    (license gpl2+)))
@@ -0,0 +1,69 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 John Darringon <jmd@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 aidc)
+  #:use-module (gnu packages)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages image)
+  #:use-module (guix build-system gnu))
+
+
+(define-public barcode
+  (package
+    (name "barcode")
+    (version "0.99")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/barcode/barcode-"
+                          version ".tar.xz"))
+              (sha256 (base32
+                       "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8"))))
+    (build-system gnu-build-system)
+    (synopsis "Convert text strings to printed bars in various standards")
+    (description "GNU Barcode is a flexible tool to produce printed barcodes
+from text strings.  It supports a variety of encoding standards and sizing
+measurements.  Barcodes can be output in PostScript or Encapsulated PostScript
+formats.")
+    (license license:gpl3+)
+    (home-page "http://www.gnu.org/software/barcode/")))
+
+(define-public qrencode
+  (package
+    (name "qrencode")
+    (version "3.4.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://fukuchi.org/works/qrencode/qrencode-" version
+                    ".tar.bz2")) 
+              (sha256 (base32
+                       "163sb580p570p27imc6jhkfdw15kzp8vy1jq92nip1rwa63i9myz"))))
+    (build-system gnu-build-system)
+    (inputs `(("libpng" ,libpng)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (synopsis "Encode data into a QR Code symbol")
+    (description "Libqrencode is a C library for encoding data in a QR Code
+symbol, a kind of 2D symbology that can be scanned by handy terminals such as
+a mobile phone with CCD. The capacity of QR Code is up to 7000 digits or 4000
+characters, and is highly robust.")
+    (license license:lgpl2.1+)
+    (home-page "http://fukuchi.org/works/qrencode")))
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2012, 2013, 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,13 +21,15 @@
 (define-module (gnu packages algebra)
  #:use-module (gnu packages)
  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages mpi)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages readline)
  #:use-module (gnu packages flex)
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (guix utils))


 (define-public mpfrcx
@@ -81,14 +84,14 @@ solve the shortest vector problem.")
 (define-public pari-gp
  (package
   (name "pari-gp")
-   (version "2.5.5")
+   (version "2.7.1")
   (source (origin
            (method url-fetch)
            (uri (string-append
                  "http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-"
                  version ".tar.gz"))
            (sha256 (base32
-                     "058nw1fhggy7idii4f124ami521lv3izvngs9idfz964aks8cvvn"))))
+                     "1gj1rddi22hinzwy7r6hljgbi252wwwyd6gapg4hvcn0ycc7jqyc"))))
   (build-system gnu-build-system)
   (inputs `(("gmp" ,gmp)
             ("perl" ,perl)
@@ -101,17 +104,10 @@ solve the shortest vector problem.")
      #:phases
      (alist-replace
       'configure
-       (lambda* (#:key inputs outputs #:allow-other-keys)
-         (let ((out (assoc-ref outputs "out"))
-               (readline (assoc-ref inputs "readline"))
-               (gmp (assoc-ref inputs "gmp")))
+       (lambda* (#:key outputs #:allow-other-keys)
+         (let ((out (assoc-ref outputs "out")))
           (zero?
-            (system* "./Configure"
-                     (string-append "--prefix=" out)
-                     (string-append "--with-readline=" readline)
-                     (string-append "--with-gmp=" gmp)))))
-       ;; FIXME: readline and gmp will be detected automatically in the next
-       ;; stable release
+            (system* "./Configure" (string-append "--prefix=" out)))))
       %standard-phases)))
   (synopsis "PARI/GP, a computer algebra system for number theory")
   (description
@@ -128,15 +124,16 @@ PARI is also available as a C library to allow for faster computations.")
 (define-public gp2c
  (package
   (name "gp2c")
-   (version "0.0.8")
+   (version "0.0.9pl1")
   (source (origin
            (method url-fetch)
            (uri (string-append
                  "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/gp2c-"
                  version ".tar.gz"))
            (sha256 (base32
-                     "03fgiwy2si264g3zfgw2yi6i2l8szl5m106zgwk77sddshk20b34"))))
+                     "1p36060vwhn38j77r4c3jqyaslvhvgm6fdw2486k7krxk5ai7ph5"))))
   (build-system gnu-build-system)
+   (native-inputs `(("perl" ,perl)))
   (inputs `(("pari-gp" ,pari-gp)))
   (arguments
    '(#:configure-flags
@@ -168,8 +165,8 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
              (base32
               "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf"))))
    (build-system gnu-build-system)
-    (inputs `(("readline" ,readline)
-              ("flex" ,flex)))
+    (inputs `(("readline" ,readline)))
+    (native-inputs `(("flex" ,flex)))
    (arguments
     '(#:phases
       (alist-replace 'configure
@@ -179,8 +176,14 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
                        (let ((out (assoc-ref outputs "out")))
                          (setenv "CONFIG_SHELL" (which "bash"))
                          (zero?
-                           (system* "./configure"
-                                    (string-append "--prefix=" out)))))
+                           (system*
+                            "./configure"
+                            (string-append "--prefix=" out)
+                            ;; By default, man and info pages are put in
+                            ;; PREFIX/{man,info}, but we want them in
+                            ;; PREFIX/share/{man,info}.
+                            (string-append "--mandir=" out "/share/man")
+                            (string-append "--infodir=" out "/share/info")))))
                      %standard-phases)))
    (home-page "http://www.gnu.org/software/bc/")
    (synopsis "Arbitrary precision numeric processing language")
@@ -194,14 +197,14 @@ syntax is similar to that of C, so basic usage is familiar.  It also includes
 (define-public fftw
  (package
    (name "fftw")
-    (version "3.3.3")
+    (version "3.3.4")
    (source (origin
             (method url-fetch)
             (uri (string-append "ftp://ftp.fftw.org/pub/fftw/fftw-"
                                 version".tar.gz"))
             (sha256
              (base32
-               "1wwp9b2va7vkq3ay7a9jk22nr4x5q6m37rzqy2j8y3d11c5grkc5"))))
+               "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags '("--enable-shared" "--enable-openmp")
@@ -224,3 +227,28 @@ transform (DFT) in one or more dimensions, of arbitrary input size, and of
 both real and complex data (as well as of even/odd data---i.e. the discrete
 cosine/ sine transforms or DCT/DST).")
    (license gpl2+)))
+
+(define-public fftwf
+  (package (inherit fftw)
+    (name "fftwf")
+    (arguments
+     (substitute-keyword-arguments (package-arguments fftw)
+       ((#:configure-flags cf)
+        `(cons "--enable-float" ,cf))))
+    (description
+     (string-append (package-description fftw)
+                    "  Single-precision version."))))
+
+(define-public fftw-openmpi
+  (package (inherit fftw)
+    (name "fftw-openmpi")
+    (inputs
+     `(("openmpi" ,openmpi)
+       ,@(package-inputs fftw)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments fftw)
+       ((#:configure-flags cf)
+        `(cons "--enable-mpi" ,cf))))
+    (description
+     (string-append (package-description fftw)
+                    "  With OpenMPI parallelism support."))))
@@ -28,14 +28,14 @@
 (define-public apl
  (package
    (name "apl")
-    (version "1.1")
+    (version "1.3")
    (source
     (origin
      (method url-fetch)
      (uri (string-append "mirror://gnu/apl/apl-" version ".tar.gz"))
      (sha256
       (base32
-        "1myinxa0m3y4fanpxflfakfk3m1s8641wdlbwbs0vg5yp10xm0m3"))))
+        "1pkwlm0nf5vb8sp9hf9wjmsrsyr4vdpd4kv5y3hzmsgf3wcf8y3i"))))
    (build-system gnu-build-system)
    (home-page "http://www.gnu.org/software/apl/")
    (inputs
@@ -40,6 +40,11 @@
              (list (search-patch "apr-skip-getservbyname-test.patch")))
             (patch-flags '("-p0"))))
    (build-system gnu-build-system)
+    (arguments
+     ;; Sometimes we end up with two processes concurrently trying to make
+     ;; 'libmod_test.la': <http://hydra.gnu.org/build/60266/nixlog/2/raw>.
+     ;; Thus, build sequentially.
+     '(#:parallel-build? #f))
    (inputs `(("perl" ,perl)
              ("libtool" ,libtool)))
    (home-page "http://apr.apache.org/")
@@ -80,7 +85,13 @@ around or take advantage of platform-specific deficiencies or features.")
             (system* "./configure"
                      (string-append "--prefix=" out)
                      (string-append "--with-apr=" apr)))))
-        %standard-phases)))
+        %standard-phases)
+
+       ;; There are race conditions during 'make check'.  Typically, the
+       ;; 'testall' executable is not built yet by the time 'make check' tries
+       ;; to run it.  See
+       ;; <http://lists.gnu.org/archive/html/guix-devel/2014-03/msg00261.html>.
+       #:parallel-tests? #f))
    (home-page "http://apr.apache.org/")
    (synopsis "One of the Apache Portable Runtime Library companions")
    (description
@@ -0,0 +1,52 @@
+;;; 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+)))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,7 +21,8 @@
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
  #:use-module (guix licenses)
-  #:use-module (gnu packages perl))
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages which))

 (define-public aspell
  (package
@@ -45,3 +46,71 @@ a standalone program.  Notable features of Aspell include its full support of
 documents written in the UTF-8 encoding and its ability to use multiple
 dictionaries, including personal ones.")
    (license lgpl2.1+)))
+
+
+;;;
+;;; Dictionaries.
+;;;
+;;; Use 'export ASPELL_CONF="dict-dir $HOME/.guix-profile/lib/aspell"' to use them.
+;;;
+
+(define* (aspell-dictionary dict-name full-name
+                            #:key version sha256 (prefix "aspell6-"))
+  (package
+    (name (string-append "aspell-dict-" dict-name))
+    (version version)
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/aspell/dict/" dict-name
+                                  "/" prefix dict-name "-"
+                                  version ".tar.bz2"))
+              (sha256 sha256)))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (alist-replace
+                 'configure
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let ((out (assoc-ref outputs "out")))
+                     (zero? (system* "./configure"))))
+                 %standard-phases)
+                #:make-flags (let ((out (assoc-ref %outputs "out")))
+                               (list (string-append "dictdir=" out "/lib/aspell")
+                                     (string-append "datadir=" out "/lib/aspell")))
+                #:tests? #f))
+    (native-inputs `(("aspell" ,aspell)
+                     ("which" ,which)))
+    (synopsis (string-append full-name " dictionary for GNU Aspell")) ; XXX: i18n
+    (description
+     "This package provides a dictionary for the GNU Aspell spell checker.")
+    (license gpl2+)
+    (home-page "http://aspell.net/")))
+
+
+(define-public aspell-dict-en
+  (aspell-dictionary "en" "English"
+                     #:version "7.1-0"
+                     #:sha256
+                     (base32
+                      "02ldfiny4iakgfgy4sdrzjqdzi7l1rmb6y30lv31kfy5x31g77gz")))
+
+(define-public aspell-dict-eo
+  (aspell-dictionary "eo" "Esperanto"
+                     #:version "2.1.20000225a-2"
+                     #:sha256
+                     (base32
+                      "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1")))
+
+(define-public aspell-dict-es
+  (aspell-dictionary "es" "Spanish"
+                     #:version "1.11-2"
+                     #:sha256
+                     (base32
+                      "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd")))
+
+(define-public aspell-dict-fr
+  (aspell-dictionary "fr" "French"
+                     #:version "0.50-3"
+                     #:prefix "aspell-"
+                     #:sha256
+                     (base32
+                      "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr")))
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,7 +28,9 @@
  #:use-module (guix packages)
  #:use-module (guix 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 (autoconf-wrapper))

 (define-public autoconf
  (package
@@ -59,11 +62,37 @@ scripts are self-contained and portable, freeing the user from needing to
 know anything about Autoconf or M4.")
    (license gpl3+))) ; some files are under GPLv2+

-(define-public autoconf-wrapper
-  ;; An Autoconf wrapper that generates `configure' scripts that use our
-  ;; own Bash instead of /bin/sh in shebangs.  For that reason, it
-  ;; should only be used internally---users should not end up
-  ;; distributing `configure' files with a system-specific shebang.
+(define-public autoconf-2.68
+  (package (inherit autoconf)
+    (version "2.68")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/autoconf/autoconf-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "1fjm21k2na07f3vasf288a0zx66lbv0hd3l9bvv3q8p62s3pg569"))))))
+
+(define-public autoconf-2.64
+  ;; As of GDB 7.8, GDB is still developed using this version of Autoconf.
+  (package (inherit autoconf)
+    (version "2.64")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/autoconf/autoconf-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "0j3jdjpf5ly39dlp0bg70h72nzqr059k0x8iqxvaxf106chpgn9j"))))))
+
+
+(define* (autoconf-wrapper #:optional (autoconf autoconf))
+  "Return an wrapper around AUTOCONF that generates `configure' scripts that
+use our own Bash instead of /bin/sh in shebangs.  For that reason, it should
+only be used internally---users should not end up distributing `configure'
+files with a system-specific shebang."
  (package (inherit autoconf)
    (location (source-properties->location (current-source-location)))
    (name (string-append (package-name autoconf) "-wrapper"))
@@ -132,19 +161,19 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
 (define-public automake
  (package
    (name "automake")
-    (version "1.14")
+    (version "1.14.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/automake/automake-"
                                 version ".tar.xz"))
             (sha256
              (base32
-               "0nc0zqq8j336kamizzd86wb19vhbwywv5avcjh3cyx230xfqy671"))
+               "0s86rzdayj1licgj35q0mnynv5xa8f4p32m36blc5jk9id5z1d59"))
             (patches
              (list (search-patch "automake-skip-amhello-tests.patch")))))
    (build-system gnu-build-system)
    (inputs
-     `(("autoconf" ,autoconf-wrapper)
+     `(("autoconf" ,(autoconf-wrapper))
       ("perl" ,perl)))
    (native-search-paths
     (list (search-path-specification
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -56,10 +56,12 @@
     `(("expat" ,expat)
       ("glib" ,glib)
       ("dbus" ,dbus)
-       ("libdaemon" ,libdaemon)
-       ("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)
-       ("gdbm" ,gdbm)))
+       ("gdbm" ,gdbm)
+       ("libdaemon" ,libdaemon)))
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("glib" ,glib "bin")
+       ("pkg-config" ,pkg-config)))
    (synopsis "Avahi, an mDNS/DNS-SD implementation")
    (description
     "Avahi is a system which facilitates service discovery on a local
@@ -0,0 +1,303 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.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 backup)
+  #:use-module (guix packages)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module (guix download)
+  #:use-module (guix build utils)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages dejagnu)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages mcrypt)
+  #:use-module (gnu packages nettle)
+  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages rsync)
+  #:use-module (gnu packages ssh)
+  #:use-module (gnu packages xml)
+  #:use-module (srfi srfi-1))
+
+(define-public duplicity
+  (package
+    (name "duplicity")
+    (version "0.6.24")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "https://code.launchpad.net/duplicity/"
+                          (string-join (take (string-split version #\.) 2) ".")
+                          "-series/" version "/+download/duplicity-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "0l14nrhbgkyjgvh339bbhnm6hrdwrjadphq1jmpi0mcgcdbdfh8x"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))
+    (inputs
+     `(("python" ,python-2)
+       ("librsync" ,librsync)
+       ("mock" ,python2-mock)           ;for testing
+       ("lockfile" ,python2-lockfile)
+       ("gnupg" ,gnupg-1)))             ;gpg executable needed
+    (arguments
+     `(#:python ,python-2               ;setup assumes Python 2
+       #:test-target "test"
+       #:phases (alist-cons-before
+                 'check 'patch-tests
+                 (lambda _
+                   (substitute* "testing/functional/__init__.py"
+                     (("/bin/sh") (which "sh"))))
+                 %standard-phases)))
+    (home-page "http://duplicity.nongnu.org/index.html")
+    (synopsis "Encrypted backup using rsync algorithm")
+    (description
+     "Duplicity backs up directories by producing encrypted tar-format volumes
+and uploading them to a remote or local file server.  Because duplicity uses
+librsync, the incremental archives are space efficient and only record the
+parts of files that have changed since the last backup.  Because duplicity
+uses GnuPG to encrypt and/or sign these archives, they will be safe from
+spying and/or modification by the server.")
+    (license license:gpl2+)))
+
+(define-public hdup
+  (package
+    (name "hdup")
+    (version "2.0.14")
+    (source
+     (origin
+      (method url-fetch)
+      ;; Source tarballs are not versioned
+      (uri "http://archive.miek.nl/projects/hdup2/hdup.tar.bz2")
+      (sha256
+       (base32
+        "02bnczg01cyhajmm4rhbnc0ja0dd9ikv9fwv28asxh1rlx9yr0b7"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("glib" ,glib)
+       ("tar" ,tar)
+       ("lzop" ,lzop)
+       ("mcrypt" ,mcrypt)
+       ("openssh" ,openssh)
+       ("gnupg" ,gnupg-1)))
+    (arguments
+     `(#:configure-flags
+       `(,(string-append "--sbindir=" (assoc-ref %outputs "out") "/bin"))
+       #:tests? #f))
+    (home-page "http://archive.miek.nl/projects/hdup/index.html")
+    (synopsis "Simple incremental backup tool")
+    (description
+     "Hdup2 is a backup utilty, its aim is to make backup really simple.  The
+backup scheduling is done by means of a cron job.  It supports an
+include/exclude mechanism, remote backups, encrypted backups and split
+backups (called chunks) to allow easy burning to CD/DVD.")
+    (license license:gpl2)))
+
+(define-public libarchive
+  (package
+    (name "libarchive")
+    (version "3.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://libarchive.org/downloads/libarchive-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("zlib" ,zlib)
+       ("nettle" ,nettle)
+       ("lzo" ,lzo)
+       ("bzip2" ,bzip2)
+       ("libxml2" ,libxml2)
+       ("xz" ,xz)))
+    (arguments
+     `(#:phases
+       (alist-cons-before
+        'build 'patch-pwd
+        (lambda _
+          (substitute* "Makefile"
+            (("/bin/pwd") (which "pwd"))))
+        (alist-replace
+         'check
+         (lambda _
+           ;; XXX: The test_owner_parse, test_read_disk, and
+           ;; test_write_disk_lookup tests expect user 'root' to exist, but
+           ;; the chroot's /etc/passwd doesn't have it.  Turn off those tests.
+           ;;
+           ;; The tests allow one to disable tests matching a globbing pattern.
+           (and (zero? (system* "make"
+                                "libarchive_test" "bsdcpio_test" "bsdtar_test"))
+                ;; XXX: This glob disables too much.
+                (zero? (system* "./libarchive_test" "^test_*_disk*"))
+                (zero? (system* "./bsdcpio_test" "^test_owner_parse"))
+                (zero? (system* "./bsdtar_test"))))
+         %standard-phases))))
+    (home-page "http://libarchive.org/")
+    (synopsis "Multi-format archive and compression library")
+    (description
+     "Libarchive provides a flexible interface for reading and writing
+archives in various formats such as tar and cpio.  Libarchive also supports
+reading and writing archives compressed using various compression filters such
+as gzip and bzip2.  The library is inherently stream-oriented; readers
+serially iterate through the archive, writers serially add things to the
+archive. In particular, note that there is currently no built-in support for
+random access nor for in-place modification.")
+    (license license:bsd-2)))
+
+(define-public rdup
+  (package
+    (name "rdup")
+    (version "1.1.14")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://archive.miek.nl/projects/rdup/rdup-"
+                           version ".tar.bz2"))
+       (sha256
+        (base32
+         "0aklwd9v7ix0m4ayl762sil685f42cwljzx3jz5skrnjaq32npmj"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; Some test scripts are missing shebangs, which cause "could not
+        ;; execute" errors.  Add shebangs.
+        '(for-each
+          (lambda (testscript)
+            (with-atomic-file-replacement
+                (string-append "testsuite/rdup/" testscript)
+              (lambda (in out)
+                (begin
+                  (format out "#!/bin/sh\n" )
+                  (dump-port in out)))))
+          '("rdup.hardlink.helper"
+            "rdup.hardlink-strip.helper"
+            "rdup.hardlink-strip2.helper"
+            "rdup.pipeline.helper")))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("dejagnu" ,dejagnu)))
+    (inputs
+     `(("glib" ,glib)
+       ("pcre" ,pcre)
+       ("libarchive" ,libarchive)
+       ("nettle" ,nettle)))
+    (arguments
+     `(#:parallel-build? #f             ;race conditions
+       #:phases (alist-cons-before
+                 'build 'remove-Werror
+                 ;; rdup uses a deprecated function from libarchive
+                 (lambda _
+                   (substitute* "GNUmakefile"
+                     (("^(CFLAGS=.*)-Werror" _ front) front)))
+                 (alist-cons-before
+                  'check 'pre-check
+                  (lambda _
+                    (setenv "HOME" (getcwd))
+                    (substitute* "testsuite/rdup/rdup.rdup-up-t-with-file.exp"
+                      (("/bin/cat") (which "cat"))))
+                  
+                  %standard-phases))))
+    (home-page "http://archive.miek.nl/projects/rdup/index.html")
+    (synopsis "Provide a list of files to backup")
+    (description
+     "Rdup is a utility inspired by rsync and the plan9 way of doing backups.
+Rdup itself does not backup anything, it only print a list of absolute
+filenames to standard output.  Auxiliary scripts are needed that act on this
+list and implement the backup strategy.")
+    (license license:gpl3+)))
+
+(define-public btar
+  (package
+    (name "btar")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://vicerveza.homeunix.net/~viric/soft/btar/"
+                           "btar-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("librsync" ,librsync)))
+    (arguments
+     `(#:make-flags `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
+                      "CC=gcc")
+       #:tests? #f                      ;test input not distributed
+       #:phases
+       (alist-delete
+        'configure                      ;no configure phase
+        %standard-phases)))
+    (home-page "http://viric.name/cgi-bin/btar/doc/trunk/doc/home.wiki")
+    (synopsis "Tar-compatible archiver")
+    (description
+     "Btar is a tar-compatible archiver which allows arbitrary compression and
+ciphering, redundancy, differential backup, indexed extraction, multicore
+compression, input and output serialisation, and tolerance to partial archive
+errors.")
+    (license license:gpl3+)))
+
+(define-public rdiff-backup
+  (package
+    (name "rdiff-backup")
+    (version "1.2.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://savannah/rdiff-backup/rdiff-backup-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))
+    (inputs
+     `(("python" ,python-2)
+       ("librsync" ,librsync)))
+    (arguments
+     `(#:python ,python-2
+       #:tests? #f))
+    (home-page "http://www.nongnu.org/rdiff-backup/")
+    (synopsis "Local/remote mirroring+incremental backup")
+    (description
+     "Rdiff-backup backs up one directory to another, possibly over a network.
+The target directory ends up a copy of the source directory, but extra reverse
+diffs are stored in a special subdirectory of that target directory, so you
+can still recover files lost some time ago.  The idea is to combine the best
+features of a mirror and an incremental backup.  Rdiff-backup also preserves
+subdirectories, hard links, dev files, permissions, uid/gid ownership,
+modification times, extended attributes, acls, and resource forks.  Also,
+rdiff-backup can operate in a bandwidth efficient manner over a pipe, like
+rsync.  Thus you can use rdiff-backup and ssh to securely back a hard drive up
+to a remote location, and only the differences will be transmitted.  Finally,
+rdiff-backup is easy to use and settings have sensical defaults.")
+    (license license:gpl2+)))
@@ -1,6 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,6 +33,8 @@
  #:use-module (gnu packages multiprecision)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages linux)
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages pkg-config)
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
@@ -38,6 +42,7 @@
  #:use-module (guix utils)
  #:use-module (srfi srfi-1)
  #:use-module (srfi srfi-26)
+  #:use-module (ice-9 vlist)
  #:use-module (ice-9 match))

 ;;; Commentary:
@@ -68,14 +73,14 @@ command-line arguments, multiple languages, and so on.")
 (define-public grep
  (package
   (name "grep")
-   (version "2.15")
+   (version "2.20")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/grep/grep-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "052kjsafg2x7n2zpy3iw4pzwf8fdfng5pcvi9v3chx3rb1786nmz"))))
+              "0rcs0spsxdmh6yz8y4frkqp6f5iw19mdbdl9s2v6956hq0mlbbzh"))))
   (build-system gnu-build-system)
   (synopsis "Print lines matching a pattern")
   (description
@@ -230,22 +235,28 @@ used to apply commands with arbitrarily long arguments.")
 (define-public coreutils
  (package
   (name "coreutils")
-   (version "8.21")
+   (version "8.22")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/coreutils/coreutils-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd"))))
+              "04hjzzv434fb8ak3hh3dyhdvg3hqjjwvjmjxqzk1gh2jh6cr8gjv"))
+            (patches (list (search-patch "coreutils-dummy-man.patch")
+                           ;; TODO: remove this patch for >= 8.23
+                           (search-patch "coreutils-skip-nohup.patch")))))
   (build-system gnu-build-system)
   (inputs `(("acl"  ,acl)                        ; TODO: add SELinux
-             ("gmp"  ,gmp)
-
-             ;; Perl is needed to run tests; remove it from cross builds.
-             ,@(if (%current-target-system)
-                   '()
-                   `(("perl" ,perl)))))
+             ("gmp"  ,gmp)))
+   (native-inputs
+    ;; Perl is needed to run tests in native builds, and to run the bundled
+    ;; copy of help2man.  However, don't pass it when cross-compiling since
+    ;; that would lead it to try to run programs to get their '--help' output
+    ;; for help2man.
+    (if (%current-target-system)
+        '()
+        `(("perl" ,perl))))
   (outputs '("out" "debug"))
   (arguments
    `(#:parallel-build? #f            ; help2man may be called too early
@@ -253,14 +264,16 @@ used to apply commands with arbitrarily long arguments.")
                'build 'patch-shell-references
                (lambda* (#:key inputs #:allow-other-keys)
                  (let ((bash (assoc-ref inputs "bash")))
-                    (substitute* (cons "src/split.c"
-                                       (find-files "gnulib-tests"
-                                                   "\\.c$"))
+                    ;; 'split' uses either $SHELL or /bin/sh.  Set $SHELL so
+                    ;; that tests pass, since /bin/sh isn't in the chroot.
+                    (setenv "SHELL" (which "sh"))
+
+                    (substitute* (find-files "gnulib-tests" "\\.c$")
                      (("/bin/sh")
                       (format #f "~a/bin/sh" bash)))
                    (substitute* (find-files "tests" "\\.sh$")
                      (("#!/bin/sh")
-                       (format #f "#!~a/bin/bash" bash)))))
+                       (format #f "#!~a/bin/sh" bash)))))
                %standard-phases)))
   (synopsis "Core GNU utilities (file, text, shell)")
   (description
@@ -284,6 +297,7 @@ functionality beyond that which is outlined in the POSIX standard.")
              "1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6"))
            (patches (list (search-patch "make-impure-dirs.patch")))))
   (build-system gnu-build-system)
+   (native-inputs `(("pkg-config", pkg-config)))  ; to detect Guile
   (inputs `(("guile" ,guile-2.0)))
   (outputs '("out" "debug"))
   (arguments
@@ -311,24 +325,18 @@ change.  GNU make offers many powerful extensions over the standard utility.")
 (define-public binutils
  (package
   (name "binutils")
-   (version "2.23.2")
+   (version "2.24")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/binutils/binutils-"
                                version ".tar.bz2"))
            (sha256
             (base32
-              "15qhbkz3r266xaa52slh857qn3abw7rb2x2jnhpfrafpzrb4x4gy"))
+              "0ds1y7qa0xqihw4ihnsgg6bxanmb228r228ddvwzgrv4jszcbs75"))
            (patches (list (search-patch "binutils-ld-new-dtags.patch")
-                           (search-patch "binutils-loongson-workaround.patch")
-                           (search-patch "binutils-loongson-madd-fix.patch")))))
+                           (search-patch "binutils-loongson-workaround.patch")))))
   (build-system gnu-build-system)

-   ;; Split Binutils in several outputs, mostly to avoid collisions in
-   ;; user profiles with GCC---e.g., libiberty.a.
-   (outputs '("out"                        ; ar, ld, binutils.info, etc.
-              "lib"))                      ; libbfd.a, bfd.h, etc.
-
   ;; TODO: Add dependency on zlib + those for Gold.
   (arguments
    `(#:configure-flags '(;; Add `-static-libgcc' to not retain a dependency
@@ -340,7 +348,15 @@ change.  GNU make offers many powerful extensions over the standard utility.")

                          ;; Glibc 2.17 has a "comparison of unsigned
                          ;; expression >= 0 is always true" in wchar.h.
-                          "--disable-werror")))
+                          "--disable-werror"
+
+                          ;; Install BFD.  It ends up in a hidden directory,
+                          ;; but it's here.
+                          "--enable-install-libbfd"
+
+                          ;; Make sure 'ar' and 'ranlib' produce archives in a
+                          ;; deterministic fashion.
+                          "--enable-deterministic-archives")))

   (synopsis "Binary utilities: bfd gas gprof ld")
   (description
@@ -355,14 +371,14 @@ library for working with executable and object formats is also included.")
 (define-public glibc
  (package
   (name "glibc")
-   (version "2.18")
+   (version "2.19")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/glibc/glibc-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "18spla703zav8dq9fw7rbzkyv9qfisxb26p7amg1x3wjh7iy3d1c"))
+              "18m2dssd6ja5arxmdxinc90xvpqcsnqjfwmjl2as07j0i3srff9d"))
            (snippet
             ;; Disable 'ldconfig' and /etc/ld.so.cache.  The latter is
             ;; required on LFS distros to avoid loading the distro's libc.so
@@ -371,10 +387,7 @@ library for working with executable and object formats is also included.")
                (("use_ldconfig=yes")
                 "use_ldconfig=no")))
            (modules '((guix build utils)))
-            (imported-modules modules)
-            (patches (map search-patch
-                          '("glibc-ldd-x86_64.patch"
-                            "glibc-make-4.0.patch")))))
+            (patches (list (search-patch "glibc-ldd-x86_64.patch")))))
   (build-system gnu-build-system)

   ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
@@ -465,7 +478,17 @@ library for working with executable and object formats is also included.")
                    ;; Same for `popen'.
                    (substitute* "libio/iopopen.c"
                      (("/bin/sh")
-                       (string-append out "/bin/bash")))))
+                       (string-append out "/bin/bash")))
+
+                    ;; Make sure we don't retain a reference to the
+                    ;; bootstrap Perl.
+                    (substitute* "malloc/mtrace.pl"
+                      (("^#!.*")
+                       ;; The shebang can be omitted, because there's the
+                       ;; "bilingual" eval/exec magic at the top of the file.
+                       "")
+                      (("exec @PERL@")
+                       "exec perl"))))
                (alist-cons-after
                 'install 'install-locales
                 (lambda _
@@ -473,6 +496,11 @@ library for working with executable and object formats is also included.")
                 %standard-phases))))

   (inputs `(("static-bash" ,(static-package bash-light))))
+
+   ;; To build the manual, we need Texinfo and Perl.
+   (native-inputs `(("texinfo" ,texinfo)
+                    ("perl" ,perl)))
+
   (synopsis "The GNU C Library")
   (description
    "Any Unix-like operating system needs a C library: the library which
@@ -487,7 +515,7 @@ with the Linux kernel.")
 (define-public tzdata
  (package
    (name "tzdata")
-    (version "2013d")
+    (version "2014a")
    (source (origin
             (method url-fetch)
             (uri (string-append
@@ -495,7 +523,7 @@ with the Linux kernel.")
                   version ".tar.gz"))
             (sha256
              (base32
-               "011v63ppr73vhjgxv00inkn5pc7z48i8lhbapkpdq3kfczq9c76d"))))
+               "1cg843ajz4g16axpz56zvalwsbp1s764na2bk4fb44ayx162bzvw"))))
    (build-system gnu-build-system)
    (arguments
     '(#:tests? #f
@@ -520,8 +548,8 @@ with the Linux kernel.")
       #:phases
       (alist-replace
        'unpack
-        (lambda* (#:key inputs #:allow-other-keys)
-          (and (zero? (system* "tar" "xvf" (assoc-ref inputs "source")))
+        (lambda* (#:key source inputs #:allow-other-keys)
+          (and (zero? (system* "tar" "xvf" source))
               (zero? (system* "tar" "xvf" (assoc-ref inputs "tzcode")))))
        (alist-cons-after
         'install 'post-install
@@ -542,7 +570,7 @@ with the Linux kernel.")
                                version ".tar.gz"))
                          (sha256
                           (base32
-                            "1dh7nzmfxs8fps4bzcd2lz5fz24zxy2123a99avxsk34jh6bk7id"))))))
+                            "1xfkqi1q8cnxqbv8azdj5pqlzhkjz6xag09f1z0s8rxi86jkpf85"))))))
    (home-page "http://www.iana.org/time-zones")
    (synopsis "Database of current and historical time zones")
    (description "The Time Zone Database (often called tz or zoneinfo)
@@ -583,6 +611,7 @@ and daylight-saving rules.")
                             (copy-file "make"
                                        (string-append bin "/make"))))
                ,phases))))))
+     (native-inputs '())                          ; no need for 'pkg-config'
     (inputs %bootstrap-inputs))))

 (define diffutils-boot0
@@ -703,15 +732,19 @@ identifier SYSTEM."
                                          source)))
                             (list gmp mpfr mpc))

-                   ;; Create symlinks like `gmp' -> `gmp-5.0.5'.
+                   ;; Create symlinks like `gmp' -> `gmp-x.y.z'.
                   ,@(map (lambda (lib)
-                            `(symlink ,(package-full-name lib)
+                            ;; Drop trailing letters, as gmp-6.0.0a unpacks
+                            ;; into gmp-6.0.0.
+                            `(symlink ,(string-trim-right
+                                        (package-full-name lib)
+                                        char-set:letter)
                                      ,(package-name lib)))
                          (list gmp mpfr mpc))))
               (alist-cons-after
                'install 'symlink-libgcc_eh
                (lambda* (#:key outputs #:allow-other-keys)
-                  (let ((out (assoc-ref outputs "out")))
+                  (let ((out (assoc-ref outputs "lib")))
                    ;; Glibc wants to link against libgcc_eh, so provide
                    ;; it.
                    (with-directory-excursion
@@ -735,6 +768,13 @@ identifier SYSTEM."
     (native-inputs (alist-delete "texinfo"
                                  (package-native-inputs gcc-4.8))))))

+(define perl-boot0
+  (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."
  ;; Note: this is wrapped in a thunk to nicely handle circular dependencies
@@ -745,12 +785,20 @@ identifier SYSTEM."
                  #:implicit-inputs? #f
                  ,@(package-arguments linux-libre-headers)))
     (native-inputs
-      (let ((perl (package-with-explicit-inputs perl
-                                                %boot0-inputs
-                                                (current-source-location)
-                                                #:guile %bootstrap-guile)))
-        `(("perl" ,perl)
-          ,@%boot0-inputs))))))
+      `(("perl" ,perl-boot0)
+        ,@%boot0-inputs)))))
+
+(define texinfo-boot0
+  ;; Texinfo used to build libc's manual.
+  ;; We build without ncurses because it fails to build at this stage, and
+  ;; because we don't need the stand-alone Info reader.
+  ;; Also, use %BOOT0-INPUTS to avoid building Perl once more.
+  (let ((texinfo (package (inherit texinfo)
+                   (inputs (alist-delete "ncurses" (package-inputs texinfo))))))
+    (package-with-bootstrap-guile
+     (package-with-explicit-inputs texinfo %boot0-inputs
+                                   (current-source-location)
+                                   #:guile %bootstrap-guile))))

 (define %boot1-inputs
  ;; 2nd stage inputs.
@@ -782,19 +830,37 @@ identifier SYSTEM."
                            ;; Build Sun/ONC RPC support.  In particular,
                            ;; install rpc/*.h.
                            "--enable-obsolete-rpc")
-                      ,flags)))))
+                      ,flags))
+            ((#:phases phases)
+             `(alist-cons-before
+               'configure 'pre-configure
+               (lambda* (#:key inputs #:allow-other-keys)
+                 ;; Don't clobber CPATH with the bootstrap libc.
+                 (setenv "NATIVE_CPATH" (getenv "CPATH"))
+                 (unsetenv "CPATH")
+
+                 ;; 'rpcgen' needs native libc headers to be built.
+                 (substitute* "sunrpc/Makefile"
+                   (("sunrpc-CPPFLAGS =.*" all)
+                    (string-append "CPATH = $(NATIVE_CPATH)\n"
+                                   "export CPATH\n"
+                                   all "\n"))))
+               ,phases)))))
     (propagated-inputs `(("linux-headers" ,(linux-libre-headers-boot0))))
+     (native-inputs
+      `(("texinfo" ,texinfo-boot0)
+        ("perl" ,perl-boot0)))
     (inputs
-      `( ;; A native GCC is needed to build `cross-rpcgen'.
+      `(;; The boot inputs.  That includes the bootstrap libc.  We don't want
+        ;; it in $CPATH, hence the 'pre-configure' phase above.
+        ,@%boot1-inputs
+
+        ;; A native GCC is needed to build `cross-rpcgen'.
        ("native-gcc" ,@(assoc-ref %boot0-inputs "gcc"))

        ;; Here, we use the bootstrap Bash, which is not satisfactory
        ;; because we don't want to depend on bootstrap tools.
-        ("static-bash" ,@(assoc-ref %boot0-inputs "bash"))
-
-        ,@%boot1-inputs
-        ,@(alist-delete "static-bash"
-                        (package-inputs glibc))))))) ; patches
+        ("static-bash" ,@(assoc-ref %boot0-inputs "bash")))))))

 (define (cross-gcc-wrapper gcc binutils glibc bash)
  "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC
@@ -803,6 +869,7 @@ that makes it available under the native tool names."
    (name (string-append (package-name gcc) "-wrapped"))
    (source #f)
    (build-system trivial-build-system)
+    (outputs '("out"))
    (arguments
     `(#:guile ,%bootstrap-guile
       #:modules ((guix build utils))
@@ -871,7 +938,17 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
    (inputs `(("static-bash" ,static-bash-for-glibc)
              ,@(alist-delete
                 "static-bash"
-                 (package-inputs glibc-final-with-bootstrap-bash))))))
+                 (package-inputs glibc-final-with-bootstrap-bash))))
+
+    ;; The final libc only refers to itself, but the 'debug' output contains
+    ;; references to GCC-BOOT0 and to the Linux headers.  XXX: Would be great
+    ;; if 'allowed-references' were per-output.
+    (arguments
+     `(#:allowed-references
+       ,(cons* `(,gcc-boot0 "lib") (linux-libre-headers-boot0)
+               (package-outputs glibc-final-with-bootstrap-bash))
+
+       ,@(package-arguments glibc-final-with-bootstrap-bash)))))

 (define gcc-boot0-wrapped
  ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the
@@ -891,6 +968,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
     (arguments
      `(#:guile ,%bootstrap-guile
        #:implicit-inputs? #f
+        #:allowed-references ("out" ,glibc-final)
        ,@(package-arguments binutils)))
     (inputs %boot2-inputs))))

@@ -919,6 +997,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                                            ;; "/include/c++/"
                                            ;; ,(package-version gcc-4.8)
                                            ))))
+     (outputs '("out"))
     (inputs %boot2-inputs)
     (native-inputs '())
     (propagated-inputs '())
@@ -928,10 +1007,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
  ;; The final GCC.
  (package (inherit gcc-boot0)
    (name "gcc")
+    (location (source-properties->location (current-source-location)))
    (arguments
     `(#:guile ,%bootstrap-guile
       #:implicit-inputs? #f

+       #:allowed-references ("out" "lib" ,glibc-final)
+
       ;; Build again GMP & co. within GCC's build process, because it's hard
       ;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus
       ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.)
@@ -959,6 +1041,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
           ((#:phases phases)
            `(alist-delete 'symlink-libgcc_eh ,phases)))))

+    ;; This time we want Texinfo, so we get the manual.
+    (native-inputs `(("texinfo" ,texinfo-boot0)
+                     ,@(package-native-inputs gcc-boot0)))
+
    (inputs `(("gmp-source" ,(package-source gmp))
              ("mpfr-source" ,(package-source mpfr))
              ("mpc-source" ,(package-source mpc))
@@ -1061,13 +1147,42 @@ store.")
              ,@(fold alist-delete (package-inputs ld-wrapper-boot3)
                      '("guile" "bash"))))))

+(define coreutils-final
+  ;; The final Coreutils.  Treat them specially because some packages, such as
+  ;; Findutils, keep a reference to the Coreutils they were built with.
+  (package-with-bootstrap-guile
+   (package-with-explicit-inputs coreutils
+                                 %boot4-inputs
+                                 (current-source-location)
+
+                                 ;; Use the final Guile, linked against the
+                                 ;; final libc with working iconv, so that
+                                 ;; 'substitute*' works well when touching
+                                 ;; test files in Gettext.
+                                 #:guile guile-final)))
+
+(define grep-final
+  ;; The final grep.  Gzip holds a reference to it (via zgrep), so it must be
+  ;; built before gzip.
+  (package-with-bootstrap-guile
+   (package-with-explicit-inputs grep
+                                 %boot4-inputs
+                                 (current-source-location)
+                                 #:guile guile-final)))
+
+(define %boot5-inputs
+  ;; Now use the final Coreutils.
+  `(("coreutils" ,coreutils-final)
+    ("grep" ,grep-final)
+    ,@%boot4-inputs))
+
 (define-public %final-inputs
  ;; Final derivations used as implicit inputs by 'gnu-build-system'.  We
  ;; still use 'package-with-bootstrap-guile' so that the bootstrap tools are
  ;; used for origins that have patches, thereby avoiding circular
  ;; dependencies.
  (let ((finalize (compose package-with-bootstrap-guile
-                           (cut package-with-explicit-inputs <> %boot4-inputs
+                           (cut package-with-explicit-inputs <> %boot5-inputs
                                (current-source-location)))))
    `(,@(map (match-lambda
              ((name package)
@@ -1078,11 +1193,11 @@ store.")
               ("xz" ,xz)
               ("diffutils" ,diffutils)
               ("patch" ,patch)
-               ("coreutils" ,coreutils)
               ("sed" ,sed)
-               ("grep" ,grep)
               ("findutils" ,findutils)
               ("gawk" ,gawk)))
+      ("grep" ,grep-final)
+      ("coreutils" ,coreutils-final)
      ("make" ,gnu-make-final)
      ("bash" ,bash-final)
      ("ld-wrapper" ,ld-wrapper)
@@ -1090,4 +1205,83 @@ store.")
      ("gcc" ,gcc-final)
      ("libc" ,glibc-final))))

+(define-public canonical-package
+  (let ((name->package (fold (lambda (input result)
+                               (match input
+                                 ((_ package)
+                                  (vhash-cons (package-full-name package)
+                                              package result))))
+                             vlist-null
+                             `(("guile" ,guile-final)
+                               ,@%final-inputs))))
+    (lambda (package)
+      "Return the 'canonical' variant of PACKAGE---i.e., if PACKAGE is one of
+the implicit inputs of 'gnu-build-system', return that one, otherwise return
+PACKAGE.
+
+The goal is to avoid duplication in cases like GUILE-FINAL vs. GUILE-2.0,
+COREUTILS-FINAL vs. COREUTILS, etc."
+      ;; XXX: This doesn't handle dependencies of the final inputs, such as
+      ;; libunistring, GMP, etc.
+      (match (vhash-assoc (package-full-name package) name->package)
+        ((_ . canon)
+         ;; In general we want CANON, except if we're cross-compiling: CANON
+         ;; uses explicit inputs, so it is "anchored" in the bootstrapped
+         ;; process, with dependencies on things that cannot be
+         ;; cross-compiled.
+         (if (%current-target-system)
+             package
+             canon))
+        (_ package)))))
+
+
+;;;
+;;; GCC toolchain.
+;;;
+
+(define (gcc-toolchain gcc)
+  "Return a complete toolchain for GCC."
+  (package
+    (name "gcc-toolchain")
+    (version (package-version gcc))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments
+     '(#:modules ((guix build union))
+       #:builder (begin
+                   (use-modules (ice-9 match)
+                                (guix build union))
+
+                   (match %build-inputs
+                     (((names . directories) ...)
+                      (union-build (assoc-ref %outputs "out")
+                                   directories)))
+
+                   (union-build (assoc-ref %outputs "debug")
+                                (list (assoc-ref %build-inputs
+                                                 "libc-debug"))))))
+    (license (package-license gcc))
+    (synopsis "Complete GCC tool chain for C/C++ development")
+    (description
+     "This package provides a complete GCC tool chain for C/C++ development to
+be installed in user profiles.  This includes GCC, as well as libc (headers
+and binaries, plus debugging symbols in the 'debug' output), and Binutils.")
+    (home-page "http://gcc.gnu.org/")
+    (outputs '("out" "debug"))
+
+    ;; The main raison d'être of this "meta-package" is (1) to conveniently
+    ;; install everything that we need, and (2) to make sure ld-wrapper comes
+    ;; before Binutils' ld in the user's profile.
+    (inputs `(("gcc" ,gcc)
+              ("ld-wrapper" ,(car (assoc-ref %final-inputs "ld-wrapper")))
+              ("binutils" ,binutils-final)
+              ("libc" ,glibc-final)
+              ("libc-debug" ,glibc-final "debug")))))
+
+(define-public gcc-toolchain-4.8
+  (gcc-toolchain gcc-final))
+
+(define-public gcc-toolchain-4.9
+  (gcc-toolchain gcc-4.9))
+
 ;;; base.scm ends here
@@ -51,14 +51,14 @@
                 (symlink "bash" "sh"))))))
    (package
     (name "bash")
-     (version "4.2")
+     (version "4.3")
     (source (origin
              (method url-fetch)
              (uri (string-append
                    "mirror://gnu/bash/bash-" version ".tar.gz"))
              (sha256
               (base32
-                "1n5kbblp5ykbz5q8aq88lsif2z0gnvddg9babk33024wxiwi2ym2"))))
+                "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"))))
     (build-system gnu-build-system)
     (inputs `(("readline" ,readline)
               ("ncurses" ,ncurses)))             ; TODO: add texinfo
@@ -34,13 +34,21 @@
            (sha256 (base32
                     "1f2g2612lf8djbwbwhxsvmffmf9d7693kh2l20195pqp0f9jmnfx"))))
   (build-system gnu-build-system)
+   (outputs '("out"                             ; programs, libraries, headers
+              "doc"))                           ; 94 MiB of HTML docs
   (arguments
    '(#:tests? #f                            ; no check target available
      #:phases
      (alist-replace
       'configure
       (lambda* (#:key outputs #:allow-other-keys)
-         (let ((out (assoc-ref outputs "out")))
+         (let ((out (assoc-ref outputs "out"))
+               (doc (assoc-ref outputs "doc")))
+           ;; '--docdir' is not honored, so we need to patch.
+           (substitute* "dist/Makefile.in"
+             (("docdir[[:blank:]]*=.*")
+              (string-append "docdir = " doc "/share/doc/bdb")))
+
           (zero?
            (system* "./dist/configure"
                     (string-append "--prefix=" out)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,20 +20,20 @@
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages pkg-config))

-(define-public libgc
+(define-public libgc-7.2
  (package
   (name "libgc")
-   (version "7.2d")
+   (version "7.2e")
   (source (origin
            (method url-fetch)
-            (uri (string-append
-                  "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-"
-                  version ".tar.gz"))
+            (uri (string-append "http://www.hboehm.info/gc/gc_source/gc-"
+                                version ".tar.gz"))
            (sha256
             (base32
-              "0phwa5driahnpn79zqff14w9yc8sn3599cxz91m78hqdcpl0mznr"))))
+              "0jxgr71rhk58dzc1ihqs51vldh2qs1m154bn41qh6q1dm145nc89"))))
   (build-system gnu-build-system)
   (arguments
    ;; Make it so that we don't rely on /proc.  This is especially useful in
@@ -57,8 +57,49 @@ simple collector interface.

 Alternatively, the garbage collector may be used as a leak detector for
 C or C++ programs, though that is not its primary goal.")
-   (home-page "http://www.hpl.hp.com/personal/Hans_Boehm/gc/")
+   (home-page "http://www.hboehm.info/gc/")

-   ;; permissive X11-style license:
-   ;; http://www.hpl.hp.com/personal/Hans_Boehm/gc/license.txt
-   (license x11)))
+   (license (x11-style (string-append home-page "license.txt")))))
+
+(define-public libatomic-ops
+  (package
+    (name "libatomic-ops")
+    (version "7.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://www.hboehm.info/gc/gc_source/libatomic_ops-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0njv3n63zw6v45k68z6dz14g2hpk5p230ncwmdfkglsljb1cqx98"))))
+    (build-system gnu-build-system)
+    (outputs '("out" "debug"))
+    (synopsis "Accessing hardware atomic memory update operations")
+    (description
+     "This C library provides semi-portable access to hardware-provided atomic
+memory update operations on a number architectures.  These might allow you to
+write code that does more interesting things in signal handlers, write
+lock-free code, experiment with thread programming paradigms, etc.")
+    (home-page "https://github.com/ivmai/libatomic_ops/")
+
+    ;; Some source files are X11-style, others are GPLv2+.
+    (license gpl2+)))
+
+(define-public libgc
+  (package (inherit libgc-7.2)
+    (version "7.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.hboehm.info/gc/gc_source/gc-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "10z2nph62ilab063wygg2lv0jxlsbcf2az9w1lx01jzqj5lzry31"))))
+
+    ;; New dependencies.
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("libatomic-ops" ,libatomic-ops)))
+
+    ;; 'USE_LIBC_PRIVATES' is now the default.
+    (arguments '())))
@@ -0,0 +1,91 @@
+;;; 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 bittorrent)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages libevent)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages file)
+  #:use-module (gnu packages linux)
+  #:use-module ((gnu packages compression)
+                #:select (zlib))
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gtk))
+
+(define-public transmission
+  (package
+    (name "transmission")
+    (version "2.83")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://transmission.cachefly.net/transmission-"
+                    version ".tar.xz"))
+              (sha256
+               (base32
+                "0cqlgl6jmjw1caybz6nzh3l8z0jak1dxba01isv72zvy2r8b1qdh"))))
+    (build-system gnu-build-system)
+    (outputs '("out"                      ; library and command-line interface
+               "gui"))                    ; graphical user interface
+    (arguments
+     '(#:phases (alist-cons-after
+                 'install 'move-gui
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   ;; Move the GUI to its own output, so that "out" doesn't
+                   ;; depend on GTK+.
+                   (let ((out (assoc-ref outputs "out"))
+                         (gui (assoc-ref outputs "gui")))
+                     (mkdir-p (string-append gui "/bin"))
+                     (rename-file (string-append out "/bin/transmission-gtk")
+                                  (string-append gui
+                                                 "/bin/transmission-gtk"))))
+                 %standard-phases)))
+    (inputs
+     `(("inotify-tools" ,inotify-tools)
+       ("libevent" ,libevent)
+       ("curl" ,curl)
+       ("openssl" ,openssl)
+       ("file" ,file)
+       ("zlib" ,zlib)
+       ("gtk+" ,gtk+)))
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://www.transmissionbt.com/")
+    (synopsis "Fast and easy BitTorrent client")
+    (description
+     "Transmission is a BitTorrent client that comes with graphical,
+textual, and Web user interfaces.  Transmission also has a daemon for
+unattended operationg.  It supports local peer discovery, full encryption,
+DHT, µTP, PEX and Magnet Links.")
+
+    ;; COPYING reads:
+    ;;
+    ;;     Transmission can be redistributed and/or modified under the terms of
+    ;; the GNU GPLv2 (http://www.gnu.org/licenses/license-list.html#GPLv2),
+    ;; the GNU GPLv3 (http://www.gnu.org/licenses/license-list.html#GNUGPLv3),
+    ;; or any future license endorsed by Mnemosyne LLC.
+    ;;
+    ;; A few files files carry an MIT/X11 license header.
+    (license l:gpl3+)))
@@ -0,0 +1,89 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 John Darrington <jmd@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 boost)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages tcsh)
+  #:use-module (gnu packages perl))
+
+(define-public boost
+  (package
+    (name "boost")
+    (version "1.55.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://sourceforge/boost/boost_"
+                    (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
+                    ".tar.bz2"))
+              (sha256
+               (base32
+                "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("perl" ,perl)
+       ("python" ,python-2)
+       ("tcsh" ,tcsh)))
+    (arguments
+     `(#:phases
+       (alist-replace
+        'configure
+        (lambda* (#:key outputs #:allow-other-keys)
+          (let ((out (assoc-ref outputs "out")))
+            (substitute* '("libs/config/configure"
+                           "libs/spirit/classic/phoenix/test/runtest.sh"
+                           "tools/build/v2/doc/bjam.qbk"
+                           "tools/build/v2/engine/execunix.c"
+                           "tools/build/v2/engine/Jambase"
+                           "tools/build/v2/engine/jambase.c")
+              (("/bin/sh") (which "sh")))
+
+            (setenv "SHELL" (which "sh"))
+            (setenv "CONFIG_SHELL" (which "sh"))
+
+            (zero? (system* "./bootstrap.sh"
+                            (string-append "--prefix=" out)
+                            "--with-toolset=gcc"))))
+        (alist-replace
+         'build
+         (lambda _
+           (zero? (system* "./b2" "threading=multi" "link=shared")))
+
+         (alist-replace
+          'check
+          (lambda _ #t)
+
+          (alist-replace
+           'install
+           (lambda _
+             (zero? (system* "./b2" "install" "threading=multi" "link=shared")))
+           %standard-phases))))))
+
+    (home-page "http://boost.org")
+    (synopsis "Peer-reviewed portable C++ source libraries")
+    (description
+     "A collection of libraries intended to be widely useful, and usable
+across a broad spectrum of applications.")
+    (license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt"
+                                "Some components have other similar licences."))))
@@ -0,0 +1,105 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 John Darrington  <jmd@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 busybox)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages zip))
+
+(define-public busybox
+  (package
+    (name "busybox")
+    (version "1.22.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://www.busybox.net/downloads/" name "-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases 
+       (alist-replace
+        'configure 
+        (lambda _ (zero? (system* "make" "defconfig")))
+        (alist-replace
+         'check 
+         (lambda _
+           (substitute* '("testsuite/du/du-s-works"
+                          "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") "/gnu/store")
+              (("usr") "gnu"))
+
+           (substitute* "testsuite/date/date-works-1"
+             (("/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)"))
+
+           (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\""))
+
+           ;; This test cannot possibly pass.
+           ;; It is trying to test that "which ls" returns "/bin/ls" when PATH is not set.
+           ;; However, this relies on /bin/ls existing.  Which it does not in guix.
+           (delete-file "testsuite/which/which-uses-default-path")
+           (rmdir "testsuite/which")
+
+           (zero? (system* "make" 
+                           ;; "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)))))
+    (native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man)
+                     ;; The following are needed by the tests.
+                     ("inetutils" ,inetutils)
+                     ("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")
+    ;; Some files are gplv2+
+    (license gpl2)))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16,38 +16,34 @@
 ;;; 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 help2man)
+(define-module (gnu packages calcurse)
+  #:use-module (guix packages)
  #:use-module (guix licenses)
  #:use-module (guix download)
-  #:use-module (guix packages)
  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages perl))
+  #:use-module (gnu packages)
+  #:use-module (gnu packages ncurses))

-(define-public help2man
+(define-public calcurse
  (package
-    (name "help2man")
-    (version "1.43.3")
+    (name "calcurse")
+    (version "3.1.4")
    (source
     (origin
      (method url-fetch)
-      (uri (string-append "mirror://gnu/help2man/help2man-"
+      (uri (string-append "http://calcurse.org/files/calcurse-"
                          version ".tar.gz"))
      (sha256
       (base32
-        "00yk86rvvaavg7y6i5bvk5xhm417jl9dpr8bqvqdksw0i48qv5v7"))))
+        "1qwhffwhfg7bjxrviwlcrhnfw0976d39da8kfspq6dgd9nqv68a1"))))
    (build-system gnu-build-system)
-    (arguments `(;; There's no `check' target.
-                 #:tests? #f))
-    (inputs
-     `(("perl" ,perl)
-       ;; TODO: Add these optional dependencies.
-       ;; ("perl-LocaleGettext" ,perl-LocaleGettext)
-       ;; ("gettext" ,gettext)
-       ))
-    (home-page "http://www.gnu.org/software/help2man/")
-    (synopsis "Automatically generate man pages from program --help")
+    (inputs `(("ncurses" ,ncurses)))
+    (home-page "http://www.calcurse.org")
+    (synopsis "Text-based calendar and scheduling")
    (description
-     "GNU help2man is a program that converts the output of standard
-\"--help\" and \"--version\" command-line arguments into a manual page
-automatically.")
-    (license gpl3+)))
+     "Calcurse is a text-based calendar and scheduling application. It helps
+keep track of events, appointments and everyday tasks. A configurable
+notification system reminds user of upcoming deadlines, and the curses based
+interface can be customized to suit user needs. All of the commands are
+documented within an online help system.")
+    (license bsd-2)))
@@ -0,0 +1,57 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.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 ccache)
+  #:use-module (guix packages)
+  #:use-module ((guix licenses) #:select (gpl3+))
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages compression))
+
+(define-public ccache
+  (package
+    (name "ccache")
+    (version "3.1.9")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "https://www.samba.org/ftp/ccache/ccache-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "1i06015jjc0n55xgvhv2h37fjp0i7z8a10s0v40f87c5mprzv0a9"))
+      (patches (list (search-patch "ccache-stdc-predef-test.patch")))))
+    (build-system gnu-build-system)
+    (native-inputs `(("perl" ,perl)))   ;for test.sh
+    (inputs `(("zlib" ,zlib)))
+    (arguments
+     '(#:phases (alist-cons-before
+                 'check 'patch-test-shebangs
+                 (lambda _
+                   (substitute* '("test/test_hashutil.c" "test.sh")
+                     (("#!/bin/sh") (string-append "#!" (which "sh")))))
+                 %standard-phases)))
+    (home-page "https://ccache.samba.org/")
+    (synopsis "Compiler cache")
+    (description
+     "Ccache is a compiler cache.  It speeds up recompilation by caching
+previous compilations and detecting when the same compilation is being done
+again.  Supported languages are C, C++, Objective-C and Objective-C++.")
+    (license gpl3+)))
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,9 +27,9 @@
  #:use-module (gnu packages compression)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages help2man)
+  #:use-module (gnu packages man)
  #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages patchelf)
+  #:use-module (gnu packages elf)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages readline)
  #:use-module (gnu packages which))
@@ -68,20 +68,21 @@ caching facility provided by the library.")
 (define-public libcdio
  (package
    (name "libcdio")
-    (version "0.90")
+    (version "0.92")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/libcdio/libcdio-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "0kpp6gr5sjr30pb9klncc37fhkw0wi6r41d2fmvmw17cbj176zmg"))))
+               "1b9zngn8nnxb1yyngi1kwi73nahp4lsx59j17q1bahzz58svydik"))))
    (build-system gnu-build-system)
    (inputs
+       `(("ncurses" ,ncurses)
+         ("libcddb" ,libcddb)))
+    (native-inputs
     `(("help2man" ,help2man)
-       ("ncurses" ,ncurses)
-       ("pkg-config" ,pkg-config)
-       ("libcddb" ,libcddb)))
+       ("pkg-config" ,pkg-config)))
    (home-page "http://www.gnu.org/software/libcdio/")
    (synopsis "CD Input and Control library")
    (description
@@ -97,14 +98,14 @@ extraction from CDs.")
 (define-public xorriso
  (package
    (name "xorriso")
-    (version "1.3.2")
+    (version "1.3.8")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/xorriso/xorriso-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "1z04580nkkziy2flbxjjx0q6vp9p7vcp7yp0agx2aqz3l1vjcwhf"))))
+               "0zhhj9lr9z7hnb2alac54mc28w1l0mbanphhpmy3ylsi8rih84lh"))))
    (build-system gnu-build-system)
    (inputs
     `(("acl" ,acl)
@@ -172,22 +173,33 @@ reconstruction capability.")
 (define-public dvdisaster
  (package
    (name "dvdisaster")
-    (version "0.72.4")
+    (version "0.72.6")
    (source (origin
             (method url-fetch)
             (uri (string-append "http://dvdisaster.net/downloads/dvdisaster-"
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "0pm039a78h7m9vvjmmjfkl05ii6qdmfhvbypxjbc7j5w82y66is4"))))
+               "0sqrprc5rh3shnfli25m2wy0i5f83db54iv04s5s7bxf77m7sy79"))))
    (build-system gnu-build-system)
    (inputs
+     `(("gtk+" ,gtk+-2)))
+    (native-inputs
     `(("gettext" ,gnu-gettext)
-       ("gtk+" ,gtk+-2)
       ("pkg-config" ,pkg-config)
       ("which" ,which)))
    (arguments
-     `(#:tests? #f)) ; no check target
+     `(;; Parallel builds appear to be unsafe, see
+       ;; <http://hydra.gnu.org/build/49331/nixlog/1/raw>.
+       #:parallel-build? #f
+       #:tests? #f ; no check target
+       #:phases
+         (alist-cons-before
+          'patch-source-shebangs 'sanitise
+          (lambda _
+            ;; delete dangling symlink
+            (delete-file ".#GNUmakefile"))
+          %standard-phases)))
    (home-page "http://dvdisaster.net/en/index.html")
    (synopsis "error correcting codes for optical media images")
    (description "Optical media (CD,DVD,BD) keep their data only for a
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,7 +23,8 @@
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages)
-  #:use-module (gnu packages file))
+  #:use-module (gnu packages file)
+  #:use-module (srfi srfi-1))

 (define-public cmake
  (package
@@ -32,15 +34,15 @@
             (method url-fetch)
             (uri (string-append
                   "http://www.cmake.org/files/v"
-                   (substring version 0
-                    (string-index version #\. (+ 1 (string-index version #\.))))
+                   (string-join (take (string-split version #\.) 2)
+                                ".")
                   "/cmake-" version ".tar.gz"))
             (sha256
              (base32 "11q21vyrr6c6smyjy81k2k07zmn96ggjia9im9cxwvj0n88bm1fq"))
             (patches (list (search-patch "cmake-fix-tests.patch")))))
    (build-system gnu-build-system)
    (arguments
-     '(#:test-target "test"
+     `(#:test-target "test"
       #:phases (alist-replace
                 'configure
                 (lambda* (#:key outputs #:allow-other-keys)
@@ -61,8 +63,20 @@
                         "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c"
                         "Tests/CMakeLists.txt")
                       (("/bin/sh") (which "sh")))
-                     (zero? (system* "./configure"
-                             (string-append "--prefix=" out)))))
+                     (zero? (system*
+                             "./configure"
+                             (string-append "--prefix=" out)
+                             ;; 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-"
+                               (string-join (take (string-split version #\.) 2)
+                                            "."))))))
                 %standard-phases)))
    (inputs
     `(("file" ,file)))
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -100,7 +101,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
         '(lambda* (#:key outputs #:allow-other-keys)
            (with-directory-excursion (assoc-ref outputs "out")
              (mkdir "share")
-              (rename-file "man" "share"))))
+              (rename-file "man" "share/man"))))
        (build-shared-lib
         ;; Build a shared library.
         '(lambda* (#:key inputs #:allow-other-keys)
@@ -237,6 +238,29 @@ LZO is written in ANSI C.  Both the source code and the compressed data
 format are designed to be portable across platforms.")
    (license license:gpl2+)))

+(define-public lzop
+  (package
+    (name "lzop")
+    (version "1.03")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.lzop.org/download/lzop-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1jdjvc4yjndf7ihmlcsyln2rbnbaxa86q4jskmkmm7ylfy65nhn1"))))
+    (build-system gnu-build-system)
+    (inputs `(("lzo" ,lzo)))
+    (home-page "http://www.lzop.org/")
+    (synopsis "Compress or expand files")
+    (description
+     "Lzop is a file compressor which is very similar to gzip.  Lzop uses the
+LZO data compression library for compression services, and its main advantages
+over gzip are much higher compression and decompression speed (at the cost of
+some compression ratio).")
+    (license license:gpl2+)))
+
 (define-public lzip
  (package
    (name "lzip")
@@ -279,7 +303,7 @@ archiving.  Lzip is a clean implementation of the LZMA algorithm.")
         'patch-source-shebangs 'unpatch-source-shebang
         ;; revert the patch-shebang phase on a script which is
         ;; in fact test data
-         (lambda* (#:key #:allow-other-keys)
+         (lambda _
           (substitute* "tests/shar-1.ok"
             (((which "sh")) "/bin/sh")))
         %standard-phases)))
@@ -291,3 +315,4 @@ archives that can be readily emailed.  A shell archive is a file that can be
 processed by a Bourne-type shell to unpack the original collection of files. 
 This package is mostly for compatibility and historical interest.")
    (license license:gpl3+)))
+
@@ -0,0 +1,95 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@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 conkeror)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system trivial)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages gnuzilla)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages compression)
+  #:use-module (ice-9 format))
+
+(define-public conkeror
+  (package
+    (name "conkeror")
+    (version "1.0pre1")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "http://repo.or.cz/w/conkeror.git/snapshot/"
+                              "8a26fff5896a3360549e2adfbf06b1d57e909266"
+                              ".tar.gz")) ; tag: debian-1.0--pre-1+git140616-1
+              (sha256
+               (base32
+                "1cgjzi7g3g22zcx6bpfnid4i12sb45w6icmxdzjn8d3c0m8qsyp1"))))
+    (build-system trivial-build-system)
+    (inputs `(("icecat" ,icecat)
+              ("bash" ,bash)))
+    (native-inputs `(("tar" ,tar)
+                     ("gzip" ,gzip)))
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (ice-9 ftw)
+                                (guix build utils))
+                   (let ((select? 
+                          (lambda (name)
+                           (not (equal? (car (string->list name)) #\.))))
+                         (datadir (string-append %output "/share/conkeror"))
+                         (launcher "bin/conkeror"))
+                     (setenv "PATH" (string-append
+                                     (assoc-ref %build-inputs "tar") "/bin:"
+                                     (assoc-ref %build-inputs "gzip") "/bin"))
+                     (system* "tar" "xvf" (assoc-ref %build-inputs "source"))
+                     (copy-recursively (string-append
+                                        (getcwd) "/"
+                                        (car (scandir (getcwd) select?)))
+                                       datadir)
+                     (chdir %output)
+                     (mkdir "bin")
+                     (call-with-output-file launcher
+                       (lambda (p)
+                         (format p "#!~a/bin/bash
+exec ~a/bin/icecat --app ~a \"$@\"~%"
+                                 (assoc-ref %build-inputs "bash")
+                                 (assoc-ref %build-inputs "icecat")
+                                 (string-append datadir
+                                                "/application.ini"))))
+                     (chmod launcher #o555)))))
+    (synopsis "Keyboard focused web browser with Emacs look and feel")
+    (description "Conkeror is a highly-programmable web browser based on
+Mozilla XULRunner which is the base of all Mozilla products including
+Firefox. Conkeror has a sophisticated keyboard system for running commands and
+interacting with web page content, modelled after Emacs and Lynx. It is
+self-documenting and extensible with JavaScript.
+
+It comes with builtin support for several Web 2.0 sites like several Google
+services (Search, Gmail, Maps, Reader, etc.), Del.icio.us, Reddit, Last.fm and
+YouTube. For easier editing of form fields, it can spawn external editors. For
+this feature the recommended conkeror-spawn-process-helper package needs to be
+installed.")
+    (home-page "http://conkeror.org")
+    ;; Conkeror is triple licensed.
+    (license (list license:gpl2
+                   license:lgpl2.1
+                   ;; MPL 1.1 -- this license is not GPL compatible
+                   ))))
@@ -0,0 +1,83 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 John Darrington <jmd@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 cook)
+  #:use-module (guix packages)
+  #:use-module (guix licenses)
+  #:use-module (guix download)
+  #:use-module (gnu packages ed)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages groff)
+  #:use-module (gnu packages compression)
+  #:use-module (guix build-system gnu))
+
+(define-public cook
+  (package
+    (name "cook")
+    (version "2.34")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://miller.emu.id.au/pmiller/software/cook/cook-" version
+             ".tar.gz")) 
+       (sha256
+        (base32
+         "104saqnqql1l7zr2pm3f718fdky3ds8j07c6xvwrs1rfkhrw58yw"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:parallel-build? #f ; There are some nasty racy rules in the Makefile.
+       #:phases 
+       (alist-cons-before
+        'configure 'pre-conf
+        (lambda _ 
+          (substitute* (append '("common/env.c")
+                               (find-files "test" "\\.sh"))
+            (("/bin/sh") (which "sh")))
+
+          ;; Guix's binutils (because it wants bit-reproducable builds) is
+          ;; is configured with the  --enable-deterministic-archives flag.
+          ;; This means the timestamp of files appended to an ar archive
+          ;; are automatically and silently mutated to 00:00 1 Jan 1970
+          ;; which plays havoc with this test, for which correct timestamps
+          ;; are very important. Adding the U flag undoes the effect of
+          ;; --enable-deterministic-archives and allows this test to work
+          ;; again.   
+          (substitute* "test/00/t0077a.sh"
+            (("ar qc") "ar qcU"))
+
+          (setenv "SH" (which "sh")))
+        %standard-phases)))
+    (native-inputs `(("bison" ,bison)
+                     ;; For building the documentation:
+                     ("groff" ,groff)
+                     ;; For the tests:
+                     ("sharutils" ,sharutils)
+                     ;; One test wants rsh.  However there is no rsh server
+                     ;; running in the build environment and so far as I'm
+                     ;; aware, it cannot be started without root.
+                     ;; This test is therefore just skipped.
+                     ;; ("inetutils" ,inetutils)
+                     ("ed" ,ed)))
+    (home-page "http://miller.emu.id.au/pmiller/software/cook")
+    (synopsis "A tool for constructing files")
+    (description "Cook is a tool for constructing files. It is given a set of
+files to create, and recipes of how to create them. In any non-trivial program
+there will be prerequisites to performing the actions necessary to creating
+any file, such as include files. Cook provides a mechanism to define these.")
+    (license gpl3+)))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -76,7 +76,13 @@ GCC that does not target a libc; otherwise, target that libc."
                         target))
    (source (origin (inherit (package-source gcc-4.8))
              (patches
-               (list (search-patch "gcc-cross-environment-variables.patch")))))
+               (list (search-patch
+                      "gcc-cross-environment-variables.patch")))))
+
+    ;; For simplicity, use a single output.  Otherwise libgcc_s & co. are not
+    ;; found by default, etc.
+    (outputs '("out"))
+
    (arguments
     `(#:implicit-inputs? #f
       #:modules ((guix build gnu-build-system)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 David Thompson <davet@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16,31 +16,29 @@
 ;;; 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 patchelf)
+(define-module (gnu packages crypto)
+  #:use-module (gnu packages)
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu))

-(define-public patchelf
+(define-public libsodium
  (package
-    (name "patchelf")
-    (version "0.6")
+    (name "libsodium")
+    (version "0.5.0")
    (source (origin
-             (method url-fetch)
-             (uri (string-append
-                   "http://nixos.org/releases/patchelf/patchelf-"
-                   version
-                   "/patchelf-"
-                   version
-                   ".tar.bz2"))
-             (sha256
-              (base32
-               "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw"))))
+            (method url-fetch)
+            (uri (string-append
+                  "http://download.libsodium.org/libsodium/releases/libsodium-"
+                  version ".tar.gz"))
+            (sha256
+             (base32
+              "1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w"))))
    (build-system gnu-build-system)
-    (home-page "http://nixos.org/patchelf.html")
-    (synopsis "Modify the dynamic linker and RPATH of ELF executables")
+    (synopsis "Portable NaCl-based crypto library")
    (description
-     "PatchELF allows the ELF \"interpreter\" and RPATH of an ELF binary to be
-changed.")
-    (license gpl3+)))
+     "libsodium is a new easy-to-use high-speed software library for network
+communication, encryption, decryption, signatures, etc.")
+    (license isc)
+    (home-page "https://github.com/jedisct1/libsodium"))) ; No real homepage
@@ -44,9 +44,10 @@
   (inputs
    `(("libgcrypt" ,libgcrypt)
      ("lvm2" ,lvm2)
-      ("popt" ,popt)
-      ("python" ,python-wrapper)
-      ("util-linux" ,util-linux)))
+      ("util-linux" ,util-linux)
+      ("popt" ,popt)))
+   (native-inputs
+      `(("python" ,python-wrapper)))
   (synopsis "hard disk encryption tool")
   (description
    "LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk
@@ -22,6 +22,7 @@
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages gnutls)
  #:use-module (gnu packages groff)
@@ -30,32 +31,47 @@
  #:use-module (gnu packages openldap)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
  #:use-module (gnu packages ssh))

 (define-public curl
  (package
   (name "curl")
-   (version "7.28.1")
+   (version "7.35.0")
   (source (origin
            (method url-fetch)
            (uri (string-append "http://curl.haxx.se/download/curl-"
                                version ".tar.lzma"))
            (sha256
             (base32
-              "13bhfs41yf60ys2hrikqxjwfzaj0gm91kqzsgc5fr4grzmpm38nx"))))
+              "14w5cwh6b1426lxkq6kp6h4vxryr4n7wfrrwhny1r4123q7n8ab9"))
+            (patches
+             ;; This patch fixes testcase 172 which uses a hardcoded cookie
+             ;; expiration value which is expired as of Feb 1, 2014.
+             (list (search-patch "curl-fix-test172.patch")))))
   (build-system gnu-build-system)
   (inputs `(("gnutls" ,gnutls)
-             ;; to enable the --manual option and make test 1026 pass
-             ("groff" ,groff)
             ("gss" ,gss)
             ("libidn" ,libidn)
             ("libssh2" ,libssh2)
             ("openldap" ,openldap)
-             ("perl" ,perl)
-             ("pkg-config" ,pkg-config)
             ("zlib" ,zlib)))
+   (native-inputs
+     `(("perl" ,perl)
+       ;; to enable the --manual option and make test 1026 pass
+       ("groff" ,groff)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-2)))
   (arguments
-    `(#:configure-flags '("--with-gnutls" "--with-gssapi")))
+    `(#:configure-flags '("--with-gnutls" "--with-gssapi")
+      ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl
+      #:phases
+      (alist-cons-before
+       'check 'patch-runtests
+       (lambda _
+           (substitute* "tests/runtests.pl"
+             (("/bin/sh") (which "sh"))))
+       %standard-phases)))
   (synopsis "curl, command line tool for transferring data with URL syntax")
   (description
    "curl is a command line tool for transferring data with URL syntax,
@@ -0,0 +1,53 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.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 cursynth)
+  #:use-module (guix packages)
+  #:use-module (guix licenses)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages linux))
+
+(define-public cursynth
+  (package
+    (name "cursynth")
+    (version "1.5")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/cursynth/cursynth-"
+                          version ".tar.gz"))
+      (sha256
+       (base32 "1dhphsya41rv8z6yqcv9l6fwbslsds4zh1y56zizi39nd996d40v"))
+      (patches (list (search-patch "cursynth-wave-rand.patch")))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    ;; TODO: See https://github.com/iyoko/cursynth/issues/4 which currently
+    ;; prevents us from using pulseaudio
+    (inputs `(("ncurses" ,ncurses)
+              ("alsa" ,alsa-lib)))
+    (home-page "http://www.gnu.org/software/cursynth")
+    (synopsis "Polyphonic and MIDI subtractive music synthesizer using curses")
+    (description "GNU cursynth is a polyphonic synthesizer that runs
+graphically in the terminal.  It is built on a full-featured subtractive
+synthesis engine.  Notes and parameter changes may be entered via MIDI or the
+computer's keyboard.")
+    (license gpl3+)))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -34,8 +34,12 @@
   (version "2.1.26")
   (source (origin
            (method url-fetch)
-            (uri (string-append "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-" version
-                                ".tar.gz"))
+            (uri (list (string-append
+                        "http://cyrusimap.org/releases/cyrus-sasl-"
+                        version ".tar.gz")
+                       (string-append
+                        "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-"
+                        version ".tar.gz")))
            (sha256 (base32
                     "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g"))))
   (build-system gnu-build-system)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16,32 +16,33 @@
 ;;; 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 ddrescue)
-  #:use-module (guix licenses)
+(define-module (gnu packages datamash)
  #:use-module (guix packages)
+  #:use-module (guix licenses)
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
-  #:use-module ((gnu packages compression) #:select (lzip)))
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages which))

-(define-public ddrescue
+(define-public datamash
  (package
-    (name "ddrescue")
-    (version "1.17")
+    (name "datamash")
+    (version "1.0.5")
    (source
     (origin
      (method url-fetch)
-      (uri (string-append "mirror://gnu/ddrescue/ddrescue-"
-                          version ".tar.lz"))
+      (uri (string-append "mirror://gnu/datamash/datamash-"
+                          version ".tar.gz"))
      (sha256
       (base32
-        "0bvmsbzli2j4czwkabzs978n1y6vx31axh02kpgcf7033cc6rydy"))))
+        "0f4rbbhl18fb851npza9cl8biynzr081f37ih2xsbvjlyrxhnz6b"))))
+    (native-inputs
+     `(("which" ,which)                 ;for tests
+       ("perl" ,perl)))                 ;for help2man
    (build-system gnu-build-system)
-    (home-page "http://www.gnu.org/software/ddrescue/ddrescue.html")
-    (synopsis "Data recovery utility")
-    (native-inputs `(("lzip" ,lzip)))
+    (home-page "https://www.gnu.org/software/datamash/")
+    (synopsis "Scriptable statistics and data calculation")
    (description
-     "GNU ddrescue is a fully automated data recovery tool.  It copies data
-from one file to another, working to rescue data in case of read errors.  The
-program also includes a tool for manipulating its log files, which are used
-to recover data more efficiently by only reading the necessary blocks.")
-    (license gpl3+)))
+     "Perform basic numeric, textual and statistical operations on plain text
+files.  Designed to work within standard pipelines without additional code.")
+    (license gpl3)))
@@ -0,0 +1,60 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
+;;;
+;;; 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 dc)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnutls)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages sqlite)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module ((guix licenses)
+  #:renamer (symbol-prefix-proc 'license:)))
+
+(define-public ncdc
+  (package
+    (name "ncdc")
+    (version "1.19")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://dev.yorhel.nl/download/ncdc-" version
+                           ".tar.gz"))
+       (sha256 (base32
+                "1wgvqwfxq9kc729h2r528n55821w87sfbm4h21mr6pvkpfw30hf2"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("bzip2" ,bzip2)
+       ("glib" ,glib)
+       ("gnutls" ,gnutls)
+       ("ncurses" ,ncurses)
+       ("sqlite" ,sqlite)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://dev.yorhel.nl/ncdc")
+    (synopsis
+     "Lightweight direct connect client with a friendly ncurses interface")
+    (description
+     "Ncdc is a client for the Direct Connect peer-to-peer protocol implemented
+using ncurses.  It is known for its smaller footprint and ease of use.")
+    (license license:x11)))
@@ -0,0 +1,78 @@
+;;; 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 dictionaries)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system trivial)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages texinfo)
+  #:use-module ((gnu packages compression)
+                #:select (gzip)))
+
+(define-public vera
+  (package
+    (name "vera")
+    (version "1.21a")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/vera/vera-" version
+                                  ".tar.gz"))
+              (sha256
+               (base32
+                "09qz1g8js8qw735wmd8kraqbk1d1997v3px2lcc58frf1r66bp8f"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:builder (begin
+                   (use-modules (guix build utils))
+
+                   (let* ((out    (assoc-ref %outputs "out"))
+                          (info   (string-append out "/share/info"))
+                          (html   (string-append out "/share/html"))
+                          (source (assoc-ref %build-inputs "source"))
+                          (tar    (assoc-ref %build-inputs "tar"))
+                          (gz     (assoc-ref %build-inputs "gzip"))
+                          (texi   (assoc-ref %build-inputs "texinfo")))
+                     (setenv "PATH" (string-append gz "/bin"))
+                     (system* (string-append tar "/bin/tar") "xvf" source)
+
+                     (chdir (string-append "vera-" ,version))
+                     (mkdir-p info)
+                     (mkdir-p html)
+
+                     ;; XXX: Use '--force' because the document is unhappy
+                     ;; with Texinfo 5 (yes, documents can be unhappy.)
+                     (and (zero?
+                           (system* (string-append texi "/bin/makeinfo")
+                                    "vera.texi" "--force" "-o"
+                                    (string-append info "/vera.info")))
+                          (zero?
+                           (system* (string-append texi "/bin/makeinfo")
+                                    "vera.texi" "--force" "--html" "-o"
+                                    (string-append html "/vera.html"))))))
+      #:modules ((guix build utils))))
+    (native-inputs `(("texinfo" ,texinfo)
+                     ("tar" ,tar)
+                     ("gzip" ,gzip)))
+    (home-page "http://savannah.gnu.org/projects/vera/")
+    (synopsis "List of acronyms")
+    (description
+     "V.E.R.A. (Virtual Entity of Relevant Acronyms) is a list of computing
+acronyms distributed as an info document.")
+    (license fdl1.3+)))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16,7 +16,7 @@
 ;;; 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 parted)
+(define-module (gnu packages disk)
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
@@ -24,7 +24,10 @@
  #:use-module (gnu packages check)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages linux)
-  #:use-module (gnu packages readline))
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages guile)
+  #:use-module ((gnu packages compression)
+                #:select (lzip)))

 (define-public parted
  (package
@@ -53,12 +56,66 @@
    (inputs
     ;; XXX: add 'lvm2'.
     `(("check" ,check)
-       ("gettext" ,gnu-gettext)
-       ("readline" ,readline)
+
+       ;; With Readline 6.3, parted/ui.c fails to build because it uses the
+       ;; now undefined 'CPPFunction' type.
+       ("readline" ,readline-6.2)
+
       ("util-linux" ,util-linux)))
+    (native-inputs
+     `(("gettext" ,gnu-gettext)))
    (home-page "http://www.gnu.org/software/parted/")
    (synopsis "Disk partition editor")
    (description
     "GNU Parted is a package for creating and manipulating disk partition
 tables.  It includes a library and command-line utility.")
    (license gpl3+)))
+
+(define-public fdisk
+  (package
+    (name "fdisk")
+    (version "2.0.0a")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/fdisk/gnufdisk-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gettext" ,gnu-gettext)
+       ("guile" ,guile-1.8)
+       ("util-linux" ,util-linux)
+       ("parted" ,parted)))
+    (home-page "https://www.gnu.org/software/fdisk/")
+    (synopsis "Low-level disk partitioning and formatting")
+    (description
+     "GNU fdisk provides a GNU version of the common disk partitioning tool
+fdisk.  fdisk is used for the creation and manipulation of disk partition
+tables, and it understands a variety of different formats.")
+    (license gpl3+)))
+
+(define-public ddrescue
+  (package
+    (name "ddrescue")
+    (version "1.18.1")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/ddrescue/ddrescue-"
+                          version ".tar.lz"))
+      (sha256
+       (base32
+        "1ad1ifby89wys8lxh4d24y5lih6hkz54jhv6sf6bs1i7sd7lnqaq"))))
+    (build-system gnu-build-system)
+    (home-page "http://www.gnu.org/software/ddrescue/ddrescue.html")
+    (synopsis "Data recovery utility")
+    (native-inputs `(("lzip" ,lzip)))
+    (description
+     "GNU ddrescue is a fully automated data recovery tool.  It copies data
+from one file to another, working to rescue data in case of read errors.  The
+program also includes a tool for manipulating its log files, which are used
+to recover data more efficiently by only reading the necessary blocks.")
+    (license gpl3+)))
@@ -0,0 +1,128 @@
+;;; 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 docbook)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages base)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system trivial)
+  #:autoload   (gnu packages zip) (unzip))
+
+(define-public docbook-xml
+  (package
+    (name "docbook-xml")
+    (version "4.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.docbook.org/xml/" version
+                                  "/docbook-xml-" version ".zip"))
+              (sha256
+               (base32
+                "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf"))))
+    (build-system trivial-build-system)
+    (arguments
+     '(#:builder (begin
+                   (use-modules (guix build utils))
+
+                   (let* ((unzip
+                           (string-append (assoc-ref %build-inputs "unzip")
+                                          "/bin/unzip"))
+                          (source (assoc-ref %build-inputs "source"))
+                          (out    (assoc-ref %outputs "out"))
+                          (dtd    (string-append out "/xml/dtd/docbook")))
+                     (mkdir-p dtd)
+                     (with-directory-excursion dtd
+                       (system* unzip source))
+                     (substitute* (string-append out "/xml/dtd/docbook/catalog.xml")
+                       (("uri=\"") 
+                        (string-append 
+                         "uri=\"file://" dtd "/")))))
+                 #:modules ((guix build utils))))
+    (native-inputs `(("unzip" ,unzip)))
+    (home-page "http://docbook.org")
+    (synopsis "DocBook XML DTDs for document authoring")
+    (description
+     "DocBook is general purpose XML and SGML document type particularly well
+suited to books and papers about computer hardware and software (though it is
+by no means limited to these applications.)  This package provides XML DTDs.")
+    (license (x11-style "" "See file headers."))))
+
+(define-public docbook-xml-4.4
+  (package (inherit docbook-xml)
+   (version "4.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.docbook.org/xml/" version
+                                  "/docbook-xml-" version ".zip"))
+              (sha256
+               (base32
+                "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82"))))))
+
+(define-public docbook-xml-4.3
+  (package (inherit docbook-xml)
+   (version "4.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.docbook.org/xml/" version
+                                  "/docbook-xml-" version ".zip"))
+              (sha256
+               (base32
+                "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3"))))))
+
+(define-public docbook-xsl
+  (package
+    (name "docbook-xsl")
+    (version "1.78.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/docbook/docbook-xsl-"
+                                  version ".tar.bz2"))
+              (sha256
+               (base32
+                "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:builder (let ((name-version (string-append ,name "-" ,version)))
+                   (use-modules (guix build utils))
+
+                   (let* ((bzip2  (assoc-ref %build-inputs "bzip2"))
+                          (tar    (assoc-ref %build-inputs "tar"))
+                          (source (assoc-ref %build-inputs "source"))
+                          (out    (assoc-ref %outputs "out"))
+                          (xsl    (string-append out "/xml/xsl")))
+                     (setenv "PATH" (string-append bzip2 "/bin"))
+                     (system* (string-append tar "/bin/tar") "xvf" source)
+
+                     (mkdir-p xsl)
+                     (copy-recursively name-version
+                                       (string-append xsl "/" name-version))
+
+                     (substitute* (string-append xsl "/" name-version "/catalog.xml")
+                       (("rewritePrefix=\"./") 
+                        (string-append "rewritePrefix=\"file://" xsl "/" name-version "/")))))
+                 #:modules ((guix build utils))))
+    (native-inputs `(("bzip2" ,bzip2)
+                     ("tar" ,tar)))
+    (home-page "http://docbook.org")
+    (synopsis "DocBook XSL style sheets for document authoring")
+    (description
+     "This package provides XSL style sheets for DocBook.")
+    (license (x11-style "" "See 'COPYING' file."))))
@@ -0,0 +1,74 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages doxygen)
+  #:use-module ((guix licenses) #:select (gpl3+))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages python))
+
+(define-public doxygen
+  (package
+    (name "doxygen")
+    (version "1.8.7")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://ftp.stack.nl/pub/users/dimitri/"
+                                 name "-" version ".src.tar.gz"))
+             (sha256
+              (base32
+               "1ng3dv5fninhfi2fj75ghkr5jwsl653fxv2sxhaswj11x2vcdsn6"))
+             (patches (list (search-patch "doxygen-tmake.patch")
+                            (search-patch "doxygen-test.patch")))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("bison" ,bison)
+       ("flex" ,flex)
+       ("libxml2" ,libxml2) ; provides xmllint for the tests
+       ("perl" ,perl) ; for the tests
+       ("python" ,python-2))) ; for creating the documentation
+    (propagated-inputs
+     `(("graphviz" ,graphviz)))
+    (arguments
+     `(#:test-target "test"
+       #:phases
+         (alist-replace
+          'configure
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let ((out (assoc-ref outputs "out")))
+              ;; do not pass "--enable-fast-install", which makes the
+              ;; configure process fail
+              (zero? (system*
+                      "./configure"
+                      "--prefix" out))))
+          %standard-phases)))
+    (home-page "http://www.stack.nl/~dimitri/doxygen/")
+    (synopsis "tool for generating documentation from annotated sources")
+    (description "Doxygen is the de facto standard tool for generating
+documentation from annotated C++ sources, but it also supports other popular
+programming languages such as C, Objective-C, C#, PHP, Java, Python,
+IDL (Corba, Microsoft, and UNO/OpenOffice flavors), Fortran, VHDL, Tcl,
+and to some extent D.")
+    (license gpl3+)))
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,20 +21,22 @@
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages compression))

 (define-public ed
  (package
    (name "ed")
-    (version "1.9")
+    (version "1.10")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/ed/ed-"
-                                 version ".tar.gz"))
+                                 version ".tar.lz"))
             (sha256
              (base32
-               "122syihsx2hwzj75mkf5a9ssiky2xby748kp4cc00wzhmp7p5cym"))))
+               "16kycdm5fcvpdr41hxb2da8da6jzs9dqznsg5552z6rh28n0jh4m"))))
    (build-system gnu-build-system)
+    (native-inputs `(("lzip" ,lzip)))
    (arguments
     '(#:configure-flags '("CC=gcc")
       #:phases (alist-cons-before 'patch-source-shebangs 'patch-test-suite
@@ -0,0 +1,107 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013, 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 elf)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module ((guix licenses) #:select (gpl3+ lgpl3+ lgpl2.0+))
+  #:use-module (gnu packages)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages compression))
+
+(define-public elfutils
+  (package
+    (name "elfutils")
+    (version "0.157")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://fedorahosted.org/releases/e/l/elfutils/"
+                    version "/elfutils-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "11ffbihw9zs2dhmlww9zilwvmv6v1pr6bvnz5dnzn0lxq70ckbag"))))
+    (build-system gnu-build-system)
+
+    ;; Separate programs because that's usually not what elfutils users want,
+    ;; and because they duplicate what Binutils provides.
+    (outputs '("out"                           ; libelf.so, elfutils/*.h, etc.
+               "bin"))                         ; ld, nm, objdump, etc.
+
+    (native-inputs `(("m4" ,m4)))
+    (inputs `(("zlib" ,zlib)))
+    (home-page "https://fedorahosted.org/elfutils/")
+    (synopsis "Linker and ELF manipulation tools")
+    (description
+     "This package provides command-line tools to manipulate binaries in the
+Executable and Linkable Format (ELF).  This includes ld, ar, objdump,
+addr2line, and more.")
+
+    ;; Libraries are dual-licensed LGPLv3.0+ | GPLv2, and programs are GPLv3+.
+    (license lgpl3+)))
+
+(define-public libelf
+  (package
+    (name "libelf")
+    (version "0.8.13")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://www.mr511.de/software/libelf-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr"))))
+    (build-system gnu-build-system)
+    (arguments '(#:phases (alist-replace
+                           'configure
+                           (lambda* (#:key outputs #:allow-other-keys)
+                             ;; This old `configure' script doesn't support
+                             ;; variables passed as arguments.
+                             (let ((out (assoc-ref outputs "out")))
+                               (setenv "CONFIG_SHELL" (which "bash"))
+                               (zero?
+                                (system* "./configure"
+                                         (string-append "--prefix=" out)))))
+                           %standard-phases)))
+    (home-page "http://www.mr511.de/software/english.html")
+    (synopsis "An ELF object file access library")
+    (description "libelf is a C library to access ELF object files.")
+    (license lgpl2.0+)))
+
+(define-public patchelf
+  (package
+    (name "patchelf")
+    (version "0.6")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "http://nixos.org/releases/patchelf/patchelf-"
+                   version
+                   "/patchelf-" version ".tar.bz2"))
+             (sha256
+              (base32
+               "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw"))
+             (patches (list (search-patch "patchelf-page-size.patch")))))
+    (build-system gnu-build-system)
+    (home-page "http://nixos.org/patchelf.html")
+    (synopsis "Modify the dynamic linker and RPATH of ELF executables")
+    (description
+     "PatchELF allows the ELF \"interpreter\" and RPATH of an ELF binary to be
+changed.")
+    (license gpl3+)))
@@ -30,9 +30,9 @@
  #:use-module (gnu packages guile)
  #:use-module (gnu packages xorg)
  #:use-module (gnu packages lesstif)
-  #:use-module (gnu packages libjpeg)
-  #:use-module (gnu packages libtiff)
-  #:use-module (gnu packages libpng)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages giflib)
+  #:use-module (gnu packages linux)
  #:use-module ((gnu packages compression)
                #:renamer (symbol-prefix-proc 'compression:))
  #:use-module (gnu packages xml)
@@ -54,8 +54,7 @@
    (arguments
     '(#:configure-flags
       (list (string-append "--with-crt-dir=" (assoc-ref %build-inputs "libc")
-                            "/lib")
-             "--with-gif=no")                     ; XXX: add libungif
+                            "/lib"))
       #:phases (alist-cons-before
                 'configure 'fix-/bin/pwd
                 (lambda _
@@ -65,9 +64,7 @@
                      "pwd")))
                 %standard-phases)))
    (inputs
-     `(("pkg-config" ,pkg-config)
-       ("gnutls" ,gnutls)
-       ("texinfo" ,texinfo)
+     `(("gnutls" ,gnutls)
       ("ncurses" ,ncurses)

       ;; TODO: Add the optional dependencies.
@@ -75,7 +72,7 @@
       ("gtk+" ,gtk+-2)
       ("libXft" ,libxft)
       ("libtiff" ,libtiff)
-       ;; ("libungif" ,libungif)
+       ("giflib" ,giflib)
       ("libjpeg" ,libjpeg-8)

       ;; When looking for libpng `configure' links with `-lpng -lz', so we
@@ -85,7 +82,13 @@

       ("libXpm" ,libxpm)
       ("libxml2" ,libxml2)
+       ("libice" ,libice)
+       ("libsm" ,libsm)
+       ("alsa-lib" ,alsa-lib)
       ("dbus" ,dbus)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("texinfo" ,texinfo)))
    (home-page "http://www.gnu.org/software/emacs/")
    (synopsis "The extensible, customizable, self-documenting text editor")
    (description
@@ -1,53 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.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 fdisk)
-  #:use-module ((guix licenses) #:select (gpl3+))
-  #:use-module (gnu packages gettext)
-  #:use-module (gnu packages guile)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages parted)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
-
-(define-public fdisk
-  (package
-    (name "fdisk")
-    (version "2.0.0a")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/fdisk/gnufdisk-"
-                          version ".tar.gz"))
-      (sha256
-       (base32
-        "04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3"))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("gettext" ,gnu-gettext)
-       ("guile" ,guile-1.8)
-       ("util-linux" ,util-linux)
-       ("parted" ,parted)))
-    (home-page "https://www.gnu.org/software/fdisk/")
-    (synopsis "Low-level disk partitioning and formatting")
-    (description
-     "GNU fdisk provides a GNU version of the common disk partitioning tool
-fdisk.  fdisk is used for the creation and manipulation of disk partition
-tables, and it understands a variety of different formats.")
-    (license gpl3+)))
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,14 +27,17 @@
 (define-public file
  (package
   (name "file")
-   (version "5.12")
+   (version "5.18")
   (source (origin
            (method url-fetch)
            (uri (string-append "ftp://ftp.astron.com/pub/file/file-"
                   version ".tar.gz"))
            (sha256 (base32
-                     "08ix4xrvan0k80n0l5lqfmc4azjv5lyhvhwdxny4r09j5smhv78r"))))
+                     "01xz106biz6x4h5ilymg5v3367djvgnfp4lm87132cjqdmqgn6b5"))))
   (build-system gnu-build-system)
+   (native-inputs
+    ;; This package depends upon a native install of itself.
+     (if (%current-target-system) `(("file" ,file)) '() ))
   (synopsis "file, a file type guesser")
   (description
    "The file command is a file type guesser, a command-line tool that tells
@@ -0,0 +1,57 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 David Thompson <davet@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 fish)
+  #:use-module (guix licenses)
+  #:use-module (gnu packages doxygen)
+  #:use-module (gnu packages ncurses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system gnu))
+
+(define-public fish
+  (package
+    (name "fish")
+    (version "2.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://fishshell.com/files/"
+                                  version "/fish-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0i7h3hx8iszli3d4kphw79sz9m07f2lc2c9hr9smdps5s7wpllmg"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("doxygen" ,doxygen)))
+    (inputs
+     `(("ncurses" ,ncurses)))
+    (arguments
+     '(#:tests? #f)) ; no check target
+    (synopsis "The friendly interactive shell")
+    (description
+     "Fish (friendly interactive shell) is a shell focused on interactive use,
+discoverability, and friendliness.  Fish has very user-friendly and powerful
+tab-completion, including descriptions of every completion, completion of
+strings with wildcards, and many completions for specific commands.  It also
+has extensive and discoverable help.  A special help command gives access to
+all the fish documentation in your web browser. Other features include smart
+terminal handling based on terminfo, an easy to search history, and syntax
+highlighting. ")
+    (home-page "http://fishshell.com/")
+    (license gpl2)))
@@ -0,0 +1,59 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 John Darrington <jmd@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 fltk)
+  #:use-module (guix licenses)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages gl)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public fltk
+  (package
+    (name "fltk")
+    (version "1.3.2")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://fltk.org/pub/fltk/" version "/fltk-" version "-source.tar.gz"))
+      (sha256
+       (base32
+        "1974brlk723095vf8z72kazq1cbqr9a51kq6b0xda6zkjkgl8q0p"))))
+   (build-system gnu-build-system)
+    (inputs
+      `(("libx11" ,libx11)
+        ("mesa" ,mesa)))
+    (arguments
+     `(#:tests? #f                      ;TODO: compile programs in "test" dir
+       #:configure-flags '("--enable-shared")
+       #:phases
+       (alist-cons-before
+        'configure 'patch-makeinclude
+        (lambda _
+          (substitute* "makeinclude.in"
+            (("/bin/sh") (which "sh"))))
+        %standard-phases)))
+    (home-page "https://www.fltk.org")
+    (synopsis "3D C++ GUI library")
+    (description "FLTK is a C++ GUI toolkit providing modern GUI functionality without the
+bloat. It supports 3D graphics via OpenGL and its built-in GLUT emulation.
+FLTK is designed to be small and modular enough to be statically linked, but
+works fine as a shared library. FLTK also includes an excellent UI builder
+called FLUID that can be used to create applications in minutes.")
+    (license lgpl2.0))) ; plus certain additional permissions
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,6 +27,72 @@
                #:select (tar))
  #:use-module (gnu packages compression))

+(define-public ttf-dejavu
+  (package
+    (name "ttf-dejavu")
+    (version "2.34")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://sourceforge/dejavu/"
+                                 version "/dejavu-fonts-ttf-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "0pgb0a3ngamidacmrvasg51ck3gp8gn93w6sf1s8snwzx4x2r9yh"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils))
+
+                   (let ((tar      (string-append (assoc-ref %build-inputs
+                                                             "tar")
+                                                  "/bin/tar"))
+                         (PATH     (string-append (assoc-ref %build-inputs
+                                                             "bzip2")
+                                                  "/bin"))
+                         (font-dir (string-append
+                                    %output "/share/fonts/truetype"))
+                         (conf-dir (string-append
+                                    %output "/share/fontconfig/conf.avail"))
+                         (doc-dir  (string-append
+                                    %output "/share/doc/" ,name "-" ,version)))
+                     (setenv "PATH" PATH)
+                     (system* tar "xvf" (assoc-ref %build-inputs "source"))
+
+                     (mkdir-p font-dir)
+                     (mkdir-p conf-dir)
+                     (mkdir-p doc-dir)
+                     (chdir (string-append "dejavu-fonts-ttf-" ,version))
+                     (for-each (lambda (ttf)
+                                 (copy-file ttf
+                                            (string-append font-dir "/"
+                                                           (basename ttf))))
+                               (find-files "ttf" "\\.ttf$"))
+                     (for-each (lambda (conf)
+                                 (copy-file conf
+                                            (string-append conf-dir "/"
+                                                           (basename conf))))
+                               (find-files "fontconfig" "\\.conf$"))
+                     (for-each (lambda (doc)
+                                 (copy-file doc
+                                            (string-append doc-dir "/"
+                                                           (basename doc))))
+                               (find-files "." "\\.txt$|^[A-Z][A-Z]*$"))))))
+    (native-inputs `(("source" ,source)
+                     ("tar" ,tar)
+                     ("bzip2" ,bzip2)))
+    (home-page "http://dejavu-fonts.org/")
+    (synopsis "Vera font family derivate with additional characters")
+    (description "DejaVu provides an expanded version of the Vera font family
+aiming for quality and broader Unicode coverage while retaining the original
+Vera style.  DejaVu currently works towards conformance with the Multilingual
+European Standards (MES-1 and MES-2) for Unicode coverage.  The DejaVu fonts
+provide serif, sans and monospaced variants.")
+    (license
+     (license:x11-style
+      "http://dejavu-fonts.org/"))))
+
 (define-public ttf-bitstream-vera
  (package
    (name "ttf-bitstream-vera")
@@ -76,8 +76,9 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
   (build-system gnu-build-system)
   (inputs `(("expat" ,expat)
             ("freetype" ,freetype)
-             ("gs-fonts" ,gs-fonts)
-             ("pkg-config" ,pkg-config)))
+             ("gs-fonts" ,gs-fonts)))
+   (native-inputs
+      `(("pkg-config" ,pkg-config)))
   (arguments
     `(#:configure-flags
               ;; point to user profile instead of /usr/share/fonts in /etc/fonts.conf
@@ -27,14 +27,14 @@
 (define-public freeipmi
  (package
    (name "freeipmi")
-    (version "1.3.3")
+    (version "1.4.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/freeipmi/freeipmi-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "0pmgr66k4cx0gdwzfby6643m15bb4q2yx2g5r2jr3qidrfyxhi3j"))))
+               "1qpr4h46zmbk82w4fpijimzsdpgyr0fdnsinpsp5cvxy5pcikbd6"))))
    (build-system gnu-build-system)
    (inputs
     `(("readline" ,readline) ("libgcrypt" ,libgcrypt)))
@@ -0,0 +1,56 @@
+;;; 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 ftp)
+  #:use-module ((guix licenses) #:select (gpl3+))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages gnutls)
+  #:use-module (gnu packages compression))
+
+(define-public lftp
+  (package
+    (name "lftp")
+    (version "4.4.15")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://lftp.yar.ru/ftp/lftp-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "0s38vc2ij869dwx3i1c7sk96mqv0hknf3cqf86av59rqnix0px3m"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("zlib" ,zlib)
+       ("readline" ,readline)
+       ("gnutls" ,gnutls)))
+    (home-page "http://lftp.yar.ru/")
+    (synopsis "Command-line file transfer program")
+    (description
+     "LFTP is a sophisticated FTP/HTTP client, and a file transfer program
+supporting a number of network protocols.  Like Bash, it has job control and
+uses the Readline library for input.  It has bookmarks, a built-in mirror
+command, and can transfer several files in parallel.  It was designed with
+reliability in mind.")
+    (license gpl3+)))
@@ -0,0 +1,323 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 John Darrington <jmd@gnu.org>
+;;; Copyright © 2014 David Thompson <dthompson2@worcester.edu>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@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 games)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages libcanberra)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages sdl)
+  #:use-module (gnu packages texinfo)
+  #:use-module (guix build-system gnu))
+
+(define-public gnubg
+  (package
+    (name "gnubg")
+    (version "1.02")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://files.gnubg.org/media/sources/gnubg-release-"
+                           version ".000-sources." "tar.gz"))
+       (sha256
+        (base32
+         "015mvjk2iw1cg1kxwxfnvp2rxb9cylf6yc39i30fdy414k07zkky"))))
+    (build-system gnu-build-system)
+    (inputs `(("glib" ,glib)
+              ("readline" ,readline)
+              ("gtk+" ,gtk+-2)
+              ("mesa" ,mesa)
+              ("gtkglext" ,gtkglext)
+              ("sqlite" ,sqlite)
+              ("libcanberra" ,libcanberra)))
+    (native-inputs `(("python-2" ,python-2)
+                     ("pkg-config" ,pkg-config)))
+    (home-page "https://gnubg.org")
+    (synopsis "Backgammon game")
+    (description "The GNU backgammon application can be used for playing, analyzing and
+teaching the game.  It has an advanced evaluation engine based on artificial
+neural networks suitable for both beginners and advanced players.  In
+addition to a command-line interface, it also features an attractive, 3D
+representation of the playing board.")
+    (license gpl3+)))
+
+(define-public gnubik
+  (package
+    (name "gnubik")
+    (version "2.4.1")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/gnubik/gnubik-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "0mfpwz341i1qpzi2qgslpc5i7d4fv7i01kv392m11pczqdc7i7m5"))))
+    (build-system gnu-build-system)
+    (inputs `(("gtk+" ,gtk+-2)
+              ("mesa" ,mesa)
+              ("libx11" ,libx11)
+              ("guile" ,guile-2.0)
+              ("gtkglext" ,gtkglext)))
+    (native-inputs `(("gettext" ,gnu-gettext)
+                     ("pkg-config" ,pkg-config)))
+    (home-page "https://www.gnu.org/software/gnubik/")
+    (synopsis "3d Rubik's cube game")
+    (description
+     "GNUbik is a puzzle game in which you must manipulate a cube to make
+each of its faces have a uniform color.  The game is customizable, allowing
+you to set the size of the cube (the default is 3x3) or to change the colors.
+ You may even apply photos to the faces instead of colors.  The game is
+scriptable with Guile.")
+    (license gpl3+)))
+
+(define-public abbaye
+  (package
+    (name "abbaye")
+    (version "1.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://abbaye-for-linux.googlecode.com/files/abbaye-for-linux-src-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1wgvckgqa2084rbskxif58wbb83xbas8s1i8s7d57xbj08ryq8rk"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:modules ((ice-9 match)
+                  (guix build gnu-build-system)
+                  (guix build utils))
+       #:phases (alist-cons-after
+                 'set-paths 'set-sdl-paths
+                 (lambda* (#:key inputs outputs (search-paths '()) #:allow-other-keys)
+                   (define input-directories
+                     (match inputs
+                       (((_ . dir) ...)
+                        dir)))
+                   ;; This package does not use pkg-config, so modify CPATH
+                   ;; variable to point to include/SDL for SDL header files.
+                   (set-path-environment-variable "CPATH"
+                                                  '("include/SDL")
+                                                  input-directories))
+                 (alist-cons-after
+                  'patch-source-shebangs 'patch-makefile
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    ;; Replace /usr with package output directory.
+                    (for-each (lambda (file)
+                                (substitute* file
+                                  (("/usr") (assoc-ref outputs "out"))))
+                              '("makefile" "src/pantallas.c" "src/comun.h")))
+                  (alist-cons-before
+                   'install 'make-install-dirs
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     (let ((prefix (assoc-ref outputs "out")))
+                       ;; Create directories that the makefile assumes exist.
+                       (mkdir-p (string-append prefix "/bin"))
+                       (mkdir-p (string-append prefix "/share/applications"))))
+                   ;; No configure script.
+                   (alist-delete 'configure %standard-phases))))
+       #:tests? #f)) ;; No check target.
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("sdl" ,sdl)
+              ("sdl-gfx" ,sdl-gfx)
+              ("sdl-image" ,sdl-image)
+              ("sdl-mixer" ,sdl-mixer)
+              ("sdl-ttf" ,sdl-ttf)))
+    (home-page "http://code.google.com/p/abbaye-for-linux/")
+    (synopsis "GNU/Linux port of the indie game \"l'Abbaye des Morts\"")
+    (description "L'Abbaye des Morts is a 2D platform game set in 13th century
+France.  The Cathars, who preach about good Christian beliefs, were being
+expelled by the Catholic Church out of the Languedoc region in France.  One of
+them, called Jean Raymond, found an old church in which to hide, not knowing
+that beneath its ruins lay buried an ancient evil.")
+    (license gpl3+)))
+
+(define-public pingus
+  (package
+    (name "pingus")
+    (version "0.7.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://pingus.googlecode.com/files/pingus-"
+                           version ".tar.bz2"))
+       (sha256
+        (base32
+         "0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m"))
+       (patches (list (search-patch "pingus-sdl-libs-config.patch")))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("scons" ,scons)))
+    (inputs `(("sdl" ,sdl)
+              ("sdl-image" ,sdl-image)
+              ("sdl-mixer" ,sdl-mixer)
+              ("mesa" ,mesa)
+              ("libpng" ,libpng)
+              ("boost" ,boost)))
+    (arguments
+     '(#:tests? #f                      ;no check target
+       #:phases
+       (alist-delete
+        'configure
+        (alist-replace
+         'install
+         (lambda* (#:key outputs #:allow-other-keys)
+           (zero? (system* "make" "install"
+                           (string-append "PREFIX="
+                                          (assoc-ref outputs "out")))))
+         %standard-phases))))
+    (home-page "http://pingus.seul.org/welcome.html")
+    (synopsis "Lemmings clone")
+    (description
+     "Pingus is a free Lemmings-like puzzle game in which the player takes
+command of a bunch of small animals and has to guide them through levels.
+Since the animals walk on their own, the player can only influence them by
+giving them commands, like build a bridge, dig a hole, or redirect all animals
+in the other direction.  Multiple such commands are necessary to reach the
+level's exit.  The game is presented in a 2D side view.")
+    ;; Some source files are under bsd-3 and gpl2+ licenses.
+    (license gpl3+)))
+
+(define-public talkfilters
+  (package
+    (name "talkfilters")
+    (version "2.3.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.hyperrealm.com/" name "/"
+                           name  "-" version  ".tar.gz")) 
+       (sha256
+        (base32 "19nc5vq4bnkjvhk8srqddzhcs93jyvpm9r6lzjzwc1mgf08yg0a6"))))
+    (build-system gnu-build-system)
+    (home-page "http://www.gnu.org/software/talkfilters")
+    (synopsis "Convert English text to humorous dialects")
+    (description "The GNU Talk Filters are programs that convert English text
+into stereotyped or otherwise humorous dialects.  The filters are provided as
+a C library, so they can easily be integrated into other programs.")
+    (license gpl2+)))
+ 
+(define-public cmatrix
+  (package
+    (name "cmatrix")
+    (version "1.2a")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.asty.org/cmatrix/dist/cmatrix-" version
+                           ".tar.gz"))
+       (sha256
+        (base32
+         "0k06fw2n8nzp1pcdynhajp5prba03gfgsbj91bknyjr5xb5fd9hz"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (alist-replace 'configure
+                      (lambda* (#:key outputs #:allow-other-keys)
+                        ;; This old `configure' script doesn't support
+                        ;; variables passed as arguments.
+                        (let ((out (assoc-ref outputs "out")))
+                          (setenv "CONFIG_SHELL" (which "bash"))
+                          (zero?
+                           (system* "./configure"
+                                    (string-append "--prefix=" out)))))
+                      %standard-phases)))
+    (inputs `(("ncurses" ,ncurses)))
+    (home-page "http://wwww.asty.org/cmatrix")
+    (synopsis "Simulate the display from \"The Matrix\"")
+    (description "CMatrix simulates the display from \"The Matrix\" and is
+based on the screensaver from the movie's website.  It works with terminal
+settings up to 132x300 and can scroll lines all at the same rate or
+asynchronously and at a user-defined speed.")
+    (license gpl2+)))
+
+(define-public chess
+  (package
+    (name "chess")
+    (version "6.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnu/chess/gnuchess-" version
+                           ".tar.gz"))
+       (sha256
+        (base32
+         "1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn"))))
+    (build-system gnu-build-system)
+    (home-page "http://wwww.gnu.org/software/chess")
+    (synopsis "Full chess implementation")
+    (description "GNU Chess is a chess engine.  It allows you to compete
+against the computer in a game of chess, either through the default terminal
+interface or via an external visual interface such as GNU XBoard.")
+    (license gpl3+)))
+
+(define-public xboard
+  (package
+    (name "xboard")
+    (version "4.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnu/xboard/xboard-" version
+                           ".tar.gz"))
+       (sha256
+        (base32
+         "1amy9krr0qkvcc7gnp3i9x9ma91fc5cq8hy3gdc7rmfsaczv1l3z"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (alist-cons-before 
+        'configure 'pre-conf
+        ;; This is GNU.  So use gnuchess as the first choice of engine
+        (lambda _
+          (substitute* "xboard.conf.in" 
+            (("-firstChessProgram fairymax") "-firstChessProgram gnuchess")))
+        %standard-phases)))
+    (inputs `(("cairo" ,cairo)
+              ("librsvg" ,librsvg)
+              ("libxt" ,libxt)
+              ("libxaw" ,libxaw)))
+    (native-inputs `(("texinfo" ,texinfo)
+                     ("pkg-config" ,pkg-config)))
+    (home-page "http://www.gnu.org/software/xboard")
+    (synopsis "Graphical user interface for chess programs")
+    (description "GNU XBoard is a graphical board for all varieties of chess,
+including international chess, xiangqi (Chinese chess), shogi (Japanese chess)
+and Makruk.  Several lesser-known variants are also supported.  It presents a
+fully interactive graphical interface and it can load and save games in the
+Portable Game Notation.")
+    (license gpl3+)))
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,13 +28,13 @@
 (define-public gawk
  (package
   (name "gawk")
-   (version "4.1.0")
+   (version "4.1.1")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/gawk/gawk-" version
                                ".tar.xz"))
            (sha256
-             (base32 "0hin2hswbbd6kd6i4zzvgciwpl5fba8d2s524z8y5qagyz3x010q"))))
+             (base32 "1nz83vpss8xv7m475sv4qhhj40g74nvcw0y9kwq9ds8wzfmcdm7g"))))
   (build-system gnu-build-system)
   (arguments
    `(#:parallel-tests? #f                ; test suite fails in parallel
@@ -54,6 +55,17 @@
                          '((substitute* "extension/Makefile.in"
                              (("^.*: check-for-shared-lib-support" match)
                               (string-append "### " match))))
+                          '())
+
+                    ;; XXX FIXME gawk 4.1.1 was bootstrapped with a prerelease
+                    ;; libtool, which fails on MIPS in the absence of
+                    ;; /usr/bin/file.  As a temporary workaround, we patch
+                    ;; the configure script to hardcode use of the little
+                    ;; endian N32 ABI on MIPS.
+                    ,@(if (equal? "mips64el-linux" (or (%current-target-system)
+                                                       (%current-system)))
+                          '((substitute* "extension/configure"
+                              (("\\$emul") "elf32ltsmipn32")))
                          '())))
                %standard-phases)))
   (inputs `(("libsigsegv" ,libsigsegv)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +24,7 @@
  #:use-module (gnu packages compression)
  #:use-module (gnu packages multiprecision)
  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages elf)
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
@@ -50,6 +51,14 @@ where the OS part is overloaded to denote a specific ABI---into GCC

 (define-public gcc-4.7
  (let* ((stripped? #t)                           ; TODO: make this a parameter
+         (install-target
+          (lambda ()
+            ;; The 'install-strip' rule uses the native 'strip' instead of
+            ;; 'TARGET-strip' when cross-compiling.  Thus, use 'install' in that
+            ;; case.
+            (if (and stripped? (not (%current-target-system)))
+                "install-strip"
+                "install")))
         (maybe-target-tools
          (lambda ()
            ;; Return the `_FOR_TARGET' variables that are needed when
@@ -78,6 +87,14 @@ where the OS part is overloaded to denote a specific ABI---into GCC

                     "--with-local-prefix=/no-gcc-local-prefix"

+                     ;; With a separate "lib" output, the build system
+                     ;; incorrectly guesses GPLUSPLUS_INCLUDE_DIR, so force
+                     ;; it.  (Don't use a versioned sub-directory, that's
+                     ;; unnecessary.)
+                     ,(string-append "--with-gxx-include-dir="
+                                     (assoc-ref %outputs "out")
+                                     "/include/c++")
+
                     ,(let ((libc (assoc-ref %build-inputs "libc")))
                        (if libc
                            (string-append "--with-native-system-header-dir=" libc
@@ -93,15 +110,21 @@ where the OS part is overloaded to denote a specific ABI---into GCC
                   (maybe-target-tools))))))
    (package
      (name "gcc")
-      (version "4.7.3")
+      (version "4.7.4")
      (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/gcc/gcc-"
                                   version "/gcc-" version ".tar.bz2"))
               (sha256
                (base32
-                 "1hx9h64ivarlzi4hxvq42as5m9vlr5cyzaaq4gzj4i619zmkfz1g"))))
+                 "10k2k71kxgay283ylbbhhs51cl55zn2q38vj5pk4k950qdnirrlj"))))
      (build-system gnu-build-system)
+
+      ;; Separate out the run-time support libraries because all the
+      ;; dynamic-linked objects depend on it.
+      (outputs '("out"                     ; commands, etc. (60+ MiB)
+                 "lib"))                   ; libgcc_s, libgomp, etc. (15+ MiB)
+
      (inputs `(("gmp" ,gmp)
                ("mpfr" ,mpfr)
                ("mpc" ,mpc)
@@ -118,32 +141,39 @@ where the OS part is overloaded to denote a specific ABI---into GCC
         #:strip-binaries? ,stripped?
         #:configure-flags ,(configure-flags)
         #:make-flags
-         (let* ((libc        (assoc-ref %build-inputs "libc"))
-                (libc-native (or (assoc-ref %build-inputs "libc-native")
-                                 libc)))
-           `(,@(if libc
-                   (list (string-append "LDFLAGS_FOR_TARGET="
-                                        "-B" libc "/lib "
-                                        "-Wl,-dynamic-linker "
-                                        "-Wl," libc
-                                        ,(glibc-dynamic-linker)))
-                   '())
+         ;; None of the flags below are needed when doing a Canadian cross.
+         ;; TODO: Simplify this.
+         ,(if (%current-target-system)
+              (if stripped?
+                  ''("CFLAGS=-g0 -O2")
+                  ''())
+              `(let* ((libc        (assoc-ref %build-inputs "libc"))
+                      (libc-native (or (assoc-ref %build-inputs "libc-native")
+                                       libc)))
+                 `(,@(if libc
+                         (list (string-append "LDFLAGS_FOR_TARGET="
+                                              "-B" libc "/lib "
+                                              "-Wl,-dynamic-linker "
+                                              "-Wl," libc
+                                              ,(glibc-dynamic-linker)))
+                         '())

-             ;; Native programs like 'genhooks' also need that right.
-             ,(string-append "LDFLAGS="
-                              "-Wl,-rpath=" libc-native "/lib "
-                             "-Wl,-dynamic-linker "
-                             "-Wl," libc-native ,(glibc-dynamic-linker))
-             ,(string-append "BOOT_CFLAGS=-O2 "
-                             ,(if stripped? "-g0" "-g"))))
+                   ;; Native programs like 'genhooks' also need that right.
+                   ,(string-append "LDFLAGS="
+                                   "-Wl,-rpath=" libc-native "/lib "
+                                   "-Wl,-dynamic-linker "
+                                   "-Wl," libc-native ,(glibc-dynamic-linker))
+                   ,(string-append "BOOT_CFLAGS=-O2 "
+                                   ,(if stripped? "-g0" "-g")))))

         #:tests? #f
         #:phases
         (alist-cons-before
          'configure 'pre-configure
          (lambda* (#:key inputs outputs #:allow-other-keys)
-            (let ((out  (assoc-ref outputs "out"))
-                  (libc (assoc-ref inputs "libc")))
+            (let ((libdir (or (assoc-ref outputs "lib")
+                              (assoc-ref outputs "out")))
+                  (libc   (assoc-ref inputs "libc")))
              (when libc
                ;; The following is not performed for `--without-headers'
                ;; cross-compiler builds.
@@ -169,7 +199,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
                   ;; <http://sourceware.org/ml/libc-help/2013-11/msg00023.html>.)
                   (format #f "#define GNU_USER_TARGET_LIB_SPEC \
 \"-L~a/lib %{!static:-rpath=~a/lib %{!static-libgcc:-rpath=~a/lib64 -rpath=~a/lib -lgcc_s}} \" ~a"
-                           libc libc out out suffix))
+                           libc libc libdir libdir suffix))
                  (("#define GNU_USER_TARGET_STARTFILE_SPEC.*$" line)
                   (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib\"
 #define STANDARD_STARTFILE_PREFIX_2 \"\"
@@ -179,23 +209,37 @@ where the OS part is overloaded to denote a specific ABI---into GCC
              ;; Don't retain a dependency on the build-time sed.
              (substitute* "fixincludes/fixincl.x"
                (("static char const sed_cmd_z\\[\\] =.*;")
-                 "static char const sed_cmd_z[] = \"sed\";"))))
+                 "static char const sed_cmd_z[] = \"sed\";"))
+
+              ;; Move libstdc++*-gdb.py to the "lib" output to avoid a
+              ;; circularity between "out" and "lib".  (Note:
+              ;; --with-python-dir is useless because it imposes $(prefix) as
+              ;; the parent directory.)
+              (substitute* "libstdc++-v3/python/Makefile.in"
+                (("pythondir = .*$")
+                 (string-append "pythondir = " libdir "/share"
+                                "/gcc-$(gcc_version)/python\n")))
+
+              ;; Avoid another circularity between the outputs: this #define
+              ;; ends up in auto-host.h in the "lib" output, referring to
+              ;; "out".  (This variable is used to augment cpp's search path,
+              ;; but there's nothing useful to look for here.)
+              (substitute* "gcc/config.in"
+                (("PREFIX_INCLUDE_DIR")
+                 "PREFIX_INCLUDE_DIR_isnt_necessary_here"))))

          (alist-cons-after
           'configure 'post-configure
           (lambda _
             ;; Don't store configure flags, to avoid retaining references to
-             ;; build-time dependencies---e.g., `--with-ppl=/nix/store/xxx'.
+             ;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'.
             (substitute* "Makefile"
               (("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
                "TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))
           (alist-replace 'install
                          (lambda* (#:key outputs #:allow-other-keys)
                            (zero?
-                             (system* "make"
-                                      ,(if stripped?
-                                           "install-strip"
-                                           "install"))))
+                             (system* "make" ,(install-target))))
                          %standard-phases)))))

      (native-search-paths
@@ -217,14 +261,25 @@ Go.  It also includes runtime support libraries for these languages.")

 (define-public gcc-4.8
  (package (inherit gcc-4.7)
-    (version "4.8.2")
+    (version "4.8.3")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/gcc/gcc-"
                                 version "/gcc-" version ".tar.bz2"))
             (sha256
              (base32
-               "1j6dwgby4g3p3lz7zkss32ghr45zpdidrg8xvazvn91lqxv25p09"))))))
+               "07hg10zs7gnqz58my10ch0zygizqh0z0bz6pv4pgxx45n48lz3ka"))))))
+
+(define-public gcc-4.9
+  (package (inherit gcc-4.7)
+    (version "4.9.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/gcc/gcc-"
+                                 version "/gcc-" version ".tar.bz2"))
+             (sha256
+              (base32
+               "0zki3ngi0gsidnmsp88mjl2868cc7cm5wm1vwqw6znja28d7hd6k"))))))

 (define (custom-gcc gcc name languages)
  "Return a custom version of GCC that supports LANGUAGES."
@@ -324,30 +379,3 @@ CLooG is designed to avoid control overhead and to produce a very
 effective code.")
    (license gpl2+)))

-(define-public libelf
-  (package
-    (name "libelf")
-    (version "0.8.13")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "http://www.mr511.de/software/libelf-"
-                                 version ".tar.gz"))
-             (sha256
-              (base32
-               "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr"))))
-    (build-system gnu-build-system)
-    (arguments '(#:phases (alist-replace
-                           'configure
-                           (lambda* (#:key outputs #:allow-other-keys)
-                             ;; This old `configure' script doesn't support
-                             ;; variables passed as arguments.
-                             (let ((out (assoc-ref outputs "out")))
-                               (setenv "CONFIG_SHELL" (which "bash"))
-                               (zero?
-                                (system* "./configure"
-                                         (string-append "--prefix=" out)))))
-                           %standard-phases)))
-    (home-page "http://www.mr511.de/software/english.html")
-    (synopsis "An ELF object file access library")
-    (description "libelf is a C library to access ELF object files.")
-    (license lgpl2.0+)))
@@ -21,8 +21,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix download)
  #:use-module (gnu packages)
-  #:use-module (gnu packages libpng)
-  #:use-module (gnu packages libjpeg)
+  #:use-module (gnu packages image)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages compression)
  #:use-module ((guix licenses) #:select (bsd-style)))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,18 +33,18 @@
 (define-public gdb
  (package
    (name "gdb")
-    (version "7.6.2")
+    (version "7.7.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/gdb/gdb-"
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "1s6hjqmq7xz10hqx45dgrpfh5mla578shn3zxgnrsv66w4n0wsig"))
-             (patches (list (search-patch "gdb-loongson-madd-fix.patch")))))
+               "199sn1p0gzli6icp9dcvrphdvyi7hm4cc9zhziq0q6vg81h55g8d"))))
    (build-system gnu-build-system)
    (arguments
-     '(#:phases (alist-cons-after
+     '(#:tests? #f ; FIXME "make check" fails on single-processor systems.
+       #:phases (alist-cons-after
                 'configure 'post-configure
                 (lambda _
                   (for-each patch-makefile-SHELL
@@ -57,8 +57,13 @@
       ("readline" ,readline)
       ("ncurses" ,ncurses)
       ("python" ,python-wrapper)
-       ("texinfo" ,texinfo)
-       ("dejagnu" ,dejagnu)))
+       ("dejagnu" ,dejagnu)
+
+       ;; Allow use of XML-formatted syscall information.  This enables 'catch
+       ;; syscall' and similar commands.
+       ("libxml2" ,libxml2)))
+    (native-inputs
+      `(("texinfo" ,texinfo)))
    (home-page "http://www.gnu.org/software/gdb/")
    (synopsis "The GNU debugger")
    (description
@@ -25,7 +25,7 @@
 (define-public gdbm
  (package
    (name "gdbm")
-    (version "1.10")
+    (version "1.11")
    (source
     (origin
      (method url-fetch)
@@ -33,7 +33,7 @@
                          version ".tar.gz"))
      (sha256
       (base32
-        "0h9lfzdjc2yl849y0byg51h6xfjg0y7vg9jnsw3gpfwlbd617y13"))))
+        "1hz3jgh3pd4qzp6jy0l8pd8x01g9abw7csnrlnj1a2sxy122z4cd"))))
    (arguments `(#:configure-flags '("--enable-libgdbm-compat")))
    (build-system gnu-build-system)
    (home-page "http://www.gnu.org/software/gdbm/")
@@ -25,7 +25,7 @@
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages libpng)
+  #:use-module (gnu packages image)
  #:use-module ((gnu packages ghostscript)
                #:select (lcms))
  #:use-module (gnu packages compression)
@@ -72,11 +72,12 @@ and XMP metadata of images in various formats.")
    (build-system gnu-build-system)
    (inputs
     `(;; ("libchamplain" ,libchamplain)
-       ("intltool" ,intltool)
       ("lcms" ,lcms)
       ("exiv2" ,exiv2)
       ("libpng" ,libpng)
-       ("gtk+" ,gtk+-2)
+       ("gtk+" ,gtk+-2)))
+    (native-inputs
+     `(("intltool" ,intltool)
       ("pkg-config" ,pkg-config)))
    (home-page "http://geeqie.sourceforge.net")
    (synopsis "Lightweight GTK+ based image viewer")
@@ -34,37 +34,41 @@
 (define-public gnu-gettext
  (package
    (name "gettext")
-    (version "0.18.3.1")
+    (version "0.19.2")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/gettext/gettext-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "0p940zmmw1lndvdhck2vrazikjhr02affwy47mmpfxqvacrrm3qd"))))
+               "1fs9jbmcx26f2ghvnn92x1ks7qfhjg2wv7fbv5nczaz0yrpawj0c"))))
    (build-system gnu-build-system)
    (inputs
     `(("expat" ,expat)))
    (arguments
     `(#:phases (alist-cons-before
-                 'configure 'link-expat
-                 (lambda _
-                   (substitute* "gettext-tools/configure"
-                     (("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"")
-                     (("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\"")))
-                (alist-cons-before
                 'check 'patch-tests
                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((bash (which "sh")))
-                     (substitute* (find-files "gettext-tools/tests"
-                                              "^msgexec-[0-9]")
+                   (let* ((bash (which "sh")))
+                     (substitute*
+                         (find-files "gettext-tools/tests"
+                                     "^(lang-sh|msg(exec|filter)-[0-9])")
                       (("#![[:blank:]]/bin/sh")
                        (format #f "#!~a" bash)))
-                     (substitute* (find-files "gettext-tools/gnulib-tests"
-                                              "posix_spawn")
+
+                     (substitute* (cons "gettext-tools/src/msginit.c"
+                                        (find-files "gettext-tools/gnulib-tests"
+                                                    "posix_spawn"))
                       (("/bin/sh")
-                        bash))))
-                 %standard-phases))))
+                        bash))
+
+                     (substitute* "gettext-tools/src/project-id"
+                       (("/bin/pwd")
+                        "pwd"))))
+                 %standard-phases)
+
+       ;; When tests fail, we want to know the details.
+       #:make-flags '("VERBOSE=yes")))
    (home-page "http://www.gnu.org/software/gettext/")
    (synopsis "Tools and documentation for translation")
    (description
@@ -20,9 +20,7 @@
  #:use-module (gnu packages)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages fontutils)
-  #:use-module (gnu packages libjpeg)
-  #:use-module (gnu packages libpng)
-  #:use-module (gnu packages libtiff)
+  #:use-module (gnu packages image)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
@@ -134,34 +132,27 @@ printing, and psresize, for adjusting page sizes.")
             ("libpng" ,libpng)
             ("libpaper" ,libpaper)
             ("libtiff" ,libtiff)
-             ("perl" ,perl)
-             ("pkg-config" ,pkg-config) ; needed to find libtiff
-             ("python" ,python-wrapper)
-             ("tcl" ,tcl)
             ("zlib" ,zlib)))
+   (native-inputs
+      `(("perl" ,perl)
+        ("pkg-config" ,pkg-config) ; needed to find libtiff
+        ("python" ,python-wrapper)
+        ("tcl" ,tcl)))
   (arguments
    `(#:phases
-      (alist-replace
-       'configure
-       (lambda* (#:key #:allow-other-keys #:rest args)
-        (let ((configure (assoc-ref %standard-phases 'configure)))
-          (apply configure args)
-          (substitute* "base/all-arch.mak"
-            (("/bin/sh") (which "bash")))
-          (substitute* "base/unixhead.mak"
-            (("/bin/sh") (which "bash")))))
-      (alist-replace
-       'build
-       (lambda* (#:key #:allow-other-keys #:rest args)
-        (let ((build (assoc-ref %standard-phases 'build)))
-          (apply build args)
-          (system* "make" "so")))
-      (alist-replace
-       'install
-       (lambda* (#:key #:allow-other-keys #:rest args)
-        (let ((install (assoc-ref %standard-phases 'install)))
-          (apply install args)
-          (system* "make" "install-so")))
+      (alist-cons-after
+       'configure 'patch-config-files
+       (lambda _
+         (substitute* "base/all-arch.mak"
+           (("/bin/sh") (which "bash")))
+         (substitute* "base/unixhead.mak"
+           (("/bin/sh") (which "bash"))))
+      (alist-cons-after
+       'build 'build-so
+       (lambda _ (system* "make" "so"))
+      (alist-cons-after
+       'install 'install-so
+       (lambda _ (system* "make" "install-so"))
      %standard-phases)))))
   (synopsis "PostScript and PDF interpreter")
   (description
@@ -225,8 +216,8 @@ Ghostscript. It currently includes the 35 standard PostScript fonts.")
            (sha256 (base32
                     "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"))))
   (build-system gnu-build-system)
-   (inputs `(("ghostscript" ,ghostscript)
-             ("pkg-config" ,pkg-config)))
+   (inputs `(("ghostscript" ,ghostscript)))
+   (native-inputs `(("pkg-config" ,pkg-config)))
   (synopsis "postscript rendering library")
   (description
    "libspectre is a small library for rendering Postscript documents.
@@ -0,0 +1,76 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 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/>.
+
+(define-module (gnu packages giflib)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (srfi srfi-1)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages perl))
+
+(define-public giflib
+  (package
+    (name "giflib")
+    (version "4.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/giflib/giflib-"
+                                  (first (string-split version #\.))
+                                  ".x/giflib-" version ".tar.bz2"))
+              (sha256
+               (base32 "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj0a"))))
+    (build-system gnu-build-system)
+    (outputs '("bin"                    ; utility programs
+               "out"))                  ; library
+    (inputs `(("libx11" ,libx11)
+              ("libice" ,libice)
+              ("libsm" ,libsm)
+              ("perl" ,perl)))
+    (arguments
+     `(#:phases (alist-cons-after
+                 'unpack 'disable-html-doc-gen
+                 (lambda _
+                   (substitute* "doc/Makefile.in"
+                     (("^all: allhtml manpages") "")))
+                 (alist-cons-after
+                  'install 'install-manpages
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (let* ((bin (assoc-ref outputs "bin"))
+                           (man1dir (string-append bin "/share/man/man1")))
+                      (mkdir-p man1dir)
+                      (for-each (lambda (file)
+                                  (let ((base (basename file)))
+                                    (format #t "installing `~a' to `~a'~%"
+                                            base man1dir)
+                                    (copy-file file
+                                               (string-append
+                                                man1dir "/" base))))
+                                (find-files "doc" "\\.1"))))
+                  %standard-phases))))
+    (synopsis "Tools and library for working with GIF images")
+    (description
+     "giflib is a library for reading and writing GIF images.  It is API and
+ABI compatible with libungif which was in wide use while the LZW compression
+algorithm was patented.  Tools are also included to convert, manipulate,
+compose, and analyze GIF images.")
+    (home-page "http://giflib.sourceforge.net/")
+    (license x11)))
+
+;;; giflib.scm ends here
@@ -0,0 +1,149 @@
+;;; 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 gimp)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages image)
+  #:use-module ((gnu packages ghostscript)
+                #:select (lcms))
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages photo)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages imagemagick))
+
+(define-public babl
+  (package
+    (name "babl")
+    (version "0.1.10")
+    (source (origin
+              (method url-fetch)
+              (uri (list (string-append "http://ftp.gtk.org/pub/babl/0.1/babl-"
+                                        version ".tar.bz2")
+                         (string-append "ftp://ftp.gtk.org/pub/babl/0.1/babl-"
+                                        version ".tar.bz2")))
+              (sha256
+               (base32
+                "1x2mb7zfbvk9d0a7h5cpdff9hhjsadxvqml2jay2bpf7x9nc6gwl"))))
+    (build-system gnu-build-system)
+    (home-page "http://gegl.org/babl/")
+    (synopsis "Image pixel format conversion library")
+    (description
+     "babl is a dynamic, any to any, pixel format translation library.
+It allows converting between different methods of storing pixels known as
+pixel formats that have with different bitdepths and other data
+representations, color models and component permutations.
+
+A vocabulary to formulate new pixel formats from existing primitives is
+provided as well as the framework to add new color models and data types.")
+    (license license:lgpl3+)))
+
+(define-public gegl
+  (package
+    (name "gegl")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (list (string-append "http://download.gimp.org/pub/gegl/" 
+                                        (string-take version 3)
+                                        "/" name "-" version ".tar.bz2")))
+              (sha256
+               (base32
+                "09nlv06li9nrn74ifpm7223mxpg0s7cii702z72cpbwrjh6nlbnz"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (alist-cons-before
+        'build 'pre-build
+        (lambda _
+          ;; This test program seems to crash on exit. Specifically, whilst
+          ;; g_object_unreffing bufferA and bufferB - This seems to be a bug
+          ;; in the destructor.  This is just a test program so will not have
+          ;; any wider effect, although might be hiding another problem.
+          ;; According to advice received on irc.gimp.org#gegl although 0.2.0
+          ;; is the latest released version, any bug reports against it will
+          ;; be ignored.  So we are on our own.
+          (substitute* "tools/img_cmp.c"
+            (("g_object_unref \\(buffer.\\);") ""))
+
+          (substitute* "tests/compositions/Makefile"
+            (("/bin/sh") (which "bash"))))
+        %standard-phases)))
+    (inputs
+     `(("babl" ,babl)
+       ("glib" ,glib)
+       ("cairo" ,cairo)
+       ("pango" ,pango)
+       ("libpng" ,libpng)
+       ("libjpeg" ,libjpeg-8)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("glib" ,glib "bin")             ; for gtester
+       ("intltool" ,intltool)))
+    (home-page "http://gegl.org")
+    (synopsis "Graph based image processing framework")
+    (description "GEGL (Generic Graphics Library) provides infrastructure to
+do demand based cached non destructive image editing on larger than RAM
+buffers.")
+    ;; The library itself is licensed under LGPL while the sample commandline
+    ;; application and GUI binary gegl is licensed under GPL.
+    (license (list license:lgpl3+ license:gpl3+))))
+
+(define-public gimp
+  (package
+    (name "gimp")
+    (version "2.8.10")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://download.gimp.org/pub/gimp/v2.8/gimp-"
+                                        version ".tar.bz2"))
+              (sha256
+               (base32
+                "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags       
+       ;; We don't have pygtk which seems to be needed for this feature
+       `("--disable-python" ))) 
+    (inputs
+     `(("babl" ,babl)
+       ("glib" ,glib)
+       ("libtiff" ,libtiff)
+       ("libjpeg" ,libjpeg-8)
+       ("atk" ,atk)
+       ("gtk+" ,gtk+-2)
+       ("gegl" ,gegl)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (home-page "http://gimp.org")
+    (synopsis "GNU Image Manipulation Program")
+    (description
+     "GIMP is an application for image manipulation tasks such as photo
+retouching, composition and authoring.  It supports all common image formats
+as well as specialized ones.  It features a highly customizable interface
+that is extensible via a plugin system.")
+    (license license:gpl3+))) ; some files are lgplv3
@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013 Guy Grant <gzg@riseup.net>
+;;; Copyright © 2014 David Thompson <davet@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,8 +25,14 @@
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
  #:use-module (guix packages)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages fontutils))
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages guile))

 (define-public glu
  (package
@@ -110,3 +118,97 @@ the X-Consortium license.")
 rendering modes are: Bitmaps, Anti-aliased pixmaps, Texture maps, Outlines,
 Polygon meshes, and Extruded polygon meshes")
    (license l:x11)))
+
+(define-public mesa
+  (package
+    (name "mesa")
+    ;; In newer versions (9.0.5, 9.1 and 9.2 tested), "make" results in an
+    ;; infinite configure loop, see
+    ;; https://bugs.freedesktop.org/show_bug.cgi?id=58812
+    (version "8.0.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/"
+               version
+               "/MesaLib-" version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("glproto" ,glproto)
+        ("libdrm" ,libdrm-2.4.33)
+        ("libx11" ,libx11)
+        ("libxdamage" ,libxdamage)
+        ("libxxf86vm" ,libxxf86vm)))
+    (inputs
+      `(("dri2proto" ,dri2proto)
+        ("expat" ,expat)
+        ("libxfixes" ,libxfixes)
+        ("libxml2" ,libxml2)
+        ("makedepend" ,makedepend)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)
+        ("flex" ,flex)
+        ("bison" ,bison)
+        ("python" ,python-2))) ; incompatible with Python 3 (print syntax)
+    (arguments
+      `(#:configure-flags
+         `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm
+        #:phases
+         (alist-cons-after
+          'unpack 'remove-symlink
+          (lambda _
+            ;; remove dangling symlink to /usr/include/wine/windows
+            (delete-file "src/gallium/state_trackers/d3d1x/w32api"))
+         %standard-phases)))
+    (home-page "http://mesa3d.org/")
+    (synopsis "Mesa, an OpenGL implementation")
+    (description "Mesa is a free implementation of the OpenGL specification -
+a system for rendering interactive 3D graphics. A variety of device drivers
+allows Mesa to be used in many different environments ranging from software
+emulation to complete hardware acceleration for modern GPUs.")
+    (license l:x11)))
+
+(define-public guile-opengl
+  (package
+    (name "guile-opengl")
+    (version "0.1.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/guile-opengl/guile-opengl-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("guile" ,guile-2.0)
+              ("mesa" ,mesa)
+              ("freeglut" ,freeglut)))
+    (arguments
+     '(#:phases (alist-cons-before
+                 'build 'patch-dynamic-link
+                 (lambda* (#:key inputs outputs #:allow-other-keys)
+                   (define (dynamic-link-substitute file lib input)
+                     (substitute* file
+                       (("dynamic-link \"lib([a-zA-Z]+)\"" _ lib)
+                        (string-append "dynamic-link \""
+                                       (assoc-ref inputs input)
+                                       "/lib/lib" lib "\""))))
+                   ;; Replace dynamic-link calls for libGL, libGLU, and
+                   ;; libglut with absolute paths to the store.
+                   (dynamic-link-substitute "glx/runtime.scm" "GL" "mesa")
+                   (dynamic-link-substitute "glu/runtime.scm" "GLU" "mesa")
+                   (dynamic-link-substitute "glut/runtime.scm" "glut"
+                                            "freeglut"))
+                 %standard-phases)))
+    (home-page "http://gnu.org/s/guile-opengl")
+    (synopsis "Guile binding for the OpenGL graphics API")
+    (description
+     "Guile-OpenGL is a library for Guile that provides bindings to the
+OpenGL graphics API.")
+    (license l:lgpl3+)))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;;
@@ -106,33 +106,34 @@ shared NFS home directories.")
 (define glib
  (package
   (name "glib")
-   (version "2.38.0")
+   (version "2.40.0")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/"
                                name "/" (string-take version 4) "/"
                                name "-" version ".tar.xz"))
            (sha256
-             (base32 "0cpzqadqk6z6bmb79p04pykxc8x57rvshh33414cnk41bvgaf4vm"))
+             (base32 "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd"))
            (patches (list (search-patch "glib-tests-homedir.patch")
                           (search-patch "glib-tests-desktop.patch")
                           (search-patch "glib-tests-prlimit.patch")
-                           (search-patch "glib-tests-newnet.patch")))))
+                           (search-patch "glib-tests-timer.patch")))))
   (build-system gnu-build-system)
-   (outputs '("out"                        ; everything
-              "doc"))                      ; 20 MiB of GTK-Doc reference
+   (outputs '("out"           ; everything
+              "bin"           ; glib-mkenums, gtester, etc.; depends on Python
+              "doc"))         ; 20 MiB of GTK-Doc reference
   (inputs
    `(("coreutils" ,coreutils)
-      ("gettext" ,gnu-gettext)
      ("libffi" ,libffi)
+      ("zlib" ,zlib)
+      ("tzdata" ,tzdata)))     ; for tests/gdatetime.c
+   (native-inputs
+    `(("gettext" ,gnu-gettext)
+      ("dbus" ,dbus)                              ; for GDBus tests
      ("pkg-config" ,pkg-config)
      ("python" ,python-wrapper)
-      ("zlib" ,zlib)
      ("perl" ,perl)                              ; needed by GIO tests
-      ("dbus" ,dbus)                              ; for GDBus tests
-      ("bash" ,bash)
-      ("tzdata" ,tzdata)                          ; for tests/gdatetime.c
-      ))
+      ("bash" ,bash)))
   (arguments
    '(#:phases (alist-cons-before
                'build 'pre-build
@@ -155,7 +156,22 @@ shared NFS home directories.")
      ;; Note: `--docdir' and `--htmldir' are not honored, so work around it.
      #:configure-flags (list (string-append "--with-html-dir="
                                             (assoc-ref %outputs "doc")
-                                             "/share/gtk-doc"))))
+                                             "/share/gtk-doc"))
+
+      ;; In 'gio/tests', 'gdbus-test-codegen-generated.h' is #included in a
+      ;; file that gets compiled possibly before it has been fully generated.
+      #:parallel-tests? #f))
+
+   (native-search-paths
+    ;; This variable is not really "owned" by GLib, but several related
+    ;; packages refer to it: gobject-introspection's tools use it as a search
+    ;; path for .gir files, and it's also a search path for schemas produced
+    ;; by 'glib-compile-schemas'.
+    (list (search-path-specification
+           (variable "XDG_DATA_DIRS")
+           (directories '("share")))))
+   (search-paths native-search-paths)
+
   (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME")
   (description
    "GLib provides data structure handling for C, portability wrappers,
@@ -176,25 +192,29 @@ dynamic loading, and an object system.")
                   "/gobject-introspection-"
                   version ".tar.xz"))
             (sha256
-              (base32 "0wvxyvgajmms2bb6k3pf1rdpnd79xdxamykzvxzmcyn1ag9yax9m"))))
+              (base32 "0wvxyvgajmms2bb6k3pf1rdpnd79xdxamykzvxzmcyn1ag9yax9m"))
+             (patches (list (search-patch "gobject-introspection-cc.patch")))))
    (build-system gnu-build-system)
    (inputs
     `(("bison" ,bison)
       ("cairo" ,cairo)
       ("flex" ,flex)
       ("glib" ,glib)
-       ("libffi" ,libffi)
       ("pkg-config" ,pkg-config)
       ("python-2" ,python-2)))
+    (native-inputs
+     `(("glib" ,glib "bin")))
+    (propagated-inputs
+     `(;; In practice, GIR users will need libffi when using
+       ;; gobject-introspection.
+       ("libffi" ,libffi)))
    (arguments
     `(#:phases
-        (alist-replace
-         'configure
-         (lambda* (#:key #:allow-other-keys #:rest args)
-          (let ((configure (assoc-ref %standard-phases 'configure)))
-           ;; giscanner/sourcescanner.py looks for 'CC', let's set it here.
-           (setenv "CC" "gcc")
-           (apply configure args)))
+        (alist-cons-before
+         'configure 'patch-paths
+         (lambda _
+           (substitute* "giscanner/sourcescanner.py"
+             (("GUIX_GCC_PATH") (which "gcc"))))
         %standard-phases)))
    (home-page "https://wiki.gnome.org/GObjectIntrospection")
    (synopsis "Generate interface introspection data for GObject libraries")
@@ -301,7 +321,9 @@ translated.")
    (inputs
     `(("dbus" ,dbus)
       ("expat" ,expat)
-       ("glib" ,glib)
+       ("glib" ,glib)))
+    (native-inputs
+     `(("glib" ,glib "bin")
       ("pkg-config" ,pkg-config)))
    (home-page "http://dbus.freedesktop.org/doc/dbus-glib/")
    (synopsis "D-Bus GLib bindings")
@@ -365,7 +387,8 @@ has an ease of use unmatched by other C++ callback libraries.")
                     (("Gio::init.*$")
                      "return 77;\n")))
                 %standard-phases)))
-    (inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("pkg-config" ,pkg-config)
+              ("glib" ,glib "bin")))
    (propagated-inputs
     `(("libsigc++" ,libsigc++)
       ("glib" ,glib)))
@@ -28,21 +28,35 @@
 (define-public global                             ; a global variable
  (package
    (name "global")
-    (version "6.2.9")
+    (version "6.3")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/global/global-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "00y38kp0zbpjl9c9phldy7j2ihqc54qn4cdgk0azbjdsv75k3n6q"))))
+               "1nzqqcry3mfha53n8j1grdg2dflp9gpg54qwlsrzq9sspwg78769"))))
    (build-system gnu-build-system)
    (inputs `(("ncurses" ,ncurses)
              ("libtool" ,libtool)))
    (arguments
     `(#:configure-flags
       (list (string-append "--with-ncurses="
-                            (assoc-ref %build-inputs "ncurses")))))
+                            (assoc-ref %build-inputs "ncurses")))
+
+       #:phases (alist-cons-after
+                 'install 'post-install
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   ;; Install the Emacs Lisp file in the right place.
+                   (let* ((out  (assoc-ref outputs "out"))
+                          (data (string-append out "/share/gtags"))
+                          (lisp (string-append out "/share/emacs/site-lisp")))
+                     (mkdir-p lisp)
+                     (copy-file (string-append data "/gtags.el")
+                                (string-append lisp "/gtags.el"))
+                     (delete-file (string-append data "/gtags.el"))
+                     #t))
+                 %standard-phases)))
    (home-page "http://www.gnu.org/software/global/")
    (synopsis "Cross-environment source code tag system")
    (description
@@ -27,7 +27,7 @@
 (define-public gnu-pw-mgr
  (package
    (name "gnu-pw-mgr")
-    (version "1.0")
+    (version "1.2")
    (source
     (origin
      (method url-fetch)
@@ -35,7 +35,7 @@
                          version ".tar.gz"))
      (sha256
       (base32
-        "0sn9gzngqkrv74iwxzn5ldqx3w73w9paldcdh8rsv9yvgarv2bm4"))))
+        "0rdindczxq8ysm3qq7ghc7pcvhp6bn6fadlwna8p83vc1n9nd5py"))))
    (build-system gnu-build-system)
    (inputs `(("which" ,which)))
    (home-page "http://www.gnu.org/software/gnu-pw-mgr/")
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17,6 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages gnunet)
+  #:use-module (gnu packages)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages curl)
@@ -25,13 +27,20 @@
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gnupg)
  #:use-module (gnu packages gnutls)
+  #:use-module (gnu packages groff)
  #:use-module (gnu packages gstreamer)
-  #:use-module (gnu packages libjpeg)
-  #:use-module (gnu packages libtiff)
-  #:use-module (gnu packages oggvorbis)
+  #:use-module (gnu packages libidn)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages libunistring)
+  #:use-module (gnu packages maths)
  #:use-module (gnu packages openssl)
  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages video)
+  #:use-module (gnu packages xiph)
  #:use-module ((guix licenses)
                #:renamer (symbol-prefix-proc 'license:))
  #:use-module (guix packages)
@@ -41,14 +50,14 @@
 (define-public libextractor
  (package
   (name "libextractor")
-   (version "1.2")
+   (version "1.3")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/libextractor/libextractor-"
                                version ".tar.gz"))
            (sha256
             (base32
-              "1n7z6s5ils6xmf6b0z1xda41maxj94c1n6wlyyxmacs5lrkh2a96"))))
+              "0zvv7wd011npcx7yphw9bpgivyxz6mlp87a57n96nv85k96dd2l6"))))
   (build-system gnu-build-system)
   ;; WARNING: Checks require /dev/shm to be in the build chroot, especially
   ;; not to be a symbolic link to /run/shm.
@@ -79,8 +88,9 @@
      ("libtiff" ,libtiff)
      ("libtool" ,libtool)
      ("libvorbis" ,libvorbis)
-      ("pkg-config" ,pkg-config)
      ("zlib" ,zlib)))
+   (native-inputs
+      `(("pkg-config" ,pkg-config)))
   (synopsis "Library to extract meta-data from media files")
   (description
    "GNU libextractor is a library for extracting metadata from files.  It
@@ -94,14 +104,14 @@ tool to extract metadata from a file and print the results.")
 (define-public libmicrohttpd
  (package
   (name "libmicrohttpd")
-   (version "0.9.32")
+   (version "0.9.37")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
                                version ".tar.gz"))
            (sha256
             (base32
-              "176qf3xhpq1wa3fd9h8b6996bjf83yna1b30lhb6ccrv67hvhm75"))))
+              "1p3wnhr43v6vqdgl86r76298wjfxz2ihj9zh9kpz8l7va30br357"))))
   (build-system gnu-build-system)
   (inputs
    `(("curl" ,curl)
@@ -122,3 +132,122 @@ also features security features such as basic and digest authentication
 and support for SSL3 and TLS.")
   (license license:lgpl2.1+)
   (home-page "http://www.gnu.org/software/libmicrohttpd/")))
+
+(define-public gnurl
+  (package
+   (name "gnurl")
+   (version "7.35.0")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "https://gnunet.org/sites/default/files/gnurl-"
+                                version ".tar.bz2"))
+            (sha256
+             (base32 "0dzj22f5z6ppjj1aq1bml64iwbzzcd8w1qy3bgpk6gnzqslsxknf"))))
+   (build-system gnu-build-system)
+   (inputs `(("gnutls" ,gnutls)
+             ("libidn" ,libidn)
+             ("zlib" ,zlib)))
+   (native-inputs
+    `(("groff" ,groff)
+      ("perl" ,perl)
+      ("pkg-config" ,pkg-config)
+      ("python" ,python-2)))
+   (arguments
+    `(#:configure-flags '("--enable-ipv6" "--with-gnutls" "--without-libssh2"
+                          "--without-libmetalink" "--without-winidn"
+                          "--without-librtmp" "--without-nghttp2"
+                          "--without-nss" "--without-cyassl"
+                          "--without-polarssl" "--without-ssl"
+                          "--without-winssl" "--without-darwinssl"
+                          "--disable-sspi" "--disable-ntlm-wb"
+                          "--disable-ldap" "--disable-rtsp" "--disable-dict"
+                          "--disable-telnet" "--disable-tftp" "--disable-pop3"
+                          "--disable-imap" "--disable-smtp" "--disable-gopher"
+                          "--disable-file" "--disable-ftp")
+     #:test-target "test"
+     #:parallel-tests? #f
+     ;; We have to patch runtests.pl in tests/ directory
+     #:phases
+      (alist-cons-before
+       'check 'patch-runtests
+       (lambda _
+         (substitute* "tests/runtests.pl"
+                      (("/bin/sh") (which "sh"))))
+       %standard-phases)))
+   (synopsis "Microfork of cURL with support for the HTTP/HTTPS/GnuTLS subset of cURL")
+   (description
+    "Gnurl is a microfork of cURL, a command line tool for transferring data
+with URL syntax. While cURL supports many crypto backends, libgnurl only
+supports HTTPS, HTTPS and GnuTLS.")
+   (license (license:bsd-style "file://COPYING"
+                       "See COPYING in the distribution."))
+   (home-page "https://gnunet.org/gnurl")))
+
+(define-public gnunet
+  (package
+   (name "gnunet")
+   (version "0.10.0")
+   (source
+    (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/gnunet/gnunet-" version
+                          ".tar.gz"))
+      (sha256 (base32
+               "0zqpc47kywhjrpphl0palz849khv00ra2gjrfkysp6p0gfsbvd0i"))
+      (patches
+       (list
+        ;; Patch to fix serious bug in scheduler; upstream commit: #31747
+        (search-patch "gnunet-fix-scheduler.patch")
+        ;; Patch to fix bugs in testcases:
+        ;; * Disable peerinfo-tool tests as they depend on reverse DNS lookups
+        ;; * Allow revocation and integration-tests testcases to run on
+        ;;   loopback; upstream: #32130, #32326
+        ;; * Skip GNS testcases requiring DNS lookups; upstream: #32118
+        (search-patch "gnunet-fix-tests.patch")))
+      (patch-flags '("-p0"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(("glpk" ,glpk)
+      ("gnurl" ,gnurl)
+      ("gnutls" ,gnutls)
+      ("libextractor" ,libextractor)
+      ("libgcrypt" ,libgcrypt)
+      ("libidn" ,libidn)
+      ("libmicrohttpd" ,libmicrohttpd)
+      ("libtool" ,libtool)
+      ("libunistring" ,libunistring)
+      ("openssl" ,openssl)
+      ("opus" ,opus)
+      ("pulseaudio", pulseaudio)
+      ("sqlite" ,sqlite)
+      ("zlib" ,zlib)))
+   (native-inputs
+    `(("pkg-config" ,pkg-config)
+      ("python" ,python-2)))
+   (arguments
+    '(#:phases
+        ;; swap check and install phases and set paths to installed binaries
+        (alist-cons-before
+         'check 'set-path-for-check
+         (lambda* (#:key outputs #:allow-other-keys)
+          (let ((out (assoc-ref outputs "out")))
+           (setenv "GNUNET_PREFIX" out)
+           (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))))
+         (alist-cons-after
+          'install 'check
+          (assoc-ref %standard-phases 'check)
+          (alist-delete
+           'check
+           %standard-phases)))))
+   (synopsis "Secure, decentralized, peer-to-peer networking framework")
+   (description
+    "GNUnet is a framework for secure peer-to-peer networking that does not
+use any centralized or otherwise trusted services.  Our high-level goal is to
+provide a strong free software foundation for a global network that provides
+security and privacy.  GNUnet started with an idea for anonymous
+censorship-resistant file-sharing, but has grown to incorporate other
+applications as well as many generic building blocks for secure networking
+applications.  In particular, GNUnet now includes the GNU Name System, a
+privacy-preserving, decentralized public key infrastructure.")
+   (license license:gpl3+)
+   (home-page "https://gnunet.org/")))
@@ -1,6 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,6 +29,10 @@
  #:use-module (gnu packages readline)
  #:use-module ((gnu packages compression)
                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages ncurses)
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu))
@@ -34,7 +40,7 @@
 (define-public libgpg-error
  (package
    (name "libgpg-error")
-    (version "1.12")
+    (version "1.13")
    (source
     (origin
      (method url-fetch)
@@ -42,7 +48,7 @@
                          version ".tar.bz2"))
      (sha256
       (base32
-        "0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a"))))
+        "02lv5h865f8if391xjp3njg04k0l4x2pwjkcdbzcwilail1skazq"))))
    (build-system gnu-build-system)
    (home-page "http://gnupg.org")
    (synopsis
@@ -57,17 +63,28 @@ Daemon and possibly more in the future.")
 (define-public libgcrypt
  (package
    (name "libgcrypt")
-    (version "1.5.3")
+    (version "1.6.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw"))))
+               "0w10vhpj1r5nq7qm6jp21p1v1vhf37701cw8yilygzzqd7mfzhx1"))))
    (build-system gnu-build-system)
    (propagated-inputs
     `(("libgpg-error" ,libgpg-error)))
+    (native-inputs
+     ;; Needed here for the 'gpg-error' program.
+     `(("libgpg-error" ,libgpg-error)))
+    (arguments
+     ;; The '--with-gpg-error-prefix' argument is needed because otherwise
+     ;; 'configure' uses 'gpg-error-config' to determine the '-L' flag, and
+     ;; the 'gpg-error-config' it runs is the native one---i.e., the wrong one.
+     `(#:configure-flags
+       (list (string-append "--with-gpg-error-prefix="
+                            (assoc-ref %build-inputs "libgpg-error")))))
+    (outputs '("out" "debug"))
    (home-page "http://gnupg.org/")
    (synopsis "Cryptographic function library")
    (description
@@ -77,6 +94,18 @@ algorithms, public key algorithms, large integer functions and random number
 generation.")
    (license lgpl2.0+)))

+(define-public libgcrypt-1.5
+  (package (inherit libgcrypt)
+    (version "1.5.3")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
+                          version ".tar.bz2"))
+      (sha256
+       (base32
+        "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw"))))))
+
 (define-public libassuan
  (package
    (name "libassuan")
@@ -118,6 +147,15 @@ provided.")
    (build-system gnu-build-system)
    (propagated-inputs
     `(("libgpg-error" ,libgpg-error)))
+    (native-inputs
+     `(("libgpg-error" ,libgpg-error)))
+    (arguments
+     `(#:configure-flags
+       (list ,@(if (%current-target-system)
+                   '("CC_FOR_BUILD=gcc")
+                   '())
+             (string-append "--with-gpg-error-prefix="
+                            (assoc-ref %build-inputs "libgpg-error")))))
    (home-page "http://www.gnupg.org")
    (synopsis
     "Libksba is a CMS and X.509 access library under development")
@@ -130,15 +168,14 @@ specifications are building blocks of S/MIME and TLS.")
 (define-public gnupg
  (package
    (name "gnupg")
-    (version "2.0.22")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
-                          ".tar.bz2"))
-      (sha256
-       (base32
-        "0lg210acj2rxq291q4cwamg9gx6gh2prb1xa93y5jhw5b6r0lza3"))))
+    (version "2.0.25")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
+                                  ".tar.bz2"))
+              (sha256
+               (base32
+                "08sqdkybgw4jkdkcyz1bi6y8irj87hpr5b12lkb57kwny1yykaxk"))))
    (build-system gnu-build-system)
    (inputs
     `(("bzip2" ,guix:bzip2)
@@ -153,13 +190,11 @@ specifications are building blocks of S/MIME and TLS.")
       ("readline" ,readline)))
   (arguments
    `(#:phases
-       (alist-replace
-        'configure
-        (lambda* (#:key #:allow-other-keys #:rest args)
-         (let ((configure (assoc-ref %standard-phases 'configure)))
-           (substitute* "tests/openpgp/Makefile.in"
-             (("/bin/sh") (which "bash")))
-           (apply configure args)))
+       (alist-cons-before
+        'configure 'patch-config-files
+        (lambda _
+          (substitute* "tests/openpgp/Makefile.in"
+            (("/bin/sh") (which "bash"))))
       %standard-phases)))
    (home-page "http://gnupg.org/")
    (synopsis "GNU Privacy Guard")
@@ -168,10 +203,34 @@ specifications are building blocks of S/MIME and TLS.")
 standard.  It is used to encrypt and sign data and communication.  It
 features powerful key management and the ability to access public key
 servers.  It includes several libraries: libassuan (IPC between GnuPG
-components), libgpg-error (centralized GnuPG error values), and libskba
-(working with X.509 certificates and CMS data).")
+components), libgpg-error (centralized GnuPG error values), and
+libskba (working with X.509 certificates and CMS data).")
    (license gpl3+)))

+(define-public gnupg-1
+  (package (inherit gnupg)
+    (version "1.4.18")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
+                                  ".tar.bz2"))
+              (sha256
+               (base32
+                "1233bppjvdpbbl425ii6l7xvgy0879ghhnmwrph5b6c4g3dgvddp"))))
+    (inputs
+     `(("zlib" ,guix:zlib)
+       ("bzip2" ,guix:bzip2)
+       ("curl" ,curl)
+       ("readline" ,readline)
+       ("libgpg-error" ,libgpg-error)))
+    (arguments
+     `(#:phases (alist-cons-after
+                 'unpack 'patch-check-sh
+                 (lambda _
+                   (substitute* "checks/Makefile.in"
+                     (("/bin/sh") (which "bash"))))
+                 %standard-phases)))))
+
 (define-public gpgme
  (package
    (name "gpgme")
@@ -185,10 +244,12 @@ components), libgpg-error (centralized GnuPG error values), and libskba
       (base32
        "15h429h6pd67iiv580bjmwbkadpxsdppw0xrqpcm4dvm24jc271d"))))
    (build-system gnu-build-system)
+    (propagated-inputs
+     ;; Needs to be propagated because gpgme.h includes gpg-error.h.
+     `(("libgpg-error" ,libgpg-error)))
    (inputs
     `(("gnupg" ,gnupg)
-       ("libassuan" ,libassuan)
-       ("libgpg-error" ,libgpg-error)))
+       ("libassuan" ,libassuan)))
    (home-page "http://www.gnupg.org/related_software/gpgme/")
    (synopsis "library providing simplified access to GnuPG functionality")
    (description
@@ -216,17 +277,15 @@ and every application benefits from this.")
                     "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d"))))
   (build-system gnu-build-system)
   (inputs `(("perl" ,perl)
-             ("python" ,python-wrapper)
+             ("python" ,python-2)           ; uses the Python 2 'print' syntax
             ("gpg" ,gnupg)))
   (arguments
    `(#:tests? #f
      #:phases
-       (alist-replace
+       (alist-delete
        'configure
-        (lambda* (#:key #:allow-other-keys) #t)
-       (alist-replace
+       (alist-delete
        'build
-        (lambda* (#:key #:allow-other-keys) #t)
       (alist-replace
        'install
        (lambda* (#:key inputs outputs #:allow-other-keys)
@@ -269,13 +328,9 @@ PGP keysigning parties.")
   (arguments
    `(#:tests? #f
      #:phases
-      (alist-replace
-       'unpack
-       (lambda* (#:key #:allow-other-keys #:rest args)
-         (let ((unpack (assoc-ref %standard-phases 'unpack)))
-           (apply unpack args)
-           ;; remove spurious symlink
-           (delete-file "keyanalyze/pgpring/depcomp")))
+      (alist-cons-after
+       'unpack 'remove-spurious-links
+       (lambda _ (delete-file "keyanalyze/pgpring/depcomp"))
      (alist-replace
       'configure
       (lambda* (#:key outputs #:allow-other-keys)
@@ -357,3 +412,60 @@ including tools for signing keys, keyring analysis, and party preparation.
   ;; http://packages.debian.org/changelogs/pool/main/s/signing-party/current/copyright
   (license gpl2)
   (home-page "http://pgp-tools.alioth.debian.org/")))
+
+(define-public pinentry
+  (package
+    (name "pinentry")
+    (version "0.8.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnupg/pinentry/pinentry-"
+                                  version ".tar.bz2"))
+              (sha256
+               (base32
+                "1bd047crf7xb8g61mval8v6qww98rddlsw2dz6j8h8qbnl4hp2sn"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("ncurses" ,ncurses)
+       ("gtk+" ,gtk+-2)
+       ("glib" ,glib)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://gnupg.org/aegypten2/")
+    (synopsis "GnuPG's interface to passphrase input")
+    (description
+     "Pinentry provides a console and a GTK+ GUI that allows users to
+enter a passphrase when `gpg' or `gpg2' is run and needs it.")
+    (license gpl2+)))
+
+(define-public paperkey
+  (package
+    (name "paperkey")
+    (version "1.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.jabberwocky.com/"
+                                  "software/paperkey/paperkey-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1yybj8bj68v4lxwpn596b6ismh2fyixw5vlqqg26byrn4d9dfmsv"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (alist-cons-before
+        'check 'patch-check-scripts
+        (lambda _
+          (substitute* '("checks/roundtrip.sh"
+                         "checks/roundtrip-raw.sh")
+            (("/bin/echo") "echo")))
+        %standard-phases)))
+    (home-page "http://www.jabberwocky.com/software/paperkey/")
+    (synopsis "Backup OpenPGP keys to paper")
+    (description
+     "Paperkey extracts the secret bytes from an OpenPGP (GnuPG, PGP, etc) key
+for printing with paper and ink, which have amazingly long retention
+qualities.  To reconstruct a secret key, you re-enter those
+bytes (whether by hand, OCR, QR code, or the like) and paperkey can use
+them to transform your existing public key into a secret key.")
+    (license gpl2+)))
@@ -0,0 +1,71 @@
+;;; 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 gnustep)
+  #:use-module (guix download)
+  #:use-module (guix packages)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix licenses)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages pkg-config))
+
+(define-public windowmaker
+  (package
+    (name "windowmaker")
+    (version "0.95.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://windowmaker.org/pub/source/release/WindowMaker-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "1l3hmx4jzf6vp0zclqx9gsqrlwh4rvqm1g1zr5ha0cp0zmsg89ab"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-cons-after
+                 'install 'wrap
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let* ((out (assoc-ref outputs "out"))
+                          (bin (string-append out "/bin")))
+                     ;; 'wmaker' wants to invoke 'wmaker.inst' the first time,
+                     ;; which in turn wants to invoke 'wmmenugen' etc., so
+                     ;; make sure everything is in $PATH.
+                     (wrap-program (string-append bin "/wmaker")
+                                   `("PATH" ":" prefix (,bin)))))
+                 %standard-phases)))
+    (inputs
+     `(("libxmu" ,libxmu)
+       ("libxft" ,libxft)
+       ("libx11" ,libx11)
+       ("fontconfig" ,fontconfig)
+       ("libjpeg" ,libjpeg)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://windowmaker.org/")
+    (synopsis "NeXTSTEP-like window manager")
+    (description
+     "Window Maker is an X11 window manager originally designed to provide
+integration support for the GNUstep Desktop Environment.  In every way
+possible, it reproduces the elegant look and feel of the NeXTSTEP user
+interface.  It is fast, feature rich, easy to configure, and easy to use.")
+
+    ;; Artwork is distributed under the WTFPL.
+    (license gpl2+)))
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,12 +29,14 @@
  #:use-module (gnu packages guile)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages which)
-  #:use-module (gnu packages pkg-config))
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (srfi srfi-1))

 (define-public libtasn1
  (package
    (name "libtasn1")
-    (version "3.3")
+    (version "3.6")
    (source
     (origin
      (method url-fetch)
@@ -41,8 +44,13 @@
                          version ".tar.gz"))
      (sha256
       (base32
-        "1h1sz5py8zlg4yczybr6wa925pyadvjcxrdmhilwaqqgs4n2lrcj"))))
+        "0c547qa1vfk1x2jzgjhf65izf4sfi86c6g46q7779g4aldk4gqqr"))))
    (build-system gnu-build-system)
+    (native-inputs `(("perl" ,perl)
+
+                     ;; XXX: For some reason, libtasn1.info wants to be
+                     ;; rebuilt, so we must provide 'makeinfo'.
+                     ("texinfo" ,texinfo)))
    (home-page "http://www.gnu.org/software/libtasn1/")
    (synopsis "ASN.1 library")
    (description
@@ -55,18 +63,24 @@ specifications.")
 (define-public gnutls
  (package
    (name "gnutls")
-    (version "3.2.4")
+    (version "3.2.15")
    (source (origin
             (method url-fetch)
             (uri
              ;; Note: Releases are no longer on ftp.gnu.org since the
              ;; schism (after version 3.1.5).
-              (string-append "mirror://gnupg/gnutls/v3.2/gnutls-"
-                             version ".tar.xz"))
+              (string-append "mirror://gnupg/gnutls/v"
+                             (string-join (take (string-split version #\.) 2)
+                                          ".")
+                             "/gnutls-" version ".tar.xz"))
             (sha256
              (base32
-               "0zvhzy87v9dfxfvmg1pl951kw55rp647cqdza8942fxq7spp158i"))))
+               "1fbpr9r1r2y803s3avwjpy1higqsz85dyb302kvmh0i29frwgg9h"))))
    (build-system gnu-build-system)
+    (arguments
+     ;; Work around build issue reported at
+     ;; <https://lists.gnu.org/archive/html/guix-devel/2014-03/msg00027.html>.
+     '(#:make-flags '("CPPFLAGS=-DENABLE_RSA_EXPORT")))
    (native-inputs
     `(("pkg-config" ,pkg-config)))
    (inputs
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,8 +30,13 @@
  #:use-module (gnu packages linux)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages libevent)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages libffi)
  #:use-module (gnu packages python)
  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages gl)
  #:use-module (gnu packages yasm)
  #:use-module (gnu packages zip))

@@ -50,23 +56,62 @@
    (build-system gnu-build-system)
    (inputs
     `(("alsa-lib" ,alsa-lib)
+       ("bzip2" ,bzip2)
       ("dbus" ,dbus)
       ("dbus-glib" ,dbus-glib)
       ("glib" ,glib)
       ("gstreamer" ,gstreamer-0.10)
       ("gst-plugins-base" ,gst-plugins-base-0.10)
       ("gtk+" ,gtk+-2)
+       ("libevent" ,libevent)
       ("libxt" ,libxt)
+       ("libffi" ,libffi)
       ("mesa" ,mesa)
-       ("perl" ,perl)
-       ("pkg-config" ,pkg-config)
-       ("python" ,python-2) ; Python 3 not supported
-       ("python2-pysqlite" ,python2-pysqlite)
       ("unzip" ,unzip)
       ("yasm" ,yasm)
-       ("zip" ,zip)))
+       ("zip" ,zip)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("perl" ,perl)
+       ("python" ,python-2) ; Python 3 not supported
+       ("python2-pysqlite" ,python2-pysqlite)
+       ("pkg-config" ,pkg-config)))
    (arguments
     `(#:tests? #f ; no check target
+
+       #:configure-flags '(;; Building with debugging symbols takes ~5GiB, so
+                           ;; disable it.
+                           "--disable-debug"
+                           "--disable-debug-symbols"
+
+                           "--disable-webrtc"     ; webrtc fails to build
+
+                           "--with-system-zlib"
+                           "--with-system-bz2"    ; FIXME: not used
+                           "--with-system-libevent"
+
+                           ;; Fails with "--with-system-png won't work because
+                           ;; the system's libpng doesn't have APNG support".
+                           ;; According to
+                           ;; http://sourceforge.net/projects/libpng-apng/ ,
+                           ;; "the Animated Portable Network Graphics (APNG)
+                           ;; is an unofficial extension of the Portable
+                           ;; Network Graphics (PNG) format";
+                           ;; we probably do not wish to support it.
+                           ;; "--with-system-png"
+
+                           ;; Fails with "libjpeg-turbo JCS_EXTENSIONS
+                           ;; required".
+                           ;; According to
+                           ;; http://sourceforge.net/projects/libjpeg-turbo/ ,
+                           ;; "libjpeg-turbo is a derivative of libjpeg that
+                           ;; uses MMX, SSE, SSE2, and NEON SIMD instructions
+                           ;; to accelerate baseline JPEG compression/
+                           ;; decompression", so we had better not use it
+                           ;; "--with-system-jpeg"
+
+                           "--enable-system-ffi")
+
       #:phases
         (alist-cons-before
          'patch-source-shebangs 'sanitise
@@ -84,9 +129,9 @@
            (let ((out (assoc-ref outputs "out")))
              (setenv "SHELL" (which "bash"))
              (setenv "CONFIG_SHELL" (which "bash"))
-              (zero? (system* "./configure"
-                              (string-append "--prefix=" out)
-                              "--disable-webrtc")))) ; webrtc creates an error
+              (zero? (apply system* "./configure"
+                            (string-append "--prefix=" out)
+                            configure-flags))))
          %standard-phases))))
    (home-page "http://www.gnu.org/software/gnuzilla/")
    (synopsis "Entirely free browser derived from Mozilla Firefox")
@@ -25,8 +25,7 @@
  #:use-module (gnu packages xml)
  #:use-module (gnu packages glib)
  #:use-module (gnu packages bison)
-  #:use-module (gnu packages libpng)
-  #:use-module (gnu packages libjpeg)
+  #:use-module (gnu packages image)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages fontutils)
@@ -71,11 +70,12 @@
       ("fontconfig" ,fontconfig)
       ("freetype" ,freetype)
       ("libltdl" ,libtool)
-       ("bison" ,bison)
       ("libXaw" ,libxaw)
       ("expat" ,expat)
       ("libjpeg" ,libjpeg)
-       ("libpng" ,libpng)
+       ("libpng" ,libpng)))
+    (native-inputs
+     `(("bison" ,bison)
       ("pkg-config" ,pkg-config)))
    (home-page "http://www.graphviz.org/")
    (synopsis "Graph visualization software")
@@ -109,7 +109,7 @@ interfaces for other technical domains.")
       ;; Some data files used by the test suite are missing.
       ;; See <http://sourceforge.net/p/gts/bugs/41/>.
       #:tests? #f))
-    (inputs
+    (native-inputs
     `(("pkg-config" ,pkg-config)))
    (propagated-inputs
     ;; The gts.pc file has glib-2.0 as required.
@@ -39,9 +39,9 @@
            (sha256 (base32
                     "0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd6821q"))))
   (build-system gnu-build-system)
-   (inputs `(("bison" ,bison)
-             ("ghostscript" ,ghostscript)
-             ("netpbm" ,netpbm)
+   (inputs `(("ghostscript" ,ghostscript)
+             ("netpbm" ,netpbm)))
+   (native-inputs `(("bison" ,bison)
             ("perl" ,perl)
             ("psutils" ,psutils)
             ("texinfo" ,texinfo)))
@@ -101,8 +101,8 @@
    (description
     "GRUB is a multiboot bootloader.  It is used for initially loading the
 kernel of an operating system and then transferring control to it. The kernel
-then goes on to load the rest of the operating system. As a multiboot boot
-loader, GRUB handles the presence of multiple operating systems installed on
-the same computer; upon booting the computer, the user is presented with a
+then goes on to load the rest of the operating system. As a multiboot
+bootloader, GRUB handles the presence of multiple operating systems installed
+on the same computer; upon booting the computer, the user is presented with a
 menu to select one of the installed operating systems.")
    (license gpl3+)))
@@ -43,21 +43,25 @@
       (base32
        "0c0irk85jd2cihm5pmf4zxhlpg08qpxjcqv1l9qn2n3h2gsaj2lf"))))
    (build-system gnu-build-system)
-    (inputs
+    (arguments
+     ;; XXX: Temporarily disable tests to work around 'gst/gstbus' test
+     ;; failure: <https://bugzilla.gnome.org/show_bug.cgi?id=724073>.
+     '(#:tests? #f))
+    (inputs `(("glib" ,glib)))
+    (native-inputs
     `(("bison" ,bison)
       ("flex" ,flex)
-       ("glib" ,glib)
+       ("glib" ,glib "bin")
       ("perl" ,perl)
       ("pkg-config" ,pkg-config)
       ("python-wrapper" ,python-wrapper)))
    (home-page "http://gstreamer.freedesktop.org/")
-    (synopsis
-     "Multimedia library")
+    (synopsis "Multimedia library")
    (description
     "GStreamer is a library for constructing graphs of media-handling
 components.  The applications it supports range from simple Ogg/Vorbis
 playback, audio/video streaming to complex audio (mixing) and video
-(non-linear editing) processing.
+ (non-linear editing) processing.

 Applications can take advantage of advances in codec and filter technology
 transparently.  Developers can add new codecs and filters by writing a
@@ -82,12 +86,13 @@ This package provides the core library and elements.")
              (search-patch "gstreamer-0.10-silly-test.patch")))))
    (propagated-inputs
     `(("libxml2" ,libxml2)))
-    (inputs
+    (inputs `(("glib" ,glib)))
+    (native-inputs
     `(("bison" ,bison)
       ("flex" ,flex)
-       ("glib" ,glib)
       ("perl" ,perl)
       ("pkg-config" ,pkg-config)
+       ("glib" ,glib "bin")
       ("python" ,python-2)))))

 (define-public gst-plugins-base
@@ -106,9 +111,11 @@ This package provides the core library and elements.")
    ;; FIXME: Add more dependencies for further plugins.
    (inputs
     `(("glib" ,glib)
-       ("gstreamer" ,gstreamer)
-       ("pkg-config" ,pkg-config)
-       ("python-wrapper" ,python-wrapper)))
+       ("gstreamer" ,gstreamer)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)
+        ("glib" ,glib "bin")
+        ("python-wrapper" ,python-wrapper)))
    (arguments
     `(#:tests? #f))
      ;; All tests pass except for one:
@@ -147,6 +154,8 @@ This package provides an essential exemplary set of elements.")
        "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z"))))
    (inputs
     `(("glib" ,glib)
-       ("gstreamer" ,gstreamer-0.10)
-       ("pkg-config" ,pkg-config)
-       ("python" ,python-2)))))
+       ("gstreamer" ,gstreamer-0.10)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)
+        ("glib" ,glib "bin")
+        ("python" ,python-2)))))
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,9 +29,7 @@
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gnome)
  #:use-module (gnu packages icu4c)
-  #:use-module (gnu packages libjpeg)
-  #:use-module (gnu packages libpng)
-  #:use-module (gnu packages libtiff)
+  #:use-module (gnu packages image)
  #:use-module (gnu packages pdf)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
@@ -53,8 +51,11 @@
             (base32
              "1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3"))))
   (build-system gnu-build-system)
-   (inputs `(("glib" ,glib)
-             ("pkg-config" ,pkg-config)))
+   (inputs `(("glib" ,glib)))
+   (native-inputs
+    `(("pkg-config" ,pkg-config)
+      ("glib" ,glib "bin")                               ; glib-mkenums, etc.
+      ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
   (synopsis "GNOME accessibility toolkit")
   (description
    "ATK provides the set of accessibility interfaces that are implemented
@@ -87,11 +88,12 @@ tools have full access to view and control running applications.")
   (inputs
    `(("ghostscript" ,ghostscript)
      ("libspectre" ,libspectre)
-      ("pkg-config" ,pkg-config)
      ("poppler" ,poppler)
-      ("python" ,python-wrapper)
      ("xextproto" ,xextproto)
      ("zlib" ,zlib)))
+   (native-inputs
+     `(("pkg-config" ,pkg-config)
+      ("python" ,python-wrapper)))
    (arguments
      `(#:tests? #f)) ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
   (synopsis "2D graphics library")
@@ -127,8 +129,9 @@ affine transformation (scale, rotation, shear, etc.)")
   (build-system gnu-build-system)
   (inputs
    `(("cairo" ,cairo)
-      ("icu4c" ,icu4c)
-      ("pkg-config" ,pkg-config)
+      ("icu4c" ,icu4c)))
+   (native-inputs
+     `(("pkg-config" ,pkg-config)
      ("python" ,python-wrapper)))
   (synopsis "opentype text shaping engine")
   (description
@@ -153,8 +156,11 @@ affine transformation (scale, rotation, shear, etc.)")
    `(("cairo" ,cairo)
      ("harfbuzz" ,harfbuzz)))
   (inputs
+    `(("zlib" ,zlib)))
+   (native-inputs
    `(("pkg-config" ,pkg-config)
-      ("zlib" ,zlib)))
+      ("glib" ,glib "bin")                               ; glib-mkenums, etc.
+      ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
   (synopsis "GNOME text and font handling library")
   (description
    "Pango is the core text and font handling library used in GNOME
@@ -163,6 +169,33 @@ used throughout the world.")
   (license license:lgpl2.0+)
   (home-page "https://developer.gnome.org/pango/")))

+(define-public pangox-compat
+  (package
+    (name "pangox-compat")
+    (version "0.0.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "mirror://gnome/sources/" name "/" (string-take version 3)  "/" name "-"
+                   version
+                   ".tar.xz"))
+             (sha256
+              (base32
+               "0ip0ziys6mrqqmz4n71ays0kf5cs1xflj1gfpvs4fgy2nsrr482m"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("glib" ,glib)
+       ("pango" ,pango)))
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (home-page "https://developer.gnome.org/pango")
+    (synopsis "functions now obsolete in pango")
+    (description  "Pangox was a X backend to pango.  It is now obsolete and no
+longer provided by recent pango releases.  pangox-compat provides the
+functions which were removed.")
+    (license license:lgpl2.0+)))
+

 (define-public gtksourceview
  (package
@@ -178,14 +211,15 @@ used throughout the world.")
                "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5"))))
    (build-system gnu-build-system)
    (inputs
-     `(("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)
-       ("gtk" ,gtk+-2)
+     `(("gtk" ,gtk+-2)
       ("libxml2" ,libxml2)
-
       ;; These two are needed only to allow the tests to run successfully.
       ("xorg-server" ,xorg-server)
       ("shared-mime-info" ,shared-mime-info)))
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("glib" ,glib "bin")             ; for glib-genmarshal, etc.
+       ("pkg-config" ,pkg-config)))
    (arguments
     `(#:phases
       ;; Unfortunately, some of the tests in "make check" are highly dependent
@@ -233,8 +267,11 @@ printing and other features typical of a source code editor.")
    `(("glib" ,glib)
      ("libjpeg" ,libjpeg)
      ("libpng" ,libpng)
-      ("libtiff" ,libtiff)
-      ("pkg-config" ,pkg-config)))
+      ("libtiff" ,libtiff)))
+   (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("glib" ,glib "bin")                               ; glib-mkenums, etc.
+       ("gobject-introspection", gobject-introspection))) ; g-ir-compiler, etc.
   (synopsis "GNOME image loading and manipulation library")
   (description
    "GdkPixbuf is a library for image loading and manipulation developed
@@ -257,10 +294,11 @@ in the GNOME project.")
   (build-system gnu-build-system)
   (inputs `(("dbus" ,dbus)
             ("glib" ,glib)
-             ("intltool" ,intltool)
             ("libxi" ,libxi)
-             ("libxtst" ,libxtst)
-             ("pkg-config" ,pkg-config)))
+             ("libxtst" ,libxtst)))
+   (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
   (arguments
    `(#:tests? #f)) ; FIXME: dbind/dbtest fails; one should disable tests in
                    ; a more fine-grained way.
@@ -287,8 +325,9 @@ is part of the GNOME accessibility project.")
   (inputs `(("atk" ,atk)
             ("at-spi2-core" ,at-spi2-core)
             ("dbus" ,dbus)
-             ("glib" ,glib)
-             ("pkg-config" ,pkg-config)))
+             ("glib" ,glib)))
+   (native-inputs
+     `(("pkg-config" ,pkg-config)))
   (arguments
    `(#:tests? #f)) ; FIXME: droute/droute-test fails; one should disable
                    ; tests in a more fine-grained way.
@@ -316,20 +355,19 @@ is part of the GNOME accessibility project.")
    `(("atk" ,atk)
      ("gdk-pixbuf" ,gdk-pixbuf)
      ("pango" ,pango)))
-   (inputs
+   (native-inputs
    `(("perl" ,perl)
+      ("glib" ,glib "bin")
      ("pkg-config" ,pkg-config)
      ("python-wrapper" ,python-wrapper)))
   (arguments
    `(#:phases
-      (alist-replace
-       'configure
-       (lambda* (#:key #:allow-other-keys #:rest args)
-        (let ((configure (assoc-ref %standard-phases 'configure)))
-          ;; FIXME: re-enable tests requiring an X server
-          (substitute* "gtk/Makefile.in"
-           (("SUBDIRS = theme-bits . tests") "SUBDIRS = theme-bits ."))
-          (apply configure args)))
+      (alist-cons-before
+       'configure 'disable-tests
+       (lambda _
+         ;; FIXME: re-enable tests requiring an X server
+         (substitute* "gtk/Makefile.in"
+           (("SUBDIRS = theme-bits . tests") "SUBDIRS = theme-bits .")))
      %standard-phases)))
   (synopsis "Cross-platform toolkit for creating graphical user interfaces")
   (description
@@ -359,16 +397,19 @@ application suites.")
      ("libxinerama" ,libxinerama)
      ("pango" ,pango)))
   (inputs
-    `(("libxml2" ,libxml2)
-      ("perl" ,perl)
+    `(("libxml2" ,libxml2)))
+   (native-inputs
+    `(("perl" ,perl)
+      ("glib" ,glib "bin")
      ("pkg-config" ,pkg-config)
+      ("gobject-introspection" ,gobject-introspection)
      ("python-wrapper" ,python-wrapper)
      ("xorg-server" ,xorg-server)))
   (arguments
    `(#:phases
      (alist-replace
       'configure
-       (lambda* (#:key #:allow-other-keys #:rest args)
+       (lambda* (#:key inputs #:allow-other-keys #:rest args)
         (let ((configure (assoc-ref %standard-phases 'configure)))
           ;; Disable most tests, failing in the chroot with the message:
           ;; D-Bus library appears to be incorrectly set up; failed to read
@@ -376,7 +417,8 @@ application suites.")
           ;; directory.
           ;; See the manual page for dbus-uuidgen to correct this issue.
           (substitute* "testsuite/Makefile.in"
-            (("SUBDIRS = gdk gtk a11y css reftests") "SUBDIRS = gdk"))
+             (("SUBDIRS = gdk gtk a11y css reftests")
+              "SUBDIRS = gdk"))
           (apply configure args)))
       %standard-phases)))))

@@ -425,8 +467,9 @@ application suites.")
     `(("guile-lib" ,guile-lib)
       ("expat" ,expat)
       ("cairo" ,cairo)
-       ("pkg-config" ,pkg-config)
       ("guile" ,guile-2.0)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
    (home-page "http://www.nongnu.org/guile-cairo/")
    (synopsis "Cairo bindings for GNU Guile")
    (description
@@ -458,7 +501,7 @@ exceptions, macros, and a dynamic programming environment.")
    (arguments
     ;; The examples lack -lcairo.
     '(#:make-flags '("LDFLAGS=-lcairo")))
-    (inputs `(("pkg-config" ,pkg-config)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
    (propagated-inputs
     `(("libsigc++" ,libsigc++)
       ("freetype" ,freetype)
@@ -483,7 +526,7 @@ library.")
              (base32
               "0hcyvv7c5zmivprdam6cp111i6hn2y5jsxzk00m6j9pncbzvp0hf"))))
    (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
    (propagated-inputs
     `(("cairo" ,cairo)
       ("cairomm" ,cairomm)
@@ -508,7 +551,7 @@ library.")
              (base32
               "06zrf2ymml2dzp53sss0d4ch4dk9v09jm8rglnrmwk4v81mq9gxz"))))
    (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
    (propagated-inputs
     `(("glibmm" ,glibmm) ("atk" ,atk)))
    (home-page "http://www.gtkmm.org")
@@ -530,7 +573,7 @@ toolkit.")
              (base32
               "0yf8wwv4w02p70nrxsbs0nhm0w4gkn2wggdjygd8vif062anf1rs"))))
    (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
    (propagated-inputs
     `(("pangomm" ,pangomm)
       ("cairomm" ,cairomm)
@@ -547,3 +590,22 @@ are easily extensible via inheritance.  You can create user interfaces either
 in code or with the Glade User Interface designer, using libglademm.  There's
 extensive documentation, including API reference and a tutorial.")
    (license license:lgpl2.1+)))
+
+
+(define-public gtkmm-2
+  (package (inherit gtkmm)
+    (version "2.24.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnome/sources/gtkmm/"
+                                 (string-take version 4) "/gtkmm-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369"))))
+    (propagated-inputs
+     `(("pangomm" ,pangomm)
+       ("cairomm" ,cairomm)
+       ("atkmm" ,atkmm)
+       ("gtk+" ,gtk+-2)
+       ("glibmm" ,glibmm)))))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,36 +29,26 @@
 (define-public guile-xcb
  (package
    (name "guile-xcb")
-    (version "1.2")
+    (version "1.3")
    (source (origin
             (method url-fetch)
             (uri (string-append "http://www.markwitmer.com/dist/guile-xcb-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "009qrw46ay74z3mw8gz7jqvn90z9ilyhy00801w5vpyias02730y"))))
+               "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"))))
    (build-system gnu-build-system)
    (arguments '(;; Parallel builds fail.
                 #:parallel-build? #f

-                 ;; The '.scm' files go to $(datadir), so set that to the
-                 ;; standard value.
                 #:configure-flags (list (string-append
-                                          "--datadir="
+                                          "--with-guile-site-dir="
                                          (assoc-ref %outputs "out")
-                                          "/share/guile/site/2.0"))
-                 #:phases (alist-cons-before
-                           'configure 'set-go-directory
-                           (lambda* (#:key outputs #:allow-other-keys)
-                             ;; The makefile sets the .go directory to Guile's
-                             ;; own .go site directory, which is read-only.
-                             ;; Change it to point to $out/share/guile/site/2.0.
-                             (let ((out (assoc-ref outputs "out")))
-                               (substitute* "Makefile.in"
-                                 (("^godir = .*$")
-                                  (string-append "godir = " out
-                                                 "/share/guile/site/2.0\n")))))
-                           %standard-phases)))
+                                          "/share/guile/site/2.0")
+                                         (string-append
+                                          "--with-guile-site-ccache-dir="
+                                          (assoc-ref %outputs "out")
+                                          "/share/guile/site/2.0"))))
    (native-inputs `(("pkg-config" ,pkg-config)))
    (inputs `(("guile" ,guile-2.0)
              ("xcb" ,xcb-proto)))
@@ -73,14 +63,14 @@ dependencies.")
 (define-public guile-wm
  (package
    (name "guile-wm")
-    (version "0.2")
+    (version "1.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "http://www.markwitmer.com/dist/guile-wm-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "0vv6avpkl6lgrhy2a16z470fqjhvzi4r93qwl87xw9v5dvldf08p"))))
+                "1l9qcz236jxvryndimjy62cf8zxf8i3f8vg3zpqqjhw15j9mdk3r"))))
    (build-system gnu-build-system)
    (arguments '(;; The '.scm' files go to $(datadir), so set that to the
                 ;; standard value.
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35,7 +36,9 @@
  #:use-module (gnu packages which)
  #:use-module (guix packages)
  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (guix utils)
+  #:use-module (ice-9 match))

 ;;; Commentary:
 ;;;
@@ -106,14 +109,14 @@ without requiring the source code to be rewritten.")
 (define-public guile-2.0
  (package
   (name "guile")
-   (version "2.0.9")
+   (version "2.0.11")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/guile/guile-" version
                                ".tar.xz"))
            (sha256
             (base32
-              "0nw9y8vjyz4r61v06p9msks5lm58pd91irmzg4k487vmv743h2pp"))))
+              "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f"))))
   (build-system gnu-build-system)
   (native-inputs `(("pkgconfig" ,pkg-config)))
   (inputs `(("libffi" ,libffi)
@@ -150,11 +153,7 @@ without requiring the source code to be rewritten.")
                    (substitute* "module/ice-9/popen.scm"
                      (("/bin/sh")
                       (string-append bash "/bin/bash")))))
-                %standard-phases)
-
-      ,@(if (%current-target-system)
-            '(#:configure-flags '("CC_FOR_BUILD=gcc"))
-            '())))
+                %standard-phases)))

   (native-search-paths
    (list (search-path-specification
@@ -243,12 +242,14 @@ many readers as needed).")
                                 version ".tar.gz"))
             (sha256
              (base32
-               "070wl664lsm14hb6y9ch97x9q6cns4k6nxgdzbdzi5byixn74899"))))
+               "070wl664lsm14hb6y9ch97x9q6cns4k6nxgdzbdzi5byixn74899"))
+             (patches (list (search-patch "guile-ncurses-tests.patch")))))
    (build-system gnu-build-system)
    (inputs `(("ncurses" ,ncurses)
              ("guile" ,guile-2.0)))
    (arguments
-     '(#:configure-flags (list (string-append "--with-guilesitedir="
+     '(#:configure-flags (list "--with-ncursesw"  ; Unicode support
+                               (string-append "--with-guilesitedir="
                                              (assoc-ref %outputs "out")
                                              "/share/guile/site/2.0"))
       #:phases (alist-cons-after
@@ -272,18 +273,18 @@ library.")
 (define-public mcron
  (package
    (name "mcron")
-    (version "1.0.6")
+    (version "1.0.8")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/mcron/mcron-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "0yvrfzzdy2m7fbqkr61fw01wd9r2jpnbyabxhcsfivgxywknl0fy"))
+               "0zparwgf01jgl1x53ik71ghabldq6zz18ha4dscps1i0qrzgap1b"))
             (patches (list (search-patch "mcron-install.patch")))))
    (build-system gnu-build-system)
-    (inputs
-     `(("ed" ,ed) ("which" ,which) ("guile" ,guile-1.8)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.0)))
    (home-page "http://www.gnu.org/software/mcron/")
    (synopsis "Run jobs at scheduled times")
    (description
@@ -327,4 +328,35 @@ for Guile\".")
    ;; details.
    (license gpl3+)))

+(define-public guile-json
+  (package
+    (name "guile-json")
+    (version "0.3.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://savannah/guile-json/guile-json-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "0nz2sx61kd6cfflwzxxq0cb9dz0asb81abbhfawv4p9ghciqdr3g"))
+             (modules '((guix build utils)))
+             (snippet
+              ;; Make sure everything goes under .../site/2.0, like Guile's
+              ;; search paths expects.
+              '(substitute* '("Makefile.in" "json/Makefile.in")
+                 (("moddir =.*/share/guile/site" all)
+                  (string-append all "/2.0"))))))
+    (build-system gnu-build-system)
+    (inputs `(("guile" ,guile-2.0)))
+    (home-page "http://savannah.nongnu.org/projects/guile-json/")
+    (synopsis "JSON module for Guile")
+    (description
+     "Guile-json supports parsing and building JSON documents according to the
+http:://json.org specification. These are the main features:
+- Strictly complies to http://json.org specification.
+- Build JSON documents programmatically via macros.
+- Unicode support for strings.
+- Allows JSON pretty printing.")
+    (license lgpl3+)))
+
 ;;; guile.scm ends here
--- a/Show More
+++ b/Show More