Update 'NEWS'.

build: Remove '..' from srcdir/builddir in 'pre-inst-env'.
* pre-inst-env.in (abs_top_srcdir, abs_top_builddir): New variables. Use them instead of @abs_top_srcdir@ and @abs_top_builddir@. This fixes the "package-field-location, relative file name" test in 'make distcheck'.
2026-07-08 10:34:04 +02:00 · 2013-12-11 13:06:19 +01:00 · 2013-12-11 11:58:54 +01:00 · 2013-12-11 10:47:55 +01:00 · 2013-12-11 01:25:39 +01:00 · 2013-12-11 01:10:41 +01:00
269 changed files with 20725 additions and 4942 deletions
@@ -13,10 +13,19 @@
   (eval . (put 'lambda* 'scheme-indent-function 1))
   (eval . (put 'substitute* 'scheme-indent-function 1))
   (eval . (put 'with-directory-excursion 'scheme-indent-function 1))
-   (eval . (put 'package 'scheme-indent-function 1))
+   (eval . (put 'package 'scheme-indent-function 0))
+   (eval . (put 'origin '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-error-handling 'scheme-indent-function 0))
-   (eval . (put 'with-mutex 'scheme-indent-function 1))))
+   (eval . (put 'with-mutex '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))))
 (emacs-lisp-mode . ((indent-tabs-mode . nil)))
 (texinfo-mode    . ((indent-tabs-mode . nil)
                     (fill-column . 72))))
@@ -35,6 +35,8 @@ config.cache
 /po/remove-potcdate.sin
 /po/stamp-po
 /po/guix.pot
+/po/*.mo
+/po/*.gmo
 /tests/*.trs
 /INSTALL
 /m4/*
@@ -46,6 +48,7 @@ config.cache
 /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/mips64el-linux/guile-2.0.9.tar.xz
 /guix/config.scm
 /nix/nix-daemon/nix-daemon.cc
 /nix/config.h
@@ -76,3 +79,8 @@ stamp-h[0-9]
 /nix/scripts/substitute-binary
 /doc/images/bootstrap-graph.png
 /doc/images/bootstrap-graph.eps
+/guix-register
+GPATH
+GRTAGS
+GTAGS
+/nix-setuid-helper
@@ -5,11 +5,17 @@ build daemon whose code comes from Nix (see the manual for details.)
 Nix was initially written by Eelco Dolstra; other people have been
 contributing to it.  See `nix/AUTHORS' for details.

-GNU Guix was initiated by Ludovic Courtès <ludo@gnu.org>, but it would
-not be what it is without the contributions of the following people (in
+The fine people listed below have contributed code to GNU Guix (in
 alphabetical order):

-  Andreas Enge <andreas@enge.fr>
-  Nikita Karetnikov <nikita@karetnikov.org>
-  Cyril Roelandt <tipecaml@gmail.com>
-  Mark H. Weaver <mhw@netris.org>
+           Eric Bavier <bavier@member.fsf.org>
+        Ludovic Courtès <ludo@gnu.org>
+           John Darrington <john@darrington.wattle.id.au>
+        Andreas Enge <andreas@enge.fr>
+            Guy Grant <gzg@riseup.net>
+         Nikita Karetnikov <nikita@karetnikov.org>
+        Aljosha Papsch <misc@rpapsch.de>
+          Cyril Roelandt <tipecaml@gmail.com>
+           Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
+          David Thompson <dthompson2@worcester.edu>
+        Mark H. Weaver <mhw@netris.org>
@@ -12,16 +12,27 @@ Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>

 * Building from Git

-First, make sure that Autoconf (>= 2.69), Automake, and pkg-config are
-installed.  Run ‘./bootstrap’ that, among other things, invokes ‘git submodule
-update’, or you might get the following error
+When building Guix from a checkout, the following packages are required in
+addition to those mentioned in the installation instructions:
+
+  - [[http://www.gnu.org/software/autoconf/][GNU Autoconf]]
+  - [[http://www.gnu.org/software/automake/][GNU Automake]]
+  - [[http://www.gnu.org/software/gettext/][GNU Gettext]]
+  - [[http://www.graphviz.org/][Graphviz]]
+
+Run ‘./bootstrap’ to download the Nix daemon source code and to generate the
+build system infrastructure using autoconf.  It reports an error if an
+inappropriate version of the above packages is being used.
+
+The ‘bootstrap’ script, among other things, invokes ‘git submodule update’; if
+you didn’t run it, you may get the following error:

  make: *** No rule to make target `nix/libstore/schema.sql', needed by
  `nix/libstore/schema.sql.hh'

-Then, as always, run ‘./configure’.  If you get an error like this one
+If you get an error like this one:

-  ./configure: line 6755: `PKG_CHECK_MODULES(GUILE, guile-2.0 >= 2.0.5)'
+  configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES

 it probably means that Autoconf couldn’t find ‘pkg.m4’, which is provided by
 pkg-config.  Make sure that ‘pkg.m4’ is available.  For instance, if you
@@ -32,17 +43,11 @@ installed Automake in ‘/usr/local’, it wouldn’t look for ‘.m4’ files i

 See “info '(automake) Macro Search Path'” for more information.

-After that you should proceed with ‘make’.  You might also get this error
-
-  /bin/bash: dot: command not found
-  make[2]: *** [doc/images/bootstrap-graph.png] Error 127
-
-This one is easy to handle; just install Graphviz.  It is not listed as a
-requirement because the resulting images should come with a tarball.
+Then, run ‘./configure’ as usual.

 Finally, you have to invoke ‘make check’ to run tests.  If anything fails,
 take a look at “info '(guix) Installation'” or send a message to
-<bug-guix@gnu.org>.
+<guix-devel@gnu.org>.

 * Running Guix before it is installed

@@ -75,68 +80,75 @@ addition to that, you must not miss [[http://www.emacswiki.org/emacs/ParEdit][Pa
 directly operate on the syntax tree, such as raising an s-expression or
 wrapping it, swallowing or rejecting the following s-expression, etc.

-* Adding new packages
-
-Package recipes in Guix look like this:
-
-#+BEGIN_SRC scheme
-  (package
-    (name "nettle")
-    (version "2.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "mirror://gnu/nettle/nettle-"
-                            version ".tar.gz"))
-        (sha256
-          (base32
-            "0wicr7amx01l03rm0pzgr1qvw3f9blaw17vjsy1301dh13ll58aa"))))
-    (build-system gnu-build-system)
-    (inputs `(("m4" ,m4)))
-    (propagated-inputs `(("gmp" ,gmp)))
-    (home-page
-      "http://www.lysator.liu.se/~nisse/nettle/")
-    (synopsis "GNU Nettle, a cryptographic library")
-    (description
-      "Nettle is a cryptographic library...")
-    (license gpl2+))
-#+END_SRC
-
-Such a recipe can be written by hand, and then tested by running
-‘./pre-inst-env guix build nettle’.
-
-When writing the recipe, the base32-encoded SHA256 hash of the source
-code tarball, which can be seen in the example above, can be obtained by
-running:
-
-  guix download http://ftp.gnu.org/gnu/nettle/nettle-2.5.tar.gz
-
-Alternatively, it is possible to semi-automatically import recipes from
-the [[http://nixos.org/nixpkgs/][Nixpkgs]] software distribution using this command:
-
-  guix import /path/to/nixpkgs/checkout nettle
-
-The command automatically fetches and converts to Guix the “Nix
-expression” of Nettle.
-
 * Submitting Patches

 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
-bug-guix@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]].

 As you become a regular contributor, you may find it convenient to have write
 access to the repository (see below.)

+* Coding Style
+
+In general our code follows the [[info:standards][GNU Coding Standards]] (GCS).  However, the GCS
+do not say much about Scheme, so here are some additional rules.
+
+** Programming Paradigm
+
+Scheme code in Guix is written in a purely functional style.  One exception is
+code that involves input/output, and procedures that implement low-level
+concepts, such as the ‘memoize’ procedure.
+
+** Modules
+
+Guile modules that are meant to be used on the builder side must live in the
+(guix build …) name space.  They must not refer to other Guix or GNU modules.
+However, it is OK for a “host-side” module to use a build-side module.
+
+Modules that deal with the broader GNU system should be in the (gnu …) name
+space rather than (guix …).
+
+** Data Types and Pattern Matching
+
+The tendency in classical Lisp is to use lists to represent everything, and
+then to browse them “by hand” using ‘car’, ‘cdr’, ‘cadr’, and co.  There are
+several problems with that style, notably the fact that it is hard to read,
+error-prone, and a hindrance to proper type error reports.
+
+Guix code should define appropriate data types (for instance, using
+‘define-record-type*’) rather than abuse lists.  In addition, it should use
+pattern matching, via Guile’s (ice-9 match) module, especially when matching
+lists.
+
+** Formatting Code
+
+When writing Scheme code, we follow common wisdom among Scheme programmers.
+In general, we follow the [[http://mumble.net/~campbell/scheme/style.txt][Riastradh's Lisp Style Rules]].  This document happens
+to describe the conventions mostly used in Guile’s code too.  It is very
+thoughtful and well written, so please do read it.
+
+Some special forms introduced in Guix, such as the ‘substitute*’ macro, have
+special indentation rules.  These are defined in the .dir-locals.el file,
+which Emacs automatically uses.  If you do not use Emacs, please make sure to
+let your editor know the rules.
+
+We require all top-level procedures to carry a docstring.  This requirement
+can be relaxed for simple private procedures in the (guix build …) name space,
+though.
+
+Procedures should not have more than four positional parameters.  Use keyword
+parameters for procedures that take more than four parameters.
+
 * Commit Access

 For frequent contributors, having write access to the repository is
 convenient.  When you deem it necessary, feel free to ask for it on the
 mailing list.  When you get commit access, please make sure to follow the
-policy below (discussions of the policy can take place on bug-guix@gnu.org.)
+policy below (discussions of the policy can take place on guix-devel@gnu.org.)

-Non-trivial patches should always be posted to bug-guix@gnu.org (trivial
+Non-trivial patches should always be posted to guix-devel@gnu.org (trivial
 patches include fixing typos, etc.)

 For patches that just add a new package, and a simple one, it’s OK to commit,
@@ -146,7 +158,7 @@ package upgrades.  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’.

-For anything else, please post to bug-guix@gnu.org and leave time for a
+For anything else, please post to guix-devel@gnu.org and leave time for a
 review, without committing anything.  If you didn’t receive any reply
 after two weeks, and if you’re confident, it’s OK to commit.

@@ -27,23 +27,16 @@ nodist_noinst_SCRIPTS =				\
 include gnu-system.am

 MODULES =					\
-  guix/scripts/build.scm			\
-  guix/scripts/download.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/refresh.scm			\
  guix/base32.scm				\
  guix/records.scm				\
  guix/hash.scm					\
  guix/utils.scm				\
+  guix/download.scm				\
+  guix/monads.scm				\
+  guix/profiles.scm				\
  guix/serialization.scm			\
  guix/nar.scm					\
  guix/derivations.scm				\
-  guix/download.scm				\
  guix/gnu-maintenance.scm			\
  guix/licenses.scm				\
  guix/build-system.scm				\
@@ -60,6 +53,8 @@ MODULES =					\
  guix/build/download.scm			\
  guix/build/cmake-build-system.scm		\
  guix/build/gnu-build-system.scm		\
+  guix/build/gnu-dist.scm			\
+  guix/build/linux-initrd.scm			\
  guix/build/perl-build-system.scm		\
  guix/build/python-build-system.scm		\
  guix/build/utils.scm				\
@@ -67,12 +62,22 @@ MODULES =					\
  guix/build/rpath.scm				\
  guix/packages.scm				\
  guix/snix.scm					\
+  guix/scripts/download.scm			\
+  guix/scripts/build.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/refresh.scm			\
  guix.scm					\
  $(GNU_SYSTEM_MODULES)

 # 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


 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go
@@ -92,6 +97,10 @@ srfi/srfi-37.scm: srfi/srfi-37.scm.in

 endif INSTALL_SRFI_37

+# Handy way to remove the .go files without removing all the rest.
+clean-go:
+	-$(RM) -f $(GOBJECTS)
+

 SCM_TESTS =					\
  tests/base32.scm				\
@@ -105,8 +114,10 @@ SCM_TESTS =					\
  tests/packages.scm				\
  tests/snix.scm				\
  tests/store.scm				\
+  tests/monads.scm				\
  tests/nar.scm					\
-  tests/union.scm
+  tests/union.scm				\
+  tests/profiles.scm

 SH_TESTS =					\
  tests/guix-build.sh				\
@@ -115,6 +126,13 @@ SH_TESTS =					\
  tests/guix-hash.sh				\
  tests/guix-package.sh

+if BUILD_DAEMON
+
+SH_TESTS += tests/guix-register.sh
+
+endif BUILD_DAEMON
+
+
 TESTS = $(SCM_TESTS) $(SH_TESTS)

 TEST_EXTENSIONS = .scm .sh
@@ -141,10 +159,11 @@ EXTRA_DIST =					\
  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-synopses.scm			\
+  build-aux/sync-descriptions.scm		\
  srfi/srfi-37.scm.in				\
  srfi/srfi-64.scm				\
  srfi/srfi-64.upstream.scm			\
@@ -185,32 +204,7 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA

 SUBDIRS = po

-info_TEXINFOS = doc/guix.texi
-EXTRA_DIST +=					\
-  doc/fdl-1.3.texi				\
-  doc/images/bootstrap-graph.dot		\
-  doc/images/bootstrap-graph.eps
-
-infoimagedir = $(infodir)/images
-dist_infoimage_DATA = doc/images/bootstrap-graph.png
-
-# Try hard to obtain an image size and aspect that's reasonable for inclusion
-# in an Info or PDF document.
-DOT_OPTIONS =						\
-  -Tpng -Gratio=.9 -Gnodesep=.005 -Granksep=.00005	\
-  -Nfontsize=9 -Nheight=.1 -Nwidth=.1
-
-.dot.png:
-	dot -Tpng $(DOT_OPTIONS) < "$<" > "$@.tmp"
-	mv "$@.tmp" "$@"
-
-.dot.eps:
-	dot -Teps $(DOT_OPTIONS) < "$<" > "$@.tmp"
-	mv "$@.tmp" "$@"
-
-doc/guix.pdf: doc/images/bootstrap-graph.png
-doc/guix.info: doc/images/bootstrap-graph.png
-doc/guix.ps: doc/images/bootstrap-graph.eps
+include doc.am

 if BUILD_DAEMON

@@ -224,12 +218,12 @@ AM_DISTCHECK_CONFIGURE_FLAGS =			\
  --with-nix-prefix="$(NIX_PREFIX)"		\
  --enable-daemon

-dist-hook: sync-synopses gen-ChangeLog assert-no-store-file-names
+dist-hook: sync-descriptions gen-ChangeLog assert-no-store-file-names
 distcheck-hook: assert-binaries-available

-sync-synopses:
+sync-descriptions:
 	-$(top_builddir)/pre-inst-env $(GUILE)		\
-	   $(top_srcdir)/build-aux/sync-synopses.scm
+	   $(top_srcdir)/build-aux/sync-descriptions.scm

 gen-ChangeLog:
 	if test -d .git; then				\
@@ -253,5 +247,5 @@ assert-binaries-available:
 	$(top_builddir)/pre-inst-env "$(GUILE)"				\
 	  "$(top_srcdir)/build-aux/check-available-binaries.scm"

-.PHONY: sync-synopses gen-ChangeLog
+.PHONY: sync-descriptions gen-ChangeLog clean-go
 .PHONY: assert-no-store-file-names assert-binaries-available
@@ -10,6 +10,215 @@ Copyright © 2013 Ludovic Courtès <ludo@gnu.org>

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

+* Changes in 0.5 (since 0.4)
+** Package management
+*** GNU package descriptions synchronized with the ‘gnumaint’ repository
+
+In addition to synopses, descriptions of GNU packages are now kept in sync
+with the ‘gnumaint’ repository, which is the canonical place for GNU package
+meta-data.
+
+** Programming interfaces
+*** Patches are now listed as part of ‘origin’
+
+The ‘origin’ form supports two new fields: ‘patches’ (list of patches), and
+‘snippet’ (code snippet to modify the source.)  These are applied when running
+‘guix build --source’.  See “Defining Packages” in the manual.
+
+*** New (guix monads) monadic interface to operate on the store
+
+See “The Store Monad” in the manual.  The (gnu system …) modules have been
+rewritten to use this monadic interface.
+
+*** New (guix profiles) module
+
+It provides an API for dealing with profiles, as with the ‘guix package’
+command.
+
+*** New (gnu system) module
+
+This module provides a generic way to describe the system’s configuration,
+and to instantiate it, regardless of the final medium (QEMU image, etc.)
+See “System Configuration” in the manual.
+
+This is work in progress.  Send feedback to guix-devel@gnu.org!
+
+*** ‘build-expression->derivation’ uses more parameters
+
+Some positional parameters have been changed to keyword parameters.
+See “Derivations” in the manual.
+
+** GNU distribution
+*** New port to the Loongson MIPS64 processors, n32 ABI (‘mips64el-linux’)
+
+Bootstrap binaries have been built for that architecture, and several
+Loongson-specific patches not yet available upstream have been applied to core
+packages.  See “GNU Distribution” and “Porting” in the manual.
+
+Pre-built binaries are not yet available via hydra.gnu.org, so Guix will
+build from source on this platform.
+
+*** 110 new packages
+
+acct, alive, alsa-utils, apl, at-spi2-atk, at-spi2-core, atkmm, autogen,
+automoc4, brasero, bridge-utils, cairomm, catkin, complexity, evince, ffmpeg,
+fftw, ftgl, gcc-objc, gcc-objc++, gccgo, gcl, gfortran, glibmm, glpk,
+gnome-icon-theme, gnu-pw-mgr, gp2c, gpgme, gsettings-desktop-schemas, gtkmm,
+gtksourceview, guile-ssh, guile-wm, gvpe, hicolor-icon-theme, httpd, icecat,
+icon-naming-utils, json-c, lapack, libcanberra, libcap, libgnome-keyring,
+libmikmod, libnl, libnotify, libsamplerate, libsigc++, libsndfile, libssh,
+libtheora, libxkbcommon, mercurial, mtools, netcat, pangomm, parallel,
+pavucontrol, pciutils, pem, perl-encode-locale, perl-file-list,
+perl-file-listing, perl-html-parser, perl-html-tagset, perl-http-cookies,
+perl-http-daemon, perl-http-date, perl-http-message, perl-http-negotiate,
+perl-io-html, perl-libwww, perl-libxml, perl-lwp-mediatypes, perl-net-http,
+perl-uri, perl-www-robotrules, perl-xml-dom, perl-xml-regexp, perl-xml-simple,
+phonon, powertop, pulseaudio, python2-dogtail, python2-empy, qemu-headless,
+qt, qt, raptor2, scons, sdl, sdl-gfx, sdl-image, sdl-mixer, sdl-net, sdl-ttf,
+sdl2, serveez, shared-mime-info, sharutils, skribilo, slim, soprano, swig,
+xcb-util, xcb-util-image, xcb-util-keysyms, xcb-util-renderutil, xcb-util-wm
+
+*** 47 package updates
+
+atk 2.10.0, bison 3.0.2, cmake 2.8.12, dmd 0.1, freeipmi 1.3.3, gcc 4.8.2,
+gcc 4.8.2, gcc-cross-mips64el-linux-gnuabi64 4.8.2, gcc-stripped-tarball 4.8.2,
+gdb 7.6.2, gettext 0.18.3.1, glib 2.38.0, global 6.2.9, gmp 5.1.3,
+gnupg 2.0.22, gobject-introspection 1.38.0, grep 2.15, gsl 1.16,
+gtk+ 2.24.21, gtk+ 3.10.1, guile 2.0.9, guile 2.0.9, guile-xcb 1.2,
+harfbuzz 0.9.22, hello 2.9, iproute2 3.12.0, libdrm 2.4.46,
+libextractor 1.2, libjpeg 9, libmicrohttpd 0.9.32, lightning 2.0.2,
+linux-libre 3.12, lzip 1.15, make 4.0, mit-krb5 1.11.3, pari-gp 2.5.5,
+pixman 0.32.4, python 3.3.2, qemu 1.6.1,
+qemu-with-multiple-smb-shares 1.6.1, rcs 5.9.2, recutils 1.6, rsync 3.1.0,
+tar 1.27.1, texinfo 5.2, units 2.02, xorriso 1.3.2
+
+*** Packages are now built with GCC 4.8.2 by default (was 4.7.3)
+
+** Native language support
+*** New ‘sr’ (Serbian) translation
+*** New ‘vi’ (Vietnamese) translation
+*** Updated ‘pt_BR’ (Brazilian Portuguese) translation
+** Bugs fixed
+*** ‘guix pull’ compiles Guix deterministically and correctly
+
+Previously, the build environment was not cleared in between ‘compile-file’
+calls, leading to build errors due to Guile bug http://bugs.gnu.org/15602 .
+
+*** ‘guix package’ allows removal of a specific package output
+    (http://bugs.gnu.org/15756)
+*** ‘guix-daemon’ always sets umask to 022
+    (http://lists.gnu.org/archive/html/bug-guix/2013-07/msg00033.html)
+*** Files referenced by environment variables are protected from GC
+*** Yet unbuilt packages get correctly installed (http://bugs.gnu.org/15283)
+*** ‘bootstrap-graph.{png,eps,pdf}’ built in srcdir (http://bugs.gnu.org/15640)
+
+* Changes in 0.4 (since 0.3)
+
+** Package management
+
+*** New ‘--list-generations’ and ‘--delete-generations’ options
+
+The ‘guix package’ command has these two new options, which make it easier to
+deal with a profile’s generation.  See “Invoking guix package” in the manual.
+
+*** New ‘guix-register’ program
+
+This program allows the meta-data of a new store to be initialized, by
+copying info from an existing store.  It is mostly an internal tool.
+
+** Programming interfaces
+
+*** New API to bootstrap Autotools-based packages
+
+The (guix build-system gnu) has a new ‘dist-package’ procedure that takes a
+package object and source directory, and returns a new package object that
+runs ‘./bootstrap && make dist’ or anything similar.
+
+*** ‘derivation’ and related procedures have a #:references-graphs parameter
+
+This parameter instructs the build daemon to populate the derivation’s build
+tree with files containing the list of references of the given store files.
+This is useful to write code that copies a packages and all its dependencies
+to another storage device, such as a QEMU disk image.
+
+*** Extended API to build a GNU system virtual machine image
+
+The (gnu system vm) module has been augmented in many ways: the ‘qemu-image’
+procedure can now populate and initialize the image’s store; the new
+‘system-qemu-image’ procedure returns a QEMU image that runs dmd as its init
+system, has ‘login’ running on several consoles, has a set of installed
+packages, and where Guix can be used.
+
+New (gnu system …) modules have been added to handle the configuration of the
+various parts of a GNU/Linux system.  For instance, (gnu system dmd) provides
+support for instantiating dmd services; (gnu system linux) helps with Linux
+PAM configuration; and so on.
+
+*** <derivation> objects supersede .drv file names in the API
+
+‘derivation’ and similar procedures no longer return two values (a
+<derivation> and a .drv file name); they now return a single value, which is
+a <derivation> object.  The <derivation> object embeds the corresponding .drv
+file name.  See “Derivations” in the manual for details.
+
+** GNU distribution
+
+*** 60 new packages
+
+apr, apr-util, cdparanoia, dbus-glib, dfc, dmd, dvdisaster, exiv2, fetchmail,
+freefont-ttf, freeglut, geeqie, git, gkrellm, glu, gnome-doc-utils,
+gst-plugins-base, gstreamer, guile-cairo, guile-lib, guile-xcb, guix, htop,
+itstool, lame, libextractor, libmicrohttpd, lightning, lzip, mingetty, mutt,
+net-base, net-tools, ocrad, pspp, python-babel, python-dateutil, python-pytz,
+python-setuptools, python-simplejson, python-wrapper, python2-babel,
+python2-dateutil, python2-mechanize, python2-pyicu, python2-pysqlite,
+python2-pytz, python2-setuptools, python2-simplejson, qemu-system-initrd,
+qemu-with-multiple-smb-shares, ripperx, shadow, ttf-bitstream-vera, units,
+valgrind, xmlto, xnee, yasm
+
+*** 27 package updates
+
+bigloo 4.0b, cairo 1.12.16, ddrescue 1.17, fontconfig 2.10.93, fplll 4.0.4,
+gcc 4.7.3, gcc 4.7.3, glibc 2.18, glibc 2.18, glibc-stripped-tarball 2.18,
+gnupg 2.0.21, gnutls 3.2.4, guile 2.0.9, guile 2.0.9, harfbuzz 0.9.21,
+imagemagick 6.8.6-9, libdrm 2.4.46, libgcrypt 1.5.3, libjpeg 9, libksba 1.3.0,
+linux-libre 3.11, m4 1.4.17, mpfrcx 0.4.2, pari-gp 2.5.4, python 2.7.5, python
+3.3.2, texlive 2013
+
+*** Fontconfig font search path made more convenient
+
+Fontconfig, the library used by many graphical applications, such as those
+based on GTK+, now knows where to find the default set of fonts.  Additional
+fonts installed in the user profile are automatically picked up.
+
+*** More GUI applications
+
+The ‘emacs’ and ‘racket’ packages are now linked against GTK+.  New GTK+
+applications have been added (see above.)
+
+*** Packaging guidelines
+
+The documentation of packaging guidelines has been augmented.  See the manual
+under “GNU Distribution”.
+
+*** Support for Python 3 along with Python 2
+
+Python 3 has been added to the distribution, and Python packages that support
+it are now built for both Python 2 and Python 3.  See the “Python Modules”
+section of the manual for details.
+
+** Internationalization
+
+Updated translations: eo.
+
+** Bugs fixed
+
+*** Workarounds for Guile 2.0.5 now work on Debian derivatives
+*** The dependency graph image has correct size in PDF output
+*** 'ldd' now works correctly on x86_64
+*** Xorg server test suite no longer fails (http://bugs.gnu.org/15392)
+*** module-init-tools now builds (http://bugs.gnu.org/15182, http://bugs.gnu.org/15187)
+*** Hop 2.4 builds with newer Bigloo (http://bugs.gnu.org/15194)

 * Changes in 0.3 (since 0.2)

@@ -33,23 +33,16 @@ When `--disable-daemon' was passed, you instead need the following:

  - [[http://nixos.org/nix/][Nix]]

-Optionally, packages from Nixpkgs may be transparently reused from Guix.
-For this to work, you need to have a checkout of the Nixpkgs repository;
-the `--with-nixpkgs' option allows you to let `configure' know where the
-Nixpkgs checkout is.
+* Installation

-  - [[http://nixos.org/nixpkgs/][Nixpkgs]]
+See the manual for the installation instructions, either by running

-When building Guix from a checkout, the following packages are also
-required:
+  info -f doc/guix.info "(guix) Installation"

-  - [[http://www.gnu.org/software/autoconf/][GNU Autoconf]]
-  - [[http://www.gnu.org/software/automake/][GNU Automake]]
-  - [[http://www.gnu.org/software/gettext/][GNU Gettext]]
+or by checking the [[http://www.gnu.org/software/guix/manual/guix.html#Installation][web copy of the manual]].

-Run the "bootstrap" script to download the Nix daemon and to generate the
-build system infrastructure using autoconf. It reports an error if an
-inappropriate version of the above packages is being used.
+For information on installation from a Git checkout, please see the ‘HACKING’
+file.

 * Installing Guix from Guix

@@ -57,26 +50,16 @@ You can re-build and re-install Guix using a system that already runs Guix.
 To do so:

  - Install the dependencies (see 'Requirements' above) and build tools using
-    Guix.  You should have the following packages installed in your user
-    profile:
+    Guix:

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

  - set the environment variables that Guix recommends you to set during the
    package installation process:
-      ACLOCAL, CPATH, LIBRARY_PATH, PATH, PKG_CONFIG_PATH
-    In addition, set 
-      GUIX_LD_WRAPPER_ALLOW_IMPURITIES=yes
+      ACLOCAL_PATH, CPATH, LIBRARY_PATH, PKG_CONFIG_PATH
+
+  - set the PATH environment variable to refer to the profile:
+      PATH=$HOME/.guix-profile/bin:$PATH

  - re-run the configure script passing it the option
    `--with-libgcrypt-prefix=$HOME/.guix-profile/'
@@ -11,8 +11,13 @@ infrastructure help:
      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>
-        Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
+      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>
@@ -28,11 +28,13 @@ 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
+** 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.  Guix users would sign their binaries, and define which binaries
-they trust.
+Would be neat if binaries could be pushed to and pulled from the GNUnet DHT or
+rather libswift (since DHTs aren’t suited for large payloads).  Guix users
+would sign their binaries, and define which binaries they trust.
+
+Use UPnP and similar to traverse NAT, like ‘filegive’ does.

 ** Add a remote build hook

@@ -71,8 +73,6 @@ This should specify builder code to be run when building a user
 environment with ‘guix-package’.  For instance, Texinfo’s hook would
 create a new ‘dir’.

-** add ‘patches’ there
-
 ** extend ‘propagated-build-inputs’ with support for multiple outputs

 #+BEGIN_SRC scheme
@@ -101,19 +101,6 @@ 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.

-* gnu-build-system: produce a ‘debug’ derivation
-
-Set a .gnu_debuglink in the main derivations to point to the sibling
-file name (only the basename, to not retain a dependency on the ‘debug’
-derivation.)
-
-For /nix/store/xyz-foobar/bin/foo, we should have
-/nix/store/abc-foobar-debug/lib/nix/store/xyz-foobar/bin/foo.debug (info
-"(gdb) Separate Debug Files").
-
-Users should have a default GDB setting with ~/.guix-profile/lib/debug
-as their ‘debug-file-directory’.
-
 * build-expression->derivation: define `%system' in the builder

 Would allow build expressions to have system-dependent code, like
@@ -129,6 +116,16 @@ Support sophisticated collision handling when building a union: check
 whether the colliding files are identical, honor per-package priorities,
 etc.

+* add GUIX_ALLOW_EXPENSIVE_TESTS
+
+Tests that need to download stuff or otherwise take a long time would only be
+run when that is defined.
+
+* add "guix challenge"
+
+Would download a substitute, and compare its contents against a (hopefully
+locally-built) copy.
+
 * guix package

 ** add ‘--list-generations’, and ‘--delete-generations’
@@ -49,7 +49,7 @@
            #f))))

  (let ((result (every (compose (warn (cut has-substitutes? store <>))
-                                derivation-path->output-path)
+                                derivation->output-path)
                       total)))
    (when result
      (format (current-error-port) "~a packages found substitutable~%"
@@ -45,7 +45,7 @@
  (match (string-tokenize file (char-set-complement (char-set #\/)))
    ((_ ... system basename)
     (string->uri (string-append %url-base "/" system
-                                 "/20130105/" basename)))))
+                                 "/20131110/" basename)))))

 (match (command-line)
  ((_ file expected-hash)
@@ -38,12 +38,14 @@

 (use-modules (guix store)
             (guix packages)
+             (guix derivations)
             ((guix utils) #:select (%current-system))
             (gnu packages)
             (gnu packages base)
             (gnu packages gawk)
             (gnu packages guile)
             (gnu packages gettext)
+             (gnu packages compression)
             (gnu packages multiprecision)
             (gnu packages make-bootstrap)
             (srfi srfi-1)
@@ -58,7 +60,8 @@
 (define* (package->alist store package system
                         #:optional (package-derivation package-derivation))
  "Convert PACKAGE to an alist suitable for Hydra."
-  `((derivation . ,(package-derivation store package system))
+  `((derivation . ,(derivation-file-name
+                    (package-derivation store package system)))
    (description . ,(package-synopsis package))
    (long-description . ,(package-description package))
    (license . ,(package-license package))
@@ -79,9 +82,9 @@ SYSTEM."
    ,(cute package->alist store package system
           (cut package-cross-derivation <> <> target <>))))

-(define %packages-to-cross-build
+(define %core-packages
  (list gmp mpfr mpc coreutils findutils diffutils patch sed grep
-        gawk gettext hello guile-2.0
+        gawk gnu-gettext hello guile-2.0 zlib gzip xz
        %bootstrap-binaries-tarball
        %binutils-bootstrap-tarball
        %glibc-bootstrap-tarball
@@ -89,6 +92,9 @@ SYSTEM."
        %guile-bootstrap-tarball
        %bootstrap-tarballs))

+(define %packages-to-cross-build
+  %core-packages)
+
 (define %cross-targets
  '("mips64el-linux-gnu"
    "mips64el-linux-gnuabi64"))
@@ -106,6 +112,11 @@ SYSTEM."
      (_
       (list (%current-system)))))

+  (define subset
+    (match (assoc-ref arguments 'subset)
+      ("core" 'core)                              ; only build core packages
+      (_ 'all)))                                  ; build everything
+
  (define job-name
    (compose string->symbol package-full-name))

@@ -127,11 +138,23 @@ SYSTEM."
                                         inputs))))
                                    %final-inputs))))
    (append-map (lambda (system)
-                  (fold-packages (lambda (package result)
-                                   (if (member package base-packages)
-                                       result
-                                       (cons (package-job store (job-name package)
-                                                          package system)
-                                             result)))
-                                 (cross-jobs system)))
+                  (case subset
+                    ((all)
+                     ;; Build everything.
+                     (fold-packages (lambda (package result)
+                                      (if (member package base-packages)
+                                          result
+                                          (cons (package-job store (job-name package)
+                                                             package system)
+                                                result)))
+                                    (cross-jobs system)))
+                    ((core)
+                     ;; Build core packages only.
+                     (append (map (lambda (package)
+                                    (package-job store (job-name package)
+                                                 package system))
+                                  %core-packages)
+                             (cross-jobs system)))
+                    (else
+                     (error "unknown subset" subset))))
                systems)))
@@ -0,0 +1,113 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 build jobs of Guix itself for the Hydra continuation
+;;; integration tool.
+;;;
+
+;; Attempt to use our very own Guix modules.
+(eval-when (compile load eval)
+
+  ;; Ignore any available .go, and force recompilation.  This is because our
+  ;; checkout in the store has mtime set to the epoch, and thus .go files look
+  ;; newer, even though they may not correspond.
+  (set! %fresh-auto-compile #t)
+
+  (and=> (assoc-ref (current-source-location) 'filename)
+         (lambda (file)
+           (let ((dir (string-append (dirname file) "/../..")))
+             (format (current-error-port) "prepending ~s to the load path~%"
+                     dir)
+             (set! %load-path (cons dir %load-path))))))
+
+
+(use-modules (guix store)
+             (guix packages)
+             (guix utils)
+             (guix derivations)
+             (guix build-system gnu)
+             (gnu packages version-control)
+             (gnu packages package-management)
+             (gnu packages graphviz)
+             (srfi srfi-1)
+             (srfi srfi-26)
+             (ice-9 match))
+
+;; XXX: Debugging hack: since `hydra-eval-guile-jobs' redirects the output
+;; port to the bit bucket, let us write to the error port instead.
+(setvbuf (current-error-port) _IOLBF)
+(set-current-output-port (current-error-port))
+
+(define* (package->alist store package system
+                         #:optional (package-derivation package-derivation))
+  "Convert PACKAGE to an alist suitable for Hydra."
+  `((derivation . ,(derivation-file-name
+                    (package-derivation store package system)))
+    (description . ,(package-synopsis package))
+    (long-description . ,(package-description package))
+    (license . ,(package-license package))
+    (home-page . ,(package-home-page package))
+    (maintainers . ("bug-guix@gnu.org"))))
+
+(define (tarball-package checkout nix-checkout)
+  "Return a package that does `make distcheck' from CHECKOUT, a directory
+containing a Git checkout of Guix."
+  (let ((dist (dist-package guix checkout)))
+    (package (inherit dist)
+      (location (source-properties->location (current-source-location)))
+      (arguments (substitute-keyword-arguments (package-arguments dist)
+                   ((#:phases p)
+                    `(alist-cons-before
+                      'autoreconf 'set-nix-submodule
+                      (lambda _
+                        ;; Tell Git to use the Nix checkout that Hydra gave us.
+                        (zero?
+                         (system* "git" "config" "submodule.nix-upstream.url"
+                                  ,nix-checkout)))
+                      ,p))))
+      (native-inputs `(("git" ,git)
+                       ("graphviz" ,graphviz)
+                       ,@(package-native-inputs dist))))))
+
+(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)))))
+
+  (define guix-checkout
+    (assq-ref arguments 'guix))
+
+  (define nix-checkout
+    (assq-ref arguments 'nix))
+
+  (format (current-error-port) "using checkout ~s (Nix: ~s)~%"
+          guix-checkout nix-checkout)
+  (let ((guix (assq-ref guix-checkout 'file-name))
+        (nix  (assq-ref nix-checkout 'file-name)))
+    `((tarball . ,(cute package->alist store
+                        (tarball-package guix nix)
+                        (%current-system))))))
@@ -5,6 +5,7 @@ exec guile -l "$0"                              \
 !#
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,6 +29,7 @@ exec guile -l "$0"                              \
  #:use-module (guix gnu-maintenance)
  #:use-module (gnu packages)
  #:use-module (sxml simple)
+  #:use-module (sxml fold)
  #:use-module (web uri)
  #:use-module (ice-9 match)
  #:use-module (srfi srfi-1)
@@ -47,14 +49,36 @@ exec guile -l "$0"                              \
              (equal? (gnu-package-name package) name))
            gnu))))

-(define (package->sxml package)
-  "Return HTML-as-SXML representing PACKAGE."
+(define (list-join lst item)
+  "Join the items in LST by inserting ITEM between each pair of elements."
+  (let loop ((lst    lst)
+             (result '()))
+    (match lst
+      (()
+       (match (reverse result)
+         (()
+          '())
+         ((_ rest ...)
+          rest)))
+      ((head tail ...)
+       (loop tail
+             (cons* head item result))))))
+
+(define (package->sxml package previous description-ids remaining)
+  "Return 3 values: the HTML-as-SXML for PACKAGE added to all previously
+collected package output in PREVIOUS, a list of DESCRIPTION-IDS and the number
+of packages still to be processed in REMAINING.  Also Introduces a call to the
+JavaScript prep_pkg_descs function as part of the output of PACKAGE, every
+time the length of DESCRIPTION-IDS, increasing, is 15 or when REMAINING,
+decreasing, is 1."
+  (define (location-url loc)
+    (string-append "http://git.savannah.gnu.org/cgit/guix.git/tree/"
+                   (location-file loc) "#n"
+                   (number->string (location-line loc))))
+
  (define (source-url package)
    (let ((loc (package-location package)))
-      (and loc
-           (string-append "http://git.savannah.gnu.org/cgit/guix.git/tree/"
-                          (location-file loc) "#n"
-                          (number->string (location-line loc))))))
+      (and loc (location-url loc))))

  (define (license package)
    (define ->sxml
@@ -65,7 +89,8 @@ exec guile -l "$0"                              \
        (let ((uri (license-uri license)))
          (case (and=> (and uri (string->uri uri)) uri-scheme)
            ((http https)
-             `(div (a (@ (href ,uri))
+             `(div (a (@ (href ,uri)
+                         (title "Link to the full license"))
                      ,(license-name license))))
            (else
             `(div ,(license-name license) " ("
@@ -74,11 +99,51 @@ exec guile -l "$0"                              \

    (->sxml (package-license package)))

+  (define (patches package)
+    (define (patch-url patch)
+      (string-append
+       "http://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/patches/"
+       (basename patch)))
+
+    (define (snippet-link snippet)
+      (let ((loc (or (package-field-location package 'source)
+                     (package-location package))))
+        `(a (@ (href ,(location-url loc))
+               (title "Link to patch snippet"))
+            "snippet")))
+
+    (and (origin? (package-source package))
+         (let ((patches (origin-patches (package-source package)))
+               (snippet (origin-snippet (package-source package))))
+           (and (or (pair? patches) snippet)
+                `(div "patches: "
+                      ,(let loop ((patches patches)
+                                  (number  1)
+                                  (links   '()))
+                         (match patches
+                           (()
+                            (let* ((additional (and snippet
+                                                    (snippet-link snippet)))
+                                   (links      (if additional
+                                                   (cons additional links)
+                                                   links)))
+                              (list-join (reverse links) ", ")))
+                           ((patch rest ...)
+                            (loop rest
+                                  (+ 1 number)
+                                  (cons `(a (@ (href ,(patch-url patch))
+                                               (title ,(string-append
+                                                        "Link to "
+                                                        (basename patch))))
+                                            ,(number->string number))
+                                        links))))))))))
+
  (define (status package)
    (define (url system)
      `(a (@ (href ,(string-append "http://hydra.gnu.org/job/gnu/master/"
                                   (package-full-name package) "."
-                                   system)))
+                                   system))
+             (title "View the status of this architecture's build at Hydra"))
          ,system))

    `(div "status: "
@@ -89,53 +154,224 @@ exec guile -l "$0"                              \
    (and=> (lookup-gnu-package name)
           gnu-package-logo))

+  (define (insert-tr description-id js?)
+    (define (insert-js-call description-ids)
+      "Return an sxml call to prep_pkg_descs, with up to 15 elements of
+description-ids as formal parameters."
+      `(script (@ (type "text/javascript"))
+               ,(format #f "prep_pkg_descs(~a)"
+                        (string-append "'"
+                                       (string-join description-ids "', '")
+                                       "'"))))
+
+    (let ((description-ids (cons description-id description-ids)))
+      `(tr (td ,(if (gnu-package? package)
+                    `(img (@ (src "/graphics/gnu-head-mini.png")
+                             (alt "Part of GNU")
+                             (title "Part of GNU")))
+                    ""))
+           (td (a (@ (href ,(source-url package))
+                     (title "Link to the Guix package source code"))
+                  ,(package-name package) " "
+                  ,(package-version package)))
+           (td (span ,(package-synopsis package))
+               (div (@ (id ,description-id))
+                    ,(match (package-logo (package-name package))
+                       ((? string? url)
+                        `(img (@ (src ,url)
+                                 (height "35")
+                                 (class "package-logo")
+                                 (alt ("Logo of " ,(package-name package))))))
+                       (_ #f))
+                    (p ,(package-description package))
+                    ,(license package)
+                    (a (@ (href ,(package-home-page package))
+                          (title "Link to the package's website"))
+                       ,(package-home-page package))
+                    ,(status package)
+                    ,(patches package)
+                    ,(if js?
+                         (insert-js-call description-ids)
+                         ""))))))
+
  (let ((description-id (symbol->string
                         (gensym (package-name package)))))
-   `(tr (td ,(if (gnu-package? package)
-                 `(img (@ (src "/graphics/gnu-head-mini.png")))
-                 ""))
-        (td (a (@ (href ,(source-url package)))
-               ,(package-name package) " "
-               ,(package-version package)))
-        (td (@ (colspan "2") (height "0"))
-            (a (@ (href "javascript:void(0)")
-                  (title "show/hide package description")
-                  (onClick ,(format #f "javascript:show_hide('~a')"
-                                    description-id)))
-               ,(package-synopsis package))
-            (div (@ (id ,description-id)
-                    (style "position: relative; display: none;"))
-                 ,(match (package-logo (package-name package))
-                    ((? string? url)
-                     `(img (@ (src ,url)
-                              (height "35em")
-                              (style "float: left; padding-right: 1em;"))))
-                    (_ #f))
-                 (p ,(package-description package))
-                 ,(license package)
-                 (a (@ (href ,(package-home-page package)))
-                    ,(package-home-page package))
-                 ,(status package))))))
+    (cond ((= remaining 1)              ; Last package in packages
+           (values
+            (reverse                              ; Fold has reversed packages
+             (cons (insert-tr description-id 'js) ; Prefix final sxml
+                   previous))
+            '()                            ; No more work to do
+            0))                            ; End of the line
+          ((= (length description-ids) 15) ; Time for a JS call
+           (values
+            (cons (insert-tr description-id 'js)
+                  previous)    ; Prefix new sxml
+            '()                ; Reset description-ids
+            (1- remaining)))   ; Reduce remaining
+          (else                ; Insert another row, and build description-ids
+           (values
+            (cons (insert-tr description-id #f)
+                  previous)                       ; Prefix new sxml
+            (cons description-id description-ids) ; Update description-ids
+            (1- remaining))))))                   ; Reduce remaining

 (define (packages->sxml packages)
  "Return an HTML page as SXML describing PACKAGES."
  `(div
    (h2 "GNU Guix Package List")
-    (div (@ (style "margin-bottom: 5em;"))
+    (div (@ (id "intro"))
         (div
          (img (@ (src "graphics/guix-logo.small.png")
                  (alt "GNU Guix and the GNU System")
-                  (height "83em"))))
-         "This web page lists the packages currently provided by the "
-         (a (@ (href "manual/guix.html#GNU-Distribution"))
-            "GNU system distribution")
-         " of "
-         (a (@ (href "/software/guix/guix.html")) "GNU Guix") ".  "
-         "Our " (a (@ (href "http://hydra.gnu.org/jobset/gnu/master"))
-                   "continuous integration system")
-         " shows their current build status.")
-    (table (@ (style "border: none;"))
-           ,@(map package->sxml packages))))
+                  (height "83"))))
+         (p "This web page lists the packages currently provided by the "
+            (a (@ (href "manual/guix.html#GNU-Distribution"))
+               "GNU system distribution")
+            " of "
+            (a (@ (href "/software/guix/guix.html")) "GNU Guix") ".  "
+            "Our " (a (@ (href "http://hydra.gnu.org/jobset/gnu/master"))
+                      "continuous integration system")
+            " shows their current build status."))
+    (table (@ (id "packages"))
+           (tr (th "GNU?")
+               (th "Package version")
+               (th "Package details"))
+           ,@(fold-values package->sxml packages '() '() (length packages)))
+    (a (@ (href "#intro")
+          (title "Back to top.")
+          (id "top"))
+       "^")))
+
+
+(define (insert-css)
+  "Return the CSS for the list-packages page."
+  (format #t
+"<style>
+/* license: CC0 */
+a {
+    transition: all 0.3s;
+}
+div#intro {
+    margin-bottom: 2em;
+}
+div#intro div, div#intro p {
+    padding:0.5em;
+}
+div#intro div {
+    float:left;
+}
+div#intro img {
+    float:left;
+    padding:0.75em;
+}
+table#packages, table#packages tr, table#packages tbody, table#packages td, table#packages th {
+    border: 0px solid black;
+    clear: both;
+}
+table#packages tr:nth-child(even) {
+    background-color: #FFF;
+}
+table#packages tr:nth-child(odd) {
+    background-color: #EEE;
+}
+table#packages tr:hover, table#packages tr:focus, table#packages tr:active {
+    background-color: #DDD;
+}
+table#packages tr:first-child, table#packages tr:first-child:hover, table#packages tr:first-child:focus, table#packages tr:first-child:active {
+    background-color: #333;
+    color: #fff;
+}
+table#packages td {
+    margin:0px;
+    padding:0.2em 0.5em;
+}
+table#packages td:first-child {
+    width:10%;
+    text-align:center;
+}
+table#packages td:nth-child(2) {
+    width:30%;
+}
+table#packages td:last-child {
+    width:60%;
+}
+img.package-logo {
+    float: left;
+    padding: 0.75em;
+}
+table#packages span {
+    font-weight: 700;
+}
+table#packages span a {
+    float: right;
+    font-weight: 500;
+}
+a#top {
+    position:fixed;
+    right:10px;
+    bottom:10px;
+    font-size:150%;
+    background-color:#EEE;
+    padding:10px 7.5px 0 7.5px;
+    text-decoration:none;
+    color:#000;
+    border-radius:5px;
+}
+a#top:hover, a#top:focus {
+    background-color:#333;
+    color:#fff;
+}
+</style>"))
+
+(define (insert-js)
+  "Return the JavaScript for the list-packages page."
+  (format #t
+"<script type=\"text/javascript\">
+// license: CC0
+function show_hide(idThing)
+{
+  if(document.getElementById && document.createTextNode) {
+    var thing = document.getElementById(idThing);
+    /* Used to change the link text, depending on whether description is
+       collapsed or expanded */
+    var thingLink = thing.previousSibling.lastChild.firstChild;
+    if (thing) {
+      if (thing.style.display == \"none\") {
+        thing.style.display = \"\";
+        thingLink.data = 'Collapse';
+      } else {
+        thing.style.display = \"none\";
+        thingLink.data = 'Expand';
+      }
+    }
+  }
+}
+/* Add controllers used for collapse/expansion of package descriptions */
+function prep(idThing)
+{
+  var tdThing = document.getElementById(idThing).parentNode;
+  if (tdThing) {
+    var aThing = tdThing.firstChild.appendChild(document.createElement('a'));
+    aThing.setAttribute('href', 'javascript:void(0)');
+    aThing.setAttribute('title', 'show/hide package description');
+    aThing.appendChild(document.createTextNode('Expand'));
+    aThing.onclick=function(){show_hide(idThing);};
+    /* aThing.onkeypress=function(){show_hide(idThing);}; */
+  }
+}
+/* Take n element IDs, prepare them for javascript enhanced
+   display and hide the IDs by default. */
+function prep_pkg_descs()
+{
+  if(document.getElementById && document.createTextNode) {
+    for(var i=0; i<arguments.length; i++) {
+      prep(arguments[i])
+      show_hide(arguments[i]);
+    }
+  }
+}
+</script>"))


 (define (list-packages . args)
@@ -153,26 +389,15 @@ with gnu.org server-side include and all that."
                          (string<? (package-name p1) (package-name p2))))))
   (format #t "<!--#include virtual=\"/server/html5-header.html\" -->
 <!-- Parent-Version: 1.70 $ -->
-
 <title>GNU Guix - GNU Distribution - GNU Project</title>
-<!--#include virtual=\"/server/banner.html\" -->
+")
+   (insert-css)
+   (insert-js)
+   (format #t "<!--#include virtual=\"/server/banner.html\" -->")

-<script language=\"javascript\" type=\"text/javascript\">
-// license: CC0
-function show_hide(idThing)
-{
-  var thing = document.getElementById(idThing);
-  if (thing) {
-    if (thing.style.display == \"none\") {
-      thing.style.display = \"\";
-    } else {
-      thing.style.display = \"none\";
-    }
-  }
-}
-</script>")
-   (display (sxml->xml (packages->sxml packages)))
-   (format #t "<!--#include virtual=\"/server/footer.html\" -->
+   (sxml->xml (packages->sxml packages))
+   (format #t "</div>
+<!--#include virtual=\"/server/footer.html\" -->
 <div id=\"footer\">

 <p>Please send general FSF &amp; GNU inquiries to
@@ -17,7 +17,8 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 ;;;
-;;; Report synopses that defer from those found in the GNU Womb.
+;;; Report package synopses and descriptions that defer from those found in
+;;; the GNU Womb.
 ;;;

 (use-modules (guix gnu-maintenance)
@@ -58,5 +59,17 @@
                (format (guix-warning-port)
                        "~a: ~a: proposed synopsis: ~s~%"
                        (location->string loc) (package-name package)
-                        upstream)))))
+                        upstream)))
+
+            (let ((upstream   (gnu-package-doc-description descriptor))
+                  (downstream (package-description package))
+                  (loc        (or (package-field-location package 'description)
+                                  (package-location package))))
+              (when (and upstream
+                         (not (string=? (fill-paragraph upstream 100)
+                                        (fill-paragraph downstream 100))))
+                (format (guix-warning-port)
+                        "~a: ~a: proposed description:~%      ~a~%"
+                        (location->string loc) (package-name package)
+                        (fill-paragraph upstream 77 7))))))
          gnus)
@@ -2,12 +2,12 @@
 # Process this file with autoconf to produce a configure script.

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

 AM_INIT_AUTOMAKE([1.12 gnu silent-rules subdir-objects \
- color-tests parallel-tests])
+ color-tests parallel-tests -Woverride])

 AC_CONFIG_SRCDIR([guix.scm])
 AC_CONFIG_MACRO_DIR([m4])
@@ -41,6 +41,10 @@ AC_ARG_ENABLE([daemon],
 guix_localstatedir="`eval echo $localstatedir | sed -e "s|NONE|/usr/local|g"`"
 AC_SUBST([guix_localstatedir])

+dnl We require the pkg.m4 set of macros from pkg-config.
+dnl Make sure it's available.
+m4_pattern_forbid([PKG_CHECK_MODULES])
+
 PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.5])
 AC_PATH_PROG([GUILE], [guile])
 AC_PATH_PROG([GUILD], [guild])
@@ -121,6 +125,10 @@ AC_CACHE_SAVE

 m4_include([config-daemon.ac])

+dnl `dot' (from the Graphviz package) is only needed for maintainers.
+dnl See `HACKING' for more info.
+AM_MISSING_PROG([DOT], [dot])
+
 AC_CONFIG_FILES([Makefile
                 po/Makefile.in
 		 guix/config.scm])
@@ -25,6 +25,8 @@ CLEANFILES += $(BUILT_SOURCES)

 noinst_LIBRARIES = libformat.a libutil.a libstore.a

+AM_CXXFLAGS = -Wall
+
 libformat_a_SOURCES =				\
  nix/boost/format/free_funcs.cc		\
  nix/boost/format/parsing.cc			\
@@ -119,6 +121,7 @@ libstore_a_CXXFLAGS =				\
  $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)

 bin_PROGRAMS = guix-daemon
+sbin_PROGRAMS = guix-register

 guix_daemon_SOURCES =				\
  nix/nix-daemon/nix-daemon.cc			\
@@ -135,6 +138,21 @@ guix_daemon_LDADD =				\
 guix_daemon_headers =				\
  nix/nix-daemon/shared.hh

+
+guix_register_SOURCES =				\
+  nix/guix-register/guix-register.cc
+
+guix_register_CPPFLAGS =			\
+  $(libutil_a_CPPFLAGS)				\
+  $(libstore_a_CPPFLAGS)			\
+  -I$(top_srcdir)/nix/libstore
+
+# XXX: Should we start using shared libs?
+guix_register_LDADD =				\
+  libstore.a libutil.a libformat.a -lbz2	\
+  $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS)
+
+
 libexec_PROGRAMS = nix-setuid-helper
 nix_setuid_helper_SOURCES =			\
  nix/nix-setuid-helper/nix-setuid-helper.cc
@@ -0,0 +1,53 @@
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2013 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/>.
+
+info_TEXINFOS = doc/guix.texi
+EXTRA_DIST +=					\
+  doc/fdl-1.3.texi				\
+  doc/images/bootstrap-graph.dot		\
+  doc/images/bootstrap-graph.eps		\
+  doc/images/bootstrap-graph.pdf
+
+infoimagedir = $(infodir)/images
+dist_infoimage_DATA = doc/images/bootstrap-graph.png
+
+# Try hard to obtain an image size and aspect that's reasonable for inclusion
+# in an Info or PDF document.
+DOT_OPTIONS =					\
+  -Gratio=.9 -Gnodesep=.005 -Granksep=.00005	\
+  -Nfontsize=9 -Nheight=.1 -Nwidth=.1
+
+.dot.png:
+	$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$@.tmp"
+	mv "$@.tmp" "$@"
+
+.dot.pdf:
+	$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$@.tmp"
+	mv "$@.tmp" "$@"
+
+.dot.eps:
+	$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$@.tmp"
+	mv "$@.tmp" "$@"
+
+# We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake)
+# Extending").  Using the `-local' rules is imperfect, because they may be
+# triggered after the main rule.  Oh, well.
+pdf-local: $(top_srcdir)/doc/images/bootstrap-graph.pdf
+info-local: $(top_srcdir)/doc/images/bootstrap-graph.png
+ps-local: $(top_srcdir)/doc/images/bootstrap-graph.eps
@@ -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 © 2013 Mark H Weaver <mhw@netris.org>
 #
 # This file is part of GNU Guix.
 #
@@ -22,10 +23,14 @@

 GNU_SYSTEM_MODULES =				\
  gnu/packages.scm				\
+  gnu/packages/acct.scm				\
  gnu/packages/acl.scm				\
  gnu/packages/algebra.scm			\
+  gnu/packages/apl.scm				\
+  gnu/packages/apr.scm				\
  gnu/packages/aspell.scm			\
  gnu/packages/attr.scm				\
+  gnu/packages/autogen.scm			\
  gnu/packages/autotools.scm			\
  gnu/packages/avahi.scm			\
  gnu/packages/base.scm				\
@@ -39,6 +44,7 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/check.scm			\
  gnu/packages/cmake.scm			\
  gnu/packages/compression.scm			\
+  gnu/packages/complexity.scm			\
  gnu/packages/cpio.scm				\
  gnu/packages/cppi.scm				\
  gnu/packages/cross-base.scm			\
@@ -53,6 +59,7 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/fdisk.scm			\
  gnu/packages/file.scm				\
  gnu/packages/flex.scm				\
+  gnu/packages/fonts.scm			\
  gnu/packages/fontutils.scm			\
  gnu/packages/freeipmi.scm			\
  gnu/packages/gawk.scm				\
@@ -61,12 +68,19 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/gd.scm				\
  gnu/packages/gdb.scm				\
  gnu/packages/gdbm.scm				\
+  gnu/packages/geeqie.scm			\
  gnu/packages/gettext.scm			\
  gnu/packages/ghostscript.scm			\
+  gnu/packages/gkrellm.scm			\
+  gnu/packages/gl.scm				\
  gnu/packages/glib.scm				\
  gnu/packages/global.scm			\
+  gnu/packages/gnome.scm			\
+  gnu/packages/gnunet.scm			\
  gnu/packages/gnupg.scm			\
  gnu/packages/gnutls.scm			\
+  gnu/packages/gnuzilla.scm			\
+  gnu/packages/gnu-pw-mgr.scm			\
  gnu/packages/gperf.scm			\
  gnu/packages/gprolog.scm			\
  gnu/packages/graphviz.scm			\
@@ -74,8 +88,10 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/grub.scm				\
  gnu/packages/grue-hunter.scm			\
  gnu/packages/gsasl.scm			\
+  gnu/packages/gstreamer.scm			\
  gnu/packages/gtk.scm				\
  gnu/packages/guile.scm			\
+  gnu/packages/guile-wm.scm			\
  gnu/packages/gv.scm				\
  gnu/packages/help2man.scm			\
  gnu/packages/hugs.scm				\
@@ -84,10 +100,11 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/imagemagick.scm			\
  gnu/packages/indent.scm			\
  gnu/packages/irssi.scm			\
+  gnu/packages/kde.scm				\
  gnu/packages/ld-wrapper.scm			\
  gnu/packages/less.scm				\
  gnu/packages/lesstif.scm			\
-  gnu/packages/libapr.scm			\
+  gnu/packages/libcanberra.scm			\
  gnu/packages/libdaemon.scm			\
  gnu/packages/libevent.scm			\
  gnu/packages/libffi.scm			\
@@ -100,6 +117,7 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/libunistring.scm			\
  gnu/packages/libusb.scm			\
  gnu/packages/libunwind.scm			\
+  gnu/packages/lightning.scm			\
  gnu/packages/linux.scm			\
  gnu/packages/linux-initrd.scm			\
  gnu/packages/lout.scm				\
@@ -108,11 +126,13 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/lua.scm				\
  gnu/packages/lvm.scm				\
  gnu/packages/m4.scm				\
-  gnu/packages/mailutils.scm			\
+  gnu/packages/mail.scm				\
  gnu/packages/make-bootstrap.scm		\
+  gnu/packages/maths.scm			\
  gnu/packages/mit-krb5.scm			\
  gnu/packages/mp3.scm				\
  gnu/packages/multiprecision.scm		\
+  gnu/packages/mtools.scm			\
  gnu/packages/mysql.scm			\
  gnu/packages/nano.scm				\
  gnu/packages/ncurses.scm			\
@@ -120,21 +140,28 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/nettle.scm			\
  gnu/packages/noweb.scm			\
  gnu/packages/ocaml.scm			\
+  gnu/packages/ocrad.scm			\
  gnu/packages/oggvorbis.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/pcre.scm				\
  gnu/packages/pdf.scm				\
+  gnu/packages/pem.scm				\
  gnu/packages/perl.scm				\
  gnu/packages/pkg-config.scm			\
  gnu/packages/plotutils.scm			\
  gnu/packages/popt.scm				\
  gnu/packages/pth.scm				\
+  gnu/packages/pulseaudio.scm			\
  gnu/packages/python.scm			\
  gnu/packages/qemu.scm				\
+  gnu/packages/qt.scm				\
  gnu/packages/ratpoison.scm			\
+  gnu/packages/rdf.scm				\
  gnu/packages/readline.scm			\
  gnu/packages/recutils.scm			\
  gnu/packages/rsync.scm			\
@@ -142,10 +169,15 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/samba.scm			\
  gnu/packages/scheme.scm			\
  gnu/packages/screen.scm			\
+  gnu/packages/sdl.scm				\
+  gnu/packages/serveez.scm			\
  gnu/packages/shishi.scm			\
+  gnu/packages/skribilo.scm			\
+  gnu/packages/slim.scm				\
  gnu/packages/smalltalk.scm			\
  gnu/packages/sqlite.scm			\
  gnu/packages/ssh.scm				\
+  gnu/packages/swig.scm				\
  gnu/packages/system.scm			\
  gnu/packages/tcl.scm				\
  gnu/packages/tcsh.scm				\
@@ -155,71 +187,109 @@ GNU_SYSTEM_MODULES =				\
  gnu/packages/tmux.scm				\
  gnu/packages/tor.scm				\
  gnu/packages/unrtf.scm			\
+  gnu/packages/valgrind.scm			\
  gnu/packages/version-control.scm		\
+  gnu/packages/video.scm			\
  gnu/packages/vim.scm				\
  gnu/packages/vpn.scm				\
  gnu/packages/w3m.scm				\
  gnu/packages/wdiff.scm			\
+  gnu/packages/web.scm                          \
  gnu/packages/wget.scm				\
  gnu/packages/which.scm			\
  gnu/packages/wordnet.scm			\
  gnu/packages/xlockmore.scm			\
  gnu/packages/xml.scm				\
+  gnu/packages/xnee.scm				\
  gnu/packages/xorg.scm				\
+  gnu/packages/yasm.scm				\
  gnu/packages/zile.scm				\
  gnu/packages/zip.scm				\
+						\
+  gnu/system.scm				\
+  gnu/system/dmd.scm				\
+  gnu/system/grub.scm				\
+  gnu/system/linux.scm				\
+  gnu/system/shadow.scm				\
  gnu/system/vm.scm

 patchdir = $(guilemoduledir)/gnu/packages/patches
 dist_patch_DATA =						\
+  gnu/packages/patches/alsa-lib-mips-atomic-fix.patch		\
+  gnu/packages/patches/apr-skip-getservbyname-test.patch	\
  gnu/packages/patches/automake-skip-amhello-tests.patch	\
+  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/cdparanoia-fpic.patch			\
  gnu/packages/patches/cmake-fix-tests.patch			\
  gnu/packages/patches/cpio-gets-undeclared.patch		\
+  gnu/packages/patches/dbus-localstatedir.patch			\
  gnu/packages/patches/diffutils-gets-undeclared.patch		\
+  gnu/packages/patches/dmd-getpw.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/glibc-bootstrap-system.patch		\
-  gnu/packages/patches/glibc-no-ld-so-cache.patch		\
-  gnu/packages/patches/gnutls-fix-tests-on-32-bits-system.patch	\
+  gnu/packages/patches/glibc-ldd-x86_64.patch			\
+  gnu/packages/patches/glibc-make-4.0.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-relocatable.patch			\
-  gnu/packages/patches/libapr-skip-getservbyname-test.patch	\
+  gnu/packages/patches/hop-bigloo-4.0b.patch			\
  gnu/packages/patches/libevent-dns-tests.patch			\
+  gnu/packages/patches/libffi-mips-n32-fix.patch		\
+  gnu/packages/patches/liboop-mips64-deplibs-fix.patch		\
+  gnu/packages/patches/libmad-mips-newgcc.patch			\
+  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/luit-posix.patch				\
  gnu/packages/patches/m4-gets-undeclared.patch			\
  gnu/packages/patches/m4-readlink-EINVAL.patch			\
-  gnu/packages/patches/m4-s_isdir.patch				\
  gnu/packages/patches/make-impure-dirs.patch			\
  gnu/packages/patches/mcron-install.patch			\
+  gnu/packages/patches/mit-krb5-init-fix.patch			\
  gnu/packages/patches/perl-no-sys-dirs.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/qt4-tests.patch				\
  gnu/packages/patches/readline-link-ncurses.patch		\
+  gnu/packages/patches/ripperx-libm.patch			\
  gnu/packages/patches/scheme48-tests.patch			\
-  gnu/packages/patches/tar-gets-undeclared.patch		\
  gnu/packages/patches/tcsh-fix-autotest.patch			\
  gnu/packages/patches/teckit-cstdio.patch			\
+  gnu/packages/patches/valgrind-glibc.patch			\
  gnu/packages/patches/vpnc-script.patch			\
  gnu/packages/patches/w3m-fix-compile.patch			\
+  gnu/packages/patches/xmodmap-asprintf.patch			\
  gnu/packages/patches/xpdf-constchar.patch

 bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
 bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
 bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
+bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux

 dist_bootstrap_x86_64_linux_DATA =		\
  gnu/packages/bootstrap/x86_64-linux/bash	\
@@ -233,12 +303,20 @@ dist_bootstrap_i686_linux_DATA =		\
  gnu/packages/bootstrap/i686-linux/tar		\
  gnu/packages/bootstrap/i686-linux/xz

+dist_bootstrap_mips64el_linux_DATA =		\
+  gnu/packages/bootstrap/mips64el-linux/bash	\
+  gnu/packages/bootstrap/mips64el-linux/mkdir	\
+  gnu/packages/bootstrap/mips64el-linux/tar	\
+  gnu/packages/bootstrap/mips64el-linux/xz
+
 # Big bootstrap binaries are not included in the tarball.  Instead, they
 # are downloaded.
 nodist_bootstrap_x86_64_linux_DATA =					\
-  gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
+  gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz
 nodist_bootstrap_i686_linux_DATA =					\
-  gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
+  gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz
+nodist_bootstrap_mips64el_linux_DATA =					\
+  gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz

 # Those files must remain executable, so they remain executable once
 # imported into the store.
@@ -247,7 +325,8 @@ install-data-hook:

 DISTCLEANFILES =				\
  $(nodist_bootstrap_x86_64_linux_DATA)		\
-  $(nodist_bootstrap_i686_linux_DATA)
+  $(nodist_bootstrap_i686_linux_DATA)		\
+  $(nodist_bootstrap_mips64el_linux_DATA)

 # Method to download a file from an external source.
 DOWNLOAD_FILE =								\
@@ -255,9 +334,12 @@ DOWNLOAD_FILE =								\
  $(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)"	\
           "$(top_srcdir)/build-aux/download.scm"

-gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz:
+gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz:
 	$(MKDIR_P) `dirname "$@"`
-	$(DOWNLOAD_FILE) "$@" "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c"
-gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz:
+	$(DOWNLOAD_FILE) "$@" "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
+gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz:
 	$(MKDIR_P) `dirname "$@"`
-	$(DOWNLOAD_FILE) "$@" "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c"
+	$(DOWNLOAD_FILE) "$@" "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
+gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz:
+	$(MKDIR_P) `dirname "$@"`
+	$(DOWNLOAD_FILE) "$@" "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"
@@ -0,0 +1,44 @@
+;;; 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 acct)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public acct
+  (package
+    (name "acct")
+    (version "6.6.1")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/acct/acct-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "1jzz601cavml7894fjalw661gz28ia35002inw990agr3rhiaiam"))))
+    (build-system gnu-build-system)
+    (home-page "https://gnu.org/software/acct/")
+    (synopsis "Standard login and process accounting utilities")
+    (description
+     "GNU acct provides a means for system administrators to determine
+system usage patterns.  It provides information on, for example, connections,
+programs executed, and system resources used.")
+    (license gpl3+)))
@@ -20,8 +20,7 @@
  #:use-module (guix licenses)
  #:use-module (gnu packages attr)
  #:use-module (gnu packages perl)
-  #:use-module ((gnu packages gettext)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module (gnu packages gettext)
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu))
@@ -62,7 +61,7 @@
                    '()
                    `(("perl" ,perl)))))
    (native-inputs
-     `(("gettext" ,guix:gettext)))
+     `(("gettext" ,gnu-gettext)))

    (home-page
     "http://savannah.nongnu.org/projects/acl")
@@ -32,7 +32,7 @@
 (define-public mpfrcx
  (package
   (name "mpfrcx")
-   (version "0.4.1")
+   (version "0.4.2")
   (source (origin
            (method url-fetch)
            (uri (string-append
@@ -40,7 +40,7 @@
                  version ".tar.gz"))
            (sha256
             (base32
-              "1rrc75chxyicqjgg5mfhgbz7p9mx1fgh0qlx14a82m25vfhifnd1"))))
+              "0grw66b255r574lvll1bqccm5myj2m8ajzsjaygcyq9zjnnbnhhy"))))
   (build-system gnu-build-system)
   (inputs `(("gmp" ,gmp)
             ("mpfr" ,mpfr)
@@ -60,14 +60,14 @@ multiplication routines such as Toom–Cook and the FFT. ")
 (define-public fplll
  (package
   (name "fplll")
-   (version "4.0.2")
+   (version "4.0.4")
   (source (origin
            (method url-fetch)
            (uri (string-append
                  "http://perso.ens-lyon.fr/damien.stehle/fplll/libfplll-"
                  version ".tar.gz"))
            (sha256 (base32
-                     "0zkifm4s77cl2qib905lxpwvlwf6liy8q7bnmvfdfyz0fbgxl8z8"))))
+                     "1cbiby7ykis4z84swclpysrljmqhfcllpkcbll1m08rzskgb1a6b"))))
   (build-system gnu-build-system)
   (inputs `(("gmp" ,gmp)
             ("mpfr" ,mpfr)))
@@ -78,43 +78,17 @@ solve the shortest vector problem.")
   (license lgpl2.1+)
   (home-page "http://perso.ens-lyon.fr/damien.stehle/fplll/")))

-(define-public gsl
-  (package
-    (name "gsl")
-    (version "1.15")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/gsl/gsl-"
-                          version ".tar.gz"))
-      (sha256
-       (base32
-        "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5"))))
-    (build-system gnu-build-system)
-    (home-page "http://www.gnu.org/software/gsl/")
-    (synopsis "Numerical library for C and C++")
-    (description
-     "The GNU Scientific Library (GSL) is a numerical library for C
-and C++ programmers.  It is free software under the GNU General
-Public License.
-
-The library provides a wide range of mathematical routines such
-as random number generators, special functions and least-squares
-fitting.  There are over 1000 functions in total with an
-extensive test suite.")
-    (license gpl3+)))
-
 (define-public pari-gp
  (package
   (name "pari-gp")
-   (version "2.5.3")
+   (version "2.5.5")
   (source (origin
            (method url-fetch)
            (uri (string-append
                  "http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-"
                  version ".tar.gz"))
            (sha256 (base32
-                     "0zsjccnnv00kwj2gk3ww2v530kjin1rgj8p8hbl4pwcnwc7m68gl"))))
+                     "058nw1fhggy7idii4f124ami521lv3izvngs9idfz964aks8cvvn"))))
   (build-system gnu-build-system)
   (inputs `(("gmp" ,gmp)
             ("perl" ,perl)
@@ -151,6 +125,38 @@ PARI is also available as a C library to allow for faster computations.")
   (license gpl2+)
   (home-page "http://pari.math.u-bordeaux.fr/")))

+(define-public gp2c
+  (package
+   (name "gp2c")
+   (version "0.0.8")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append
+                  "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/gp2c-"
+                  version ".tar.gz"))
+            (sha256 (base32
+                     "03fgiwy2si264g3zfgw2yi6i2l8szl5m106zgwk77sddshk20b34"))))
+   (build-system gnu-build-system)
+   (inputs `(("pari-gp" ,pari-gp)))
+   (arguments
+    '(#:configure-flags
+      (list (string-append "--with-paricfg="
+                           (assoc-ref %build-inputs "pari-gp")
+                           "/lib/pari/pari.cfg"))))
+   (synopsis "PARI/GP, a computer algebra system for number theory")
+   (description
+    "PARI/GP is a widely used computer algebra system designed for fast
+computations in number theory (factorisations, algebraic number theory,
+elliptic curves...), but it also contains a large number of other useful
+functions to compute with mathematical entities such as matrices,
+polynomials, power series, algebraic numbers, etc., and a lot of
+transcendental functions.
+PARI is also available as a C library to allow for faster computations.
+
+GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
+   (license gpl2)
+   (home-page "http://pari.math.u-bordeaux.fr/")))
+
 (define-public bc
  (package
    (name "bc")
@@ -179,14 +185,42 @@ PARI is also available as a C library to allow for faster computations.")
    (home-page "http://www.gnu.org/software/bc/")
    (synopsis "Arbitrary precision numeric processing language")
    (description
-     "bc is an arbitrary precision numeric processing language. Syntax
-is similar to C, but differs in many substantial areas. It supports
-interactive execution of statements.  bc is a utility included in the
-POSIX P1003.2/D11 draft standard.
+     "bc is an arbitrary precision numeric processing language.  It includes
+an interactive environment for evaluating mathematical statements.  Its
+syntax is similar to that of C, so basic usage is familiar.  It also includes
+\"dc\", a reverse-polish calculator.")
+    (license gpl2+)))

-Since the POSIX document does not specify how bc must be implemented,
-this version does not use the historical method of having bc be a
-compiler for the dc calculator.  This version has a single executable
-that both compiles the language and runs the resulting `byte code'. The
-byte code is not the dc language.")
+(define-public fftw
+  (package
+    (name "fftw")
+    (version "3.3.3")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "ftp://ftp.fftw.org/pub/fftw/fftw-"
+                                 version".tar.gz"))
+             (sha256
+              (base32
+               "1wwp9b2va7vkq3ay7a9jk22nr4x5q6m37rzqy2j8y3d11c5grkc5"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags '("--enable-shared" "--enable-openmp")
+       #:phases (alist-cons-before
+                 'build 'no-native
+                 (lambda _
+                   ;; By default '-mtune=native' is used.  However, that may
+                   ;; cause the use of ISA extensions (SSE2, etc.) that are
+                   ;; not necessarily available on the user's machine when
+                   ;; that package is built on a different machine.
+                   (substitute* (find-files "." "Makefile$")
+                     (("-mtune=native") "")))
+                 %standard-phases)))
+    (native-inputs `(("perl" ,perl)))
+    (home-page "http://fftw.org")
+    (synopsis "Computing the discrete Fourier transform")
+    (description
+     "FFTW is a C subroutine library for computing the discrete Fourier
+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+)))
@@ -0,0 +1,49 @@
+;;; 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 apl)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages readline))
+
+(define-public apl
+  (package
+    (name "apl")
+    (version "1.1")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/apl/apl-" version ".tar.gz"))
+      (sha256
+       (base32
+        "1myinxa0m3y4fanpxflfakfk3m1s8641wdlbwbs0vg5yp10xm0m3"))))
+    (build-system gnu-build-system)
+    (home-page "http://www.gnu.org/software/apl/")
+    (inputs
+     `(("gettext" ,gnu-gettext)
+       ("lapack" ,lapack)
+       ("readline" ,readline)))
+    (synopsis "APL interpreter")
+    (description
+     "GNU APL is a free interpreter for the programming language APL.  It is
+an implementation of the ISO standard 13751.")
+    (license gpl3+)))
@@ -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 libapr)
+(define-module (gnu packages apr)
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
@@ -25,9 +25,9 @@
  #:use-module (gnu packages perl)
  #:use-module (gnu packages autotools))

-(define-public libapr
+(define-public apr
  (package
-    (name "libapr")
+    (name "apr")
    (version "1.4.8")
    (source (origin
             (method url-fetch)
@@ -35,16 +35,13 @@
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "0884csfk3f530yscak0jlr6w929s3ys0n7fpwdg3dii1sgwd5f31"))))
+               "0884csfk3f530yscak0jlr6w929s3ys0n7fpwdg3dii1sgwd5f31"))
+             (patches
+              (list (search-patch "apr-skip-getservbyname-test.patch")))
+             (patch-flags '("-p0"))))
    (build-system gnu-build-system)
-    (arguments
-      `(#:patches (list (assoc-ref %build-inputs
-                                   "patch/skip-test"))
-        #:patch-flags '("-p0")))
    (inputs `(("perl" ,perl)
-              ("libtool" ,libtool)
-              ("patch/skip-test"
-               ,(search-patch "libapr-skip-getservbyname-test.patch"))))
+              ("libtool" ,libtool)))
    (home-page "http://apr.apache.org/")
    (synopsis "The Apache Portable Runtime Library")
    (description
@@ -57,9 +54,9 @@ built, relieving them of the need to code special-case conditions to work
 around or take advantage of platform-specific deficiencies or features.")
    (license asl2.0)))

-(define-public libaprutil
+(define-public apr-util
  (package
-    (name "libaprutil")
+    (name "apr-util")
    (version "1.5.2")
    (source (origin
             (method url-fetch)
@@ -70,19 +67,19 @@ around or take advantage of platform-specific deficiencies or features.")
               "19qjxpckb9p4j9pbk8kcirg6k5vqnjrqhnk9xx2c5m9964p3vkls"))))
    (build-system gnu-build-system)
    (inputs
-      `(("libapr" ,libapr)))
+      `(("apr" ,apr)))
    (arguments
     '(#:phases
       (alist-replace
        'configure
        (lambda* (#:key inputs outputs #:allow-other-keys)
          (let ((out (assoc-ref outputs "out"))
-                (libapr (assoc-ref inputs "libapr")))
+                (apr (assoc-ref inputs "apr")))
            (setenv "CONFIG_SHELL" (which "bash"))
            (zero?
             (system* "./configure"
                      (string-append "--prefix=" out)
-                      (string-append "--with-apr=" libapr)))))
+                      (string-append "--with-apr=" apr)))))
        %standard-phases)))
    (home-page "http://apr.apache.org/")
    (synopsis "One of the Apache Portable Runtime Library companions")
@@ -40,14 +40,8 @@
    (home-page "http://aspell.net/")
    (synopsis "Spell checker")
    (description
-     "GNU Aspell is a free spell checker designed to eventually replace
-Ispell.  It can either be used as a library or as an independent spell
-checker.  Its main feature is that it does a superior job of suggesting
-possible replacements for a misspelled word than just about any other
-spell checker out there for the English language.  Unlike Ispell, Aspell
-can also easily check documents in UTF-8 without having to use a special
-dictionary.  Aspell will also do its best to respect the current locale
-setting.  Other advantages over Ispell include support for using
-multiple dictionaries at once and intelligently handling personal
-dictionaries when more than one Aspell process is open at once.")
+     "Aspell is a spell-checker which can be used either as a library or as
+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+)))
@@ -20,8 +20,7 @@
 (define-module (gnu packages attr)
  #:use-module (guix licenses)
  #:use-module (gnu packages perl)
-  #:use-module ((gnu packages gettext)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module (gnu packages gettext)
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu))
@@ -75,7 +74,7 @@
         '()
         `(("perl" ,perl))))
    (native-inputs
-     `(("gettext" ,guix:gettext)))
+     `(("gettext" ,gnu-gettext)))

    (home-page "http://savannah.nongnu.org/projects/attr/")
    (synopsis "Library and tools for manipulating extended attributes")
@@ -0,0 +1,63 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 autogen)
+  #: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 which)
+  #:use-module (gnu packages guile))
+
+(define-public autogen
+  (package
+    (name "autogen")
+    (version "5.18.2")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/autogen/rel"
+                          version "/autogen-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "0s2021bwpq6h199cbbranz96hhm5s7v66lc68h8v198vqbg049yc"))))
+    (build-system gnu-build-system)
+    (inputs `(("which" ,which)
+              ("guile" ,guile-2.0)))
+    (arguments
+     '(#:phases (alist-cons-before
+                 'patch-source-shebangs 'patch-test-scripts
+                 (lambda _
+                   (let ((sh (which "sh")))
+                     (substitute*
+                         (append (find-files "agen5/test" "\\.test$")
+                                 (find-files "autoopts/test" "\\.(test|in)$"))
+                       (("/bin/sh") sh)
+                       (("/usr/bin/tr") "tr"))))
+                 %standard-phases)))
+    (home-page "http://www.gnu.org/software/autogen/")
+    (synopsis "Automated program generator")
+    (description
+     "AutoGen is a program to ease the maintenance of programs that contain
+large amounts of repetitive text.  It automates the construction of these
+sections of the code, simplifying the task of keeping the text in sync.  It
+also includes an add-on package called AutoOpts, which is specialized for the
+maintenance and documentation of program options.")
+    (license gpl3+)))
@@ -52,13 +52,11 @@
     "http://www.gnu.org/software/autoconf/")
    (synopsis "Create source code configuration scripts")
    (description
-     "GNU Autoconf is an extensible package of M4 macros that produce
-shell scripts to automatically configure software source code
-packages.  These scripts can adapt the packages to many kinds of
-UNIX-like systems without manual user intervention.  Autoconf
-creates a configuration script for a package from a template
-file that lists the operating system features that the package
-can use, in the form of M4 macro calls.")
+     "Autoconf offers the developer a robust set of M4 macros which expand
+into shell code to test the features of Unix-like systems and to adapt
+automatically their software package to these systems.  The resulting shell
+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
@@ -141,20 +139,19 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
                                 version ".tar.xz"))
             (sha256
              (base32
-               "0nc0zqq8j336kamizzd86wb19vhbwywv5avcjh3cyx230xfqy671"))))
+               "0nc0zqq8j336kamizzd86wb19vhbwywv5avcjh3cyx230xfqy671"))
+             (patches
+              (list (search-patch "automake-skip-amhello-tests.patch")))))
    (build-system gnu-build-system)
    (inputs
     `(("autoconf" ,autoconf-wrapper)
-       ("perl" ,perl)
-       ("patch/skip-amhello"
-        ,(search-patch "automake-skip-amhello-tests.patch"))))
+       ("perl" ,perl)))
    (native-search-paths
     (list (search-path-specification
            (variable "ACLOCAL_PATH")
            (directories '("share/aclocal")))))
    (arguments
-     '(#:patches (list (assoc-ref %build-inputs "patch/skip-amhello"))
-       #:modules ((guix build gnu-build-system)
+     '(#:modules ((guix build gnu-build-system)
                  (guix build utils)
                  (srfi srfi-1)
                  (srfi srfi-26)
@@ -203,9 +200,10 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
    (home-page "http://www.gnu.org/software/automake/")
    (synopsis "Making GNU standards-compliant Makefiles")
    (description
-     "GNU Automake is a tool for automatically generating
-`Makefile.in' files compliant with the GNU Coding
-Standards.  Automake requires the use of Autoconf.")
+     "Automake the part of the GNU build system for producing
+standards-compliant Makefiles.  Build requirements are entered in an
+intuitive format and then Automake works with Autoconf to produce a robust
+Makefile, simplifying the entire process for the developer.")
    (license gpl2+)))                      ; some files are under GPLv3+

 (define-public libtool
@@ -218,7 +216,10 @@ Standards.  Automake requires the use of Autoconf.")
                                 version ".tar.gz"))
             (sha256
              (base32
-               "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk"))))
+               "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk"))
+             (patches
+              (list (search-patch "libtool-skip-tests.patch")
+                    (search-patch "libtool-skip-tests-for-mips.patch")))))
    (build-system gnu-build-system)
    (native-inputs `(("m4" ,m4)
                     ("perl" ,perl)))
@@ -230,40 +231,34 @@ Standards.  Automake requires the use of Autoconf.")
               "out"))                       ; libltdl.so, ltdl.h, etc.

    (arguments
-     `(#:patches (list (assoc-ref %build-inputs "patch/skip-tests"))
-       ,@(if (%current-target-system)
-             '()                        ; no `check' phase when cross-building
-             '(#:phases (alist-cons-before
-                         'check 'pre-check
-                         (lambda* (#:key inputs #:allow-other-keys)
-                           ;; Run the test suite in parallel, if possible.
-                           (let ((ncores
-                                  (cond
-                                   ((getenv "NIX_BUILD_CORES")
-                                    =>
-                                    (lambda (n)
-                                      (if (zero? (string->number n))
-                                          (number->string (current-processor-count))
-                                          n)))
-                                   (else "1"))))
-                             (setenv "TESTSUITEFLAGS"
-                                     (string-append "-j" ncores)))
+     (if (%current-target-system)
+         '()                            ; no `check' phase when cross-building
+         '(#:phases (alist-cons-before
+                     'check 'pre-check
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       ;; Run the test suite in parallel, if possible.
+                       (let ((ncores
+                              (cond
+                               ((getenv "NIX_BUILD_CORES")
+                                =>
+                                (lambda (n)
+                                  (if (zero? (string->number n))
+                                      (number->string (current-processor-count))
+                                      n)))
+                               (else "1"))))
+                         (setenv "TESTSUITEFLAGS"
+                                 (string-append "-j" ncores)))

-                           ;; Path references to /bin/sh.
-                           (let ((bash (assoc-ref inputs "bash")))
-                             (substitute* "tests/testsuite"
-                               (("/bin/sh")
-                                (string-append bash "/bin/bash")))))
-                         %standard-phases)))))
-    (inputs `(("patch/skip-tests"
-               ,(search-patch "libtool-skip-tests.patch"))))
+                       ;; Path references to /bin/sh.
+                       (let ((bash (assoc-ref inputs "bash")))
+                         (substitute* "tests/testsuite"
+                           (("/bin/sh")
+                            (string-append bash "/bin/bash")))))
+                     %standard-phases))))
    (synopsis "Generic shared library support tools")
    (description
-     "GNU libtool is a generic library support script.  Libtool hides the
-complexity of using shared libraries behind a consistent, portable interface.
-
-To use libtool, add the new generic library building commands to your
-Makefile, Makefile.in, or Makefile.am.  See the documentation for
-details.")
+     "GNU Libtool helps in the creation and use of shared libraries, by
+presenting a single consistent, portable interface that hides the usual
+complexity of working with shared libraries across platforms.")
    (license gpl3+)
    (home-page "http://www.gnu.org/software/libtool/")))
@@ -21,6 +21,7 @@
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
  #:use-module (gnu packages gdbm)
  #:use-module (gnu packages libdaemon)
  #:use-module (gnu packages pkg-config)
@@ -38,10 +39,12 @@
                                 version ".tar.gz"))
             (sha256
              (base32
-               "0j5b5ld6bjyh3qhd2nw0jb84znq0wqai7fsrdzg7bpg24jdp2wl3"))))
+               "0j5b5ld6bjyh3qhd2nw0jb84znq0wqai7fsrdzg7bpg24jdp2wl3"))
+             (patches (list (search-patch "avahi-localstatedir.patch")))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags '("--with-distro=none"
+                           "--localstatedir=/var" ; for the DBus socket
                           "--disable-python"
                           "--disable-mono"
                           "--disable-doxygen-doc"
@@ -49,41 +49,43 @@
 (define-public hello
  (package
   (name "hello")
-   (version "2.8")
+   (version "2.9")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/hello/hello-" version
                                ".tar.gz"))
            (sha256
-             (base32 "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"))))
+             (base32 "19qy37gkasc4csb1d3bdiz9snn8mir2p3aj0jgzmfv0r2hi7mfzc"))))
   (build-system gnu-build-system)
-   (arguments '(#:configure-flags
-                `("--disable-dependency-tracking"
-                  ,(string-append "--with-gawk="  ; for illustration purposes
-                                 (assoc-ref %build-inputs "gawk")))))
-   (inputs `(("gawk" ,gawk)))
   (synopsis "Hello, GNU world: An example GNU package")
-   (description "Yeah...")
+   (description
+    "GNU Hello prints the message \"Hello, world!\" and then exits.  It
+serves as an example of standard GNU coding practices.  As such, it supports
+command-line arguments, multiple languages, and so on.")
   (home-page "http://www.gnu.org/software/hello/")
   (license gpl3+)))

 (define-public grep
  (package
   (name "grep")
-   (version "2.14")
+   (version "2.15")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/grep/grep-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "1qbjb1l7f9blckc5pqy8jlf6482hpx4awn2acmhyf5mv9wfq03p7"))))
+              "052kjsafg2x7n2zpy3iw4pzwf8fdfng5pcvi9v3chx3rb1786nmz"))))
   (build-system gnu-build-system)
   (synopsis "Print lines matching a pattern")
   (description
-    "The grep command searches one or more input files for lines containing a
-match to a specified pattern.  By default, grep prints the matching
-lines.")
+    "grep is a tool for finding text inside files.  Text is found by
+matching a pattern provided by the user in one or many files.  The pattern
+may be provided as a basic or extended regular expression, or as fixed
+strings.  By default, the matching text is simply printed to the screen,
+however the output can be greatly customized to include, for example, line
+numbers.  GNU grep offers many extensions over the standard utility,
+including, for example, recursive directory searching.")
   (license gpl3+)
   (home-page "http://www.gnu.org/software/grep/")))

@@ -114,41 +116,34 @@ lines.")
                           (string-append bash "/bin/bash")))))
                    %standard-phases))))
   (description
-    "Sed (stream editor) isn't really a true text editor or text processor.
-Instead, it is used to filter text, i.e., it takes text input and performs
-some operation (or set of operations) on it and outputs the modified text.
-Sed is typically used for extracting part of a file using pattern matching or
-substituting multiple occurrences of a string within a file.")
+    "Sed is a non-interactive, text stream editor.  It receives a text
+input from a file or from standard input and it then applies a series of text
+editing commands to the stream and prints its output to standard output.  It
+is often used for substituting text patterns in a stream.  The GNU
+implementation offers several extensions over the standard utility.")
   (license gpl3+)
   (home-page "http://www.gnu.org/software/sed/")))

 (define-public tar
  (package
   (name "tar")
-   (version "1.26")
+   (version "1.27.1")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/tar/tar-"
                                version ".tar.bz2"))
            (sha256
             (base32
-              "0hbdkzmchq9ycr2x1pxqdcgdbaxksh8c6ac0jf75jajhcks6jlss"))))
+              "1iip0fk0wqhxb0jcwphz43r4fxkx1y7mznnhmlvr618jhp7b63wv"))))
   (build-system gnu-build-system)
-   (inputs `(("patch/gets" ,(search-patch "tar-gets-undeclared.patch"))))
-   (arguments
-    `(#:patches (list (assoc-ref %build-inputs "patch/gets"))))
   (synopsis "Managing tar archives")
   (description
-    "The Tar program provides the ability to create tar archives, as well as
-various other kinds of manipulation.  For example, you can use Tar on
-previously created archives to extract files, to store additional files, or
-to update or list files which were already stored.
-
-Initially, tar archives were used to store files conveniently on magnetic
-tape.  The name \"Tar\" comes from this use; it stands for tape archiver.
-Despite the utility's name, Tar can direct its output to available devices,
-files, or other programs (using pipes), it can even access remote devices or
-files (as archives).")
+    "Tar provides the ability to create tar archives, as well as the
+ability to extract, update or list files in an existing archive.  It is
+useful for combining many files into one larger file, while maintaining
+directory structure and file information such as permissions and
+creation/modification dates.  GNU tar offers many extensions over the
+standard utility.")
   (license gpl3+)
   (home-page "http://www.gnu.org/software/tar/")))

@@ -172,9 +167,11 @@ files (as archives).")
    )
   (synopsis "Apply differences to originals, with optional backups")
   (description
-    "GNU Patch takes a patch file containing a difference listing produced by
-the diff program and applies those differences to one or more original files,
-producing patched versions.")
+    "Patch is a program that applies changes to files based on differences
+laid out as by the program \"diff\".  The changes may be applied to one or more
+files depending on the contents of the diff file.  It accepts several
+different diff formats.  It may also be used to revert previously applied
+differences.")
   (license gpl3+)
   (home-page "http://savannah.gnu.org/projects/patch/")))

@@ -192,31 +189,11 @@ producing patched versions.")
   (build-system gnu-build-system)
   (synopsis "Comparing and merging files")
   (description
-    "GNU Diffutils is a package of several programs related to finding
-differences between files.
-
-Computer users often find occasion to ask how two files differ. Perhaps one
-file is a newer version of the other file. Or maybe the two files started out
-as identical copies but were changed by different people.
-
-You can use the diff command to show differences between two files, or each
-corresponding file in two directories. diff outputs differences between files
-line by line in any of several formats, selectable by command line
-options. This set of differences is often called a ‘diff’ or ‘patch’. For
-files that are identical, diff normally produces no output; for
-binary (non-text) files, diff normally reports only that they are different.
-
-You can use the cmp command to show the offsets and line numbers where two
-files differ. cmp can also show all the characters that differ between the
-two files, side by side.
-
-You can use the diff3 command to show differences among three files. When two
-people have made independent changes to a common original, diff3 can report
-the differences between the original and the two changed versions, and can
-produce a merged file that contains both persons' changes together with
-warnings about conflicts.
-
-You can use the sdiff command to merge two files interactively.")
+    "GNU Diffutils is a package containing tools for finding the
+differences between files.  The \"diff\" command is used to show how two files
+differ, while \"cmp\" shows the offsets and line numbers where they differ. 
+\"diff3\" allows you to compare three files.  Finally, \"sdiff\" offers an
+interactive means to merge two files.")
   (license gpl3+)
   (home-page "http://www.gnu.org/software/diffutils/")))

@@ -230,33 +207,23 @@ You can use the sdiff command to merge two files interactively.")
                                version ".tar.gz"))
            (sha256
             (base32
-              "0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks3"))))
+              "0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks3"))
+            (patches (list (search-patch "findutils-absolute-paths.patch")))))
   (build-system gnu-build-system)
-   (native-inputs
-    `(("patch/absolute-paths"
-       ,(search-patch "findutils-absolute-paths.patch"))))
   (arguments
-    `(#:patches (list (assoc-ref %build-inputs "patch/absolute-paths"))
-
-      ;; Work around cross-compilation failure.
-      ;; See <http://savannah.gnu.org/bugs/?27299#comment1>.
-      ,@(if (%current-target-system)
-            '(#:configure-flags '("gl_cv_func_wcwidth_works=yes"))
-            '())))
+    ;; Work around cross-compilation failure.
+    ;; See <http://savannah.gnu.org/bugs/?27299#comment1>.
+    (if (%current-target-system)
+        '(#:configure-flags '("gl_cv_func_wcwidth_works=yes"))
+        '()))
   (synopsis "Operating on files matching given criteria")
   (description
-    "The GNU Find Utilities are the basic directory searching utilities of
-the GNU operating system.  These programs are typically used in conjunction
-with other programs to provide modular and powerful directory search and file
-locating capabilities to other commands.
-
-The tools supplied with this package are:
-
-  * find - search for files in a directory hierarchy;
-  * locate - list files in databases that match a pattern;
-  * updatedb - update a file name database;
-  * xargs - build and execute command lines from standard input.
-")
+    "Findutils supplies the basic file directory searching utilities of the
+GNU system.  It consists of two primary searching utilities: \"find\"
+recursively searches for files in a directory according to given criteria and
+\"locate\" lists files in a database that match a query.  Two auxiliary tools
+are included: \"updatedb\" updates the file name database and \"xargs\" may be
+used to apply commands with arbitrarily long arguments.")
   (license gpl3+)
   (home-page "http://www.gnu.org/software/findutils/")))

@@ -297,30 +264,30 @@ The tools supplied with this package are:
                %standard-phases)))
   (synopsis "Core GNU utilities (file, text, shell)")
   (description
-    "The GNU Core Utilities are the basic file, shell and text manipulation
-utilities of the GNU operating system.  These are the core utilities which
-are expected to exist on every operating system.")
+    "GNU Coreutils includes all of the basic command-line tools that are
+expected in a POSIX system.  These provide the basic file, shell and text
+manipulation functions of the GNU system.  Most of these tools offer extended
+functionality beyond that which is outlined in the POSIX standard.")
   (license gpl3+)
   (home-page "http://www.gnu.org/software/coreutils/")))

 (define-public gnu-make
  (package
   (name "make")
-   (version "3.82")
+   (version "4.0")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/make/make-" version
                                ".tar.bz2"))
            (sha256
             (base32
-              "0ri98385hsd7li6rh4l5afcq92v8l2lgiaz85wgcfh4w2wzsghg2"))))
+              "1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6"))
+            (patches (list (search-patch "make-impure-dirs.patch")))))
   (build-system gnu-build-system)
-   (native-inputs
-    `(("patch/impure-dirs" ,(search-patch "make-impure-dirs.patch"))))
+   (inputs `(("guile" ,guile-2.0)))
   (outputs '("out" "debug"))
   (arguments
-    '(#:patches (list (assoc-ref %build-inputs "patch/impure-dirs"))
-      #:phases (alist-cons-before
+    '(#:phases (alist-cons-before
                'build 'set-default-shell
                (lambda* (#:key inputs #:allow-other-keys)
                  ;; Change the default shell from /bin/sh.
@@ -332,13 +299,12 @@ are expected to exist on every operating system.")
                %standard-phases)))
   (synopsis "Remake files automatically")
   (description
-    "Make is a tool which controls the generation of executables and other
-non-source files of a program from the program's source files.
-
-Make gets its knowledge of how to build your program from a file called the
-makefile, which lists each of the non-source files and how to compute it from
-other files. When you write a program, you should write a makefile for it, so
-that it is possible to use Make to build and install the program.")
+    "Make is a program that is used to control the production of
+executables or other files from their source files.  The process is
+controlled from a Makefile, in which the developer specifies how each file is
+generated from its source.  It has powerful dependency resolution and the
+ability to determine when files have to be regenerated after their sources
+change.  GNU make offers many powerful extensions over the standard utility.")
   (license gpl3+)
   (home-page "http://www.gnu.org/software/make/")))

@@ -352,7 +318,10 @@ that it is possible to use Make to build and install the program.")
                                version ".tar.bz2"))
            (sha256
             (base32
-              "15qhbkz3r266xaa52slh857qn3abw7rb2x2jnhpfrafpzrb4x4gy"))))
+              "15qhbkz3r266xaa52slh857qn3abw7rb2x2jnhpfrafpzrb4x4gy"))
+            (patches (list (search-patch "binutils-ld-new-dtags.patch")
+                           (search-patch "binutils-loongson-workaround.patch")
+                           (search-patch "binutils-loongson-madd-fix.patch")))))
   (build-system gnu-build-system)

   ;; Split Binutils in several outputs, mostly to avoid collisions in
@@ -361,11 +330,8 @@ that it is possible to use Make to build and install the program.")
              "lib"))                      ; libbfd.a, bfd.h, etc.

   ;; TODO: Add dependency on zlib + those for Gold.
-   (native-inputs
-    `(("patch/new-dtags" ,(search-patch "binutils-ld-new-dtags.patch"))))
   (arguments
-    `(#:patches (list (assoc-ref %build-inputs "patch/new-dtags"))
-      #:configure-flags '(;; Add `-static-libgcc' to not retain a dependency
+    `(#:configure-flags '(;; Add `-static-libgcc' to not retain a dependency
                          ;; on GCC when bootstrapping.
                          "LDFLAGS=-static-libgcc"

@@ -378,23 +344,37 @@ that it is possible to use Make to build and install the program.")

   (synopsis "Binary utilities: bfd gas gprof ld")
   (description
-    "The GNU Binutils are a collection of binary tools.  The main ones are
-`ld' (the GNU linker) and `as' (the GNU assembler).  They also include the
-BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")
+    "GNU Binutils is a collection of tools for working with binary files.
+Perhaps the most notable are \"ld\", a linker, and \"as\", an assembler. Other
+tools include programs to display binary profiling information, list the
+strings in a binary file, and utilities for working with archives.  The \"bfd\"
+library for working with executable and object formats is also included.")
   (license gpl3+)
   (home-page "http://www.gnu.org/software/binutils/")))

 (define-public glibc
  (package
   (name "glibc")
-   (version "2.17")
+   (version "2.18")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/glibc/glibc-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "0gmjnn4kma9vgizccw1jv979xw55a8n1nkk94gg0l3hy80vy6539"))))
+              "18spla703zav8dq9fw7rbzkyv9qfisxb26p7amg1x3wjh7iy3d1c"))
+            (snippet
+             ;; Disable 'ldconfig' and /etc/ld.so.cache.  The latter is
+             ;; required on LFS distros to avoid loading the distro's libc.so
+             ;; instead of ours.
+             '(substitute* "sysdeps/unix/sysv/linux/configure"
+                (("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")))))
   (build-system gnu-build-system)

   ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
@@ -409,7 +389,6 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")

   (arguments
    `(#:out-of-source? #t
-      #:patches (list (assoc-ref %build-inputs "patch/ld.so.cache"))
      #:configure-flags
      (list "--enable-add-ons"
            "--sysconfdir=/etc"
@@ -422,7 +401,6 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")
                           (assoc-ref %outputs "locales")
                           "/share/locale")

-
            (string-append "--with-headers="
                           (assoc-ref %build-inputs "linux-headers")
                           "/include")
@@ -494,9 +472,7 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")
                   (zero? (system* "make" "localedata/install-locales")))
                 %standard-phases))))

-   (inputs `(("patch/ld.so.cache"
-              ,(search-patch "glibc-no-ld-so-cache.patch"))
-             ("static-bash" ,(static-package bash-light))))
+   (inputs `(("static-bash" ,(static-package bash-light))))
   (synopsis "The GNU C Library")
   (description
    "Any Unix-like operating system needs a C library: the library which
@@ -566,7 +542,7 @@ with the Linux kernel.")
                                version ".tar.gz"))
                          (sha256
                           (base32
-                            "13xd30ngwhqmj7w216ghd5knvg047hzpc0xca5l297g5cwb62hza"))))))
+                            "1dh7nzmfxs8fps4bzcd2lz5fz24zxy2123a99avxsk34jh6bk7id"))))))
    (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)
@@ -594,6 +570,10 @@ and daylight-saving rules.")
            ((#:phases phases)
             `(alist-replace
               'build (lambda _
+                        ;; Don't attempt to build 'guile.c' since we don't
+                        ;; have Guile here.
+                        (substitute* "build.sh"
+                          (("guile\\.\\$\\{OBJEXT\\}") ""))
                        (zero? (system* "./build.sh")))
               (alist-replace
                'install (lambda* (#:key outputs #:allow-other-keys)
@@ -670,7 +650,7 @@ identifier SYSTEM."

 (define gcc-boot0
  (package-with-bootstrap-guile
-   (package (inherit gcc-4.7)
+   (package (inherit gcc-4.8)
     (name "gcc-cross-boot0")
     (arguments
      `(#:guile ,%bootstrap-guile
@@ -680,7 +660,7 @@ identifier SYSTEM."
                   (ice-9 regex)
                   (srfi srfi-1)
                   (srfi srfi-26))
-        ,@(substitute-keyword-arguments (package-arguments gcc-4.7)
+        ,@(substitute-keyword-arguments (package-arguments gcc-4.8)
            ((#:configure-flags flags)
             `(append (list ,(string-append "--target=" (boot-triplet))

@@ -689,8 +669,18 @@ identifier SYSTEM."

                            ;; Disable features not needed at this stage.
                            "--disable-shared"
-                            "--enable-languages=c"
+                            "--enable-languages=c,c++"
+
+                            ;; libstdc++ cannot be built at this stage
+                            ;; ("Link tests are not allowed after
+                            ;; GCC_NO_EXECUTABLES.").
+                            "--disable-libstdc++-v3"
+
+                            "--disable-threads"
                            "--disable-libmudflap"
+                            "--disable-libatomic"
+                            "--disable-libsanitizer"
+                            "--disable-libitm"
                            "--disable-libgomp"
                            "--disable-libssp"
                            "--disable-libquadmath"
@@ -717,24 +707,7 @@ identifier SYSTEM."
                   ,@(map (lambda (lib)
                            `(symlink ,(package-full-name lib)
                                      ,(package-name lib)))
-                          (list gmp mpfr mpc))
-
-                   ;; MPFR headers/lib are found under $(MPFR)/src, but
-                   ;; `configure' wrongfully tells MPC too look under
-                   ;; $(MPFR), so fix that.
-                   (substitute* "configure"
-                     (("extra_mpc_mpfr_configure_flags(.+)--with-mpfr-include=([^/]+)/mpfr(.*)--with-mpfr-lib=([^ ]+)/mpfr"
-                       _ equals include middle lib)
-                      (string-append "extra_mpc_mpfr_configure_flags" equals
-                                     "--with-mpfr-include=" include
-                                     "/mpfr/src" middle
-                                     "--with-mpfr-lib=" lib
-                                     "/mpfr/src"))
-                     (("gmpinc='-I([^ ]+)/mpfr -I([^ ]+)/mpfr" _ a b)
-                      (string-append "gmpinc='-I" a "/mpfr/src "
-                                     "-I" b "/mpfr/src"))
-                     (("gmplibs='-L([^ ]+)/mpfr" _ a)
-                      (string-append "gmplibs='-L" a "/mpfr/src")))))
+                          (list gmp mpfr mpc))))
               (alist-cons-after
                'install 'symlink-libgcc_eh
                (lambda* (#:key outputs #:allow-other-keys)
@@ -744,7 +717,7 @@ identifier SYSTEM."
                    (with-directory-excursion
                        (string-append out "/lib/gcc/"
                                       ,(boot-triplet)
-                                       "/" ,(package-version gcc-4.7))
+                                       "/" ,(package-version gcc-4.8))
                      (symlink "libgcc.a" "libgcc_eh.a"))))
                ,phases))))))

@@ -760,9 +733,12 @@ identifier SYSTEM."

     ;; No need for Texinfo at this stage.
     (native-inputs (alist-delete "texinfo"
-                                  (package-native-inputs gcc-4.7))))))
+                                  (package-native-inputs gcc-4.8))))))

-(define linux-libre-headers-boot0
+(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
+  ;; between (gnu packages linux) and this module.
  (package-with-bootstrap-guile
   (package (inherit linux-libre-headers)
     (arguments `(#:guile ,%bootstrap-guile
@@ -807,7 +783,7 @@ identifier SYSTEM."
                            ;; install rpc/*.h.
                            "--enable-obsolete-rpc")
                      ,flags)))))
-     (propagated-inputs `(("linux-headers" ,linux-libre-headers-boot0)))
+     (propagated-inputs `(("linux-headers" ,(linux-libre-headers-boot0))))
     (inputs
      `( ;; A native GCC is needed to build `cross-rpcgen'.
        ("native-gcc" ,@(assoc-ref %boot0-inputs "gcc"))
@@ -823,7 +799,7 @@ identifier SYSTEM."
 (define (cross-gcc-wrapper gcc binutils glibc bash)
  "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC
 that makes it available under the native tool names."
-  (package (inherit gcc-4.7)
+  (package (inherit gcc-4.8)
    (name (string-append (package-name gcc) "-wrapped"))
    (source #f)
    (build-system trivial-build-system)
@@ -840,6 +816,21 @@ that makes it available under the native tool names."
                          (out      (assoc-ref %outputs "out"))
                          (bindir   (string-append out "/bin"))
                          (triplet  ,(boot-triplet)))
+                     (define (wrap-program program)
+                       ;; GCC-BOOT0 is a libc-less cross-compiler, so it
+                       ;; needs to be told where to find the crt files and
+                       ;; the dynamic linker.
+                       (call-with-output-file program
+                         (lambda (p)
+                           (format p "#!~a/bin/bash
+exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
+                                   bash
+                                   gcc triplet program
+                                   libc libc
+                                   ,(glibc-dynamic-linker))))
+
+                       (chmod program #o555))
+
                     (mkdir-p bindir)
                     (with-directory-excursion bindir
                       (for-each (lambda (tool)
@@ -847,20 +838,7 @@ that makes it available under the native tool names."
                                                           triplet "-" tool)
                                            tool))
                                 '("ar" "ranlib"))
-
-                       ;; GCC-BOOT0 is a libc-less cross-compiler, so it
-                       ;; needs to be told where to find the crt files and
-                       ;; the dynamic linker.
-                       (call-with-output-file "gcc"
-                         (lambda (p)
-                           (format p "#!~a/bin/bash
-exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
-                                   bash
-                                   gcc triplet
-                                   libc libc
-                                   ,(glibc-dynamic-linker))))
-
-                       (chmod "gcc" #o555))))))
+                       (for-each wrap-program '("gcc" "g++")))))))
    (native-inputs
     `(("binutils" ,binutils)
       ("gcc" ,gcc)
@@ -907,7 +885,7 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
    ("gcc" ,gcc-boot0-wrapped)
    ,@(fold alist-delete %boot1-inputs '("libc" "gcc"))))

-(define-public binutils-final
+(define binutils-final
  (package-with-bootstrap-guile
   (package (inherit binutils)
     (arguments
@@ -916,6 +894,36 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
        ,@(package-arguments binutils)))
     (inputs %boot2-inputs))))

+(define libstdc++
+  ;; Intermediate libstdc++ that will allow us to build the final GCC
+  ;; (remember that GCC-BOOT0 cannot build libstdc++.)
+  (package-with-bootstrap-guile
+   (package (inherit gcc-4.8)
+     (name "libstdc++")
+     (arguments
+      `(#:guile ,%bootstrap-guile
+        #:implicit-inputs? #f
+
+        #:out-of-source? #t
+        #:phases (alist-cons-before
+                  'configure 'chdir
+                  (lambda _
+                    (chdir "libstdc++-v3"))
+                  %standard-phases)
+        #:configure-flags `("--disable-shared"
+                            "--disable-libstdcxx-threads"
+                            "--disable-libstdcxx-pch"
+                            ,(string-append "--with-gxx-include-dir="
+                                            (assoc-ref %outputs "out")
+                                            "/include"
+                                            ;; "/include/c++/"
+                                            ;; ,(package-version gcc-4.8)
+                                            ))))
+     (inputs %boot2-inputs)
+     (native-inputs '())
+     (propagated-inputs '())
+     (synopsis "GNU C++ standard library (intermediate)"))))
+
 (define-public gcc-final
  ;; The final GCC.
  (package (inherit gcc-boot0)
@@ -929,12 +937,25 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
       ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.)
       ,@(substitute-keyword-arguments (package-arguments gcc-boot0)
           ((#:configure-flags boot-flags)
-            (let loop ((args (package-arguments gcc-4.7)))
+            (let loop ((args (package-arguments gcc-4.8)))
              (match args
                ((#:configure-flags normal-flags _ ...)
                 normal-flags)
                ((_ rest ...)
                 (loop rest)))))
+           ((#:make-flags flags)
+            ;; Since $LIBRARY_PATH and $CPATH are not honored, add the
+            ;; relevant flags.
+            `(cons (string-append "CPPFLAGS=-I"
+                                  (assoc-ref %build-inputs "libstdc++")
+                                  "/include")
+                   (map (lambda (flag)
+                          (if (string-prefix? "LDFLAGS=" flag)
+                              (string-append flag " -L"
+                                             (assoc-ref %build-inputs "libstdc++")
+                                             "/lib")
+                              flag))
+                        ,flags)))
           ((#:phases phases)
            `(alist-delete 'symlink-libgcc_eh ,phases)))))

@@ -942,6 +963,7 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
              ("mpfr-source" ,(package-source mpfr))
              ("mpc-source" ,(package-source mpc))
              ("binutils" ,binutils-final)
+              ("libstdc++" ,libstdc++)
              ,@%boot2-inputs))))

 (define ld-wrapper-boot3
@@ -1001,7 +1023,7 @@ store.")
    ("ld-wrapper" ,ld-wrapper-boot3)
    ,@(alist-delete "gcc" %boot2-inputs)))

-(define-public bash-final
+(define bash-final
  ;; Link with `-static-libgcc' to make sure we don't retain a reference
  ;; to the bootstrap GCC.
  (package-with-bootstrap-guile
@@ -1022,6 +1044,14 @@ store.")
                                 (current-source-location)
                                 #:guile %bootstrap-guile)))

+(define gnu-make-final
+  ;; The final GNU Make, which uses the final Guile.
+  (package-with-bootstrap-guile
+   (package-with-explicit-inputs gnu-make
+                                 `(("guile" ,guile-final)
+                                   ,@%boot4-inputs)
+                                 (current-source-location))))
+
 (define-public ld-wrapper
  ;; The final `ld' wrapper, which uses the final Guile.
  (package (inherit ld-wrapper-boot3)
@@ -1032,9 +1062,13 @@ store.")
                      '("guile" "bash"))))))

 (define-public %final-inputs
-  ;; Final derivations used as implicit inputs by `gnu-build-system'.
-  (let ((finalize (cut package-with-explicit-inputs <> %boot4-inputs
-                       (current-source-location))))
+  ;; 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
+                                (current-source-location)))))
    `(,@(map (match-lambda
              ((name package)
               (list name (finalize package))))
@@ -1048,8 +1082,8 @@ store.")
               ("sed" ,sed)
               ("grep" ,grep)
               ("findutils" ,findutils)
-               ("gawk" ,gawk)
-               ("make" ,gnu-make)))
+               ("gawk" ,gawk)))
+      ("make" ,gnu-make-final)
      ("bash" ,bash-final)
      ("ld-wrapper" ,ld-wrapper)
      ("binutils" ,binutils-final)
@@ -85,13 +85,12 @@
                                   %standard-phases)))
     (synopsis "The GNU Bourne-Again SHell")
     (description
-      "Bash is the shell, or command language interpreter, that will appear in
-the GNU operating system.  Bash is an sh-compatible shell that incorporates
-useful features from the Korn shell (ksh) and C shell (csh).  It is intended
-to conform to the IEEE POSIX P1003.2/ISO 9945.2 Shell and Tools standard.  It
-offers functional improvements over sh for both programming and interactive
-use.  In addition, most sh scripts can be run by Bash without
-modification.")
+      "Bash is the shell, or command-line interpreter, of the GNU system.  It
+is compatible with the Bourne Shell, but it also integrates useful features
+from the Korn Shell and the C Shell and new improvements of its own.  It
+allows command-line editing, unlimited command history, shell functions and
+aliases, and job control while still allowing most sh scripts to be run
+without modification.")
     (license gpl3+)
     (home-page "http://www.gnu.org/software/bash/"))))

@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,12 +22,15 @@
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages m4)
-  #:use-module (gnu packages perl))
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages flex)
+  #:use-module (srfi srfi-1)
+  #:export (bison))

-(define-public bison
+(define bison
  (package
    (name "bison")
-    (version "2.7.1")
+    (version "3.0.2")
    (source
     (origin
      (method url-fetch)
@@ -35,22 +38,16 @@
                          version ".tar.xz"))
      (sha256
       (base32
-        "1yx7isx67sdmyijvihgyra1f59fwdz7sqriginvavfj5yb5ss2dl"))))
+        "0g4gjan477lac18m51kv4xzcsp6wjfsfwvd2dxymcl6vid9fihx2"))))
    (build-system gnu-build-system)
-    (inputs `(("perl" ,perl)))
+    (native-inputs `(("perl" ,perl)))
+    (inputs `(("flex" ,flex)))
    (propagated-inputs `(("m4" ,m4)))
    (home-page "http://www.gnu.org/software/bison/")
    (synopsis "Parser generator")
    (description
-     "Bison is a general-purpose parser generator that converts an
-annotated context-free grammar into an LALR(1) or GLR parser for
-that grammar.  Once you are proficient with Bison, you can use
-it to develop a wide range of language parsers, from those used
-in simple desk calculators to complex programming languages.
-
-Bison is upward compatible with Yacc: all properly-written Yacc
-grammars ought to work with Bison with no change.  Anyone
-familiar with Yacc should be able to use Bison with little
-trouble.  You need to be fluent in C or C++ programming in order
-to use Bison.")
+     "GNU Bison is a general-purpose parser generator.  It can build a
+deterministic or generalized LR parser from an annotated, context-free
+grammar.  It is versatile enough to have many applications, from parsers for
+simple tools through complex programming languages.")
    (license gpl3+)))
@@ -64,20 +64,29 @@
             #:guile %bootstrap-guile
             #:system system)))

+  (define %bootstrap-patch-inputs
+    ;; Packages used when an <origin> has a non-empty 'patches' field.
+    `(("tar"   ,%bootstrap-coreutils&co)
+      ("xz"    ,%bootstrap-coreutils&co)
+      ("bzip2" ,%bootstrap-coreutils&co)
+      ("gzip"  ,%bootstrap-coreutils&co)
+      ("patch" ,%bootstrap-coreutils&co)))
+
  (let ((orig-method (origin-method source)))
    (origin (inherit source)
      (method (cond ((eq? orig-method url-fetch)
                     (boot url-fetch))
-                    (else orig-method))))))
+                    (else orig-method)))
+      (patch-guile %bootstrap-guile)
+      (patch-inputs %bootstrap-patch-inputs))))

-(define (package-from-tarball name* source* program-to-test description*)
-  "Return a package that correspond to the extraction of SOURCE*.
-PROGRAM-TO-TEST is a program to run after extraction of SOURCE*, to
+(define (package-from-tarball name source program-to-test description)
+  "Return a package that correspond to the extraction of SOURCE.
+PROGRAM-TO-TEST is a program to run after extraction of SOURCE, to
 check whether everything is alright."
  (package
-    (name name*)
+    (name name)
    (version "0")
-    (source #f)
    (build-system trivial-build-system)
    (arguments
     `(#:guile ,%bootstrap-guile
@@ -101,8 +110,9 @@ check whether everything is alright."
    (inputs
     `(("tar" ,(search-bootstrap-binary "tar" (%current-system)))
       ("xz"  ,(search-bootstrap-binary "xz" (%current-system)))
-       ("tarball" ,(bootstrap-origin (source* (%current-system))))))
-    (synopsis description*)
+       ("tarball" ,(bootstrap-origin (source (%current-system))))))
+    (source #f)
+    (synopsis description)
    (description #f)
    (home-page #f)
    (license #f)))
@@ -170,7 +180,7 @@ check whether everything is alright."
                              (xz    (->store "xz"))
                              (mkdir (->store "mkdir"))
                              (bash  (->store "bash"))
-                              (guile (->store "guile-2.0.7.tar.xz"))
+                              (guile (->store "guile-2.0.9.tar.xz"))
                              (builder
                               (add-text-to-store store
                                                  "build-bootstrap-guile.sh"
@@ -184,9 +194,10 @@ cd $out
 $out/bin/guile --version~%"
                                                          mkdir xz guile tar)
                                                  (list mkdir xz guile tar))))
-                         (derivation store name system
-                                     bash `(,builder) '()
-                                     `((,bash) (,builder)))))))))
+                         (derivation store name
+                                     bash `(,builder)
+                                     #:system system
+                                     #:inputs `((,bash) (,builder)))))))))
   (package
     (name "guile-bootstrap")
     (version "2.0")
@@ -208,16 +219,19 @@ $out/bin/guile --version~%"
                          (origin
                           (method url-fetch)
                           (uri (map (cut string-append <> "/" system
-                                          "/20130105/static-binaries.tar.xz")
+                                          "/20131110/static-binaries.tar.xz")
                                     %bootstrap-base-urls))
                           (sha256
                            (match system
                              ("x86_64-linux"
                               (base32
-                                "0md23alzy6nc5f16pric7mkagczdzr8xbh074sb3rjzrls06j1ls"))
+                                "0c533p9dhczzcsa1117gmfq3pc8w362g4mx84ik36srpr7cx2bg4"))
                              ("i686-linux"
                               (base32
-                                "0nzj1lmm9b94g7k737cr4w1dv282w5nmhb53238ikax9r6pkc0yb"))))))
+                                "0s5b3jb315n13m1k8095l0a5hfrsz8g0fv1b6riyc5hnxqyphlak"))
+                              ("mips64el-linux"
+                               (base32
+                                "072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753"))))))
                        "true"                    ; the program to test
                        "Bootstrap binaries of Coreutils, Awk, etc."))

@@ -227,16 +241,19 @@ $out/bin/guile --version~%"
                          (origin
                           (method url-fetch)
                           (uri (map (cut string-append <> "/" system
-                                          "/20130105/binutils-2.22.tar.xz")
+                                          "/20131110/binutils-2.23.2.tar.xz")
                                     %bootstrap-base-urls))
                           (sha256
                            (match system
                              ("x86_64-linux"
                               (base32
-                                "1ffmk2yy2pxvkqgzrkzp3s4jpn4qaaksyk3b5nsc5cjwfm7qkgzh"))
+                                "1j5yivz7zkjqfsfmxzrrrffwyayjqyfxgpi89df0w4qziqs2dg20"))
                              ("i686-linux"
                               (base32
-                                "1rafk6aq4sayvv3r3d2khn93nkyzf002xzh0xadlyci4mznr6b0a"))))))
+                                "14jgwf9gscd7l2pnz610b1zia06dvcm2qyzvni31b8zpgmcai2v9"))
+                              ("mips64el-linux"
+                               (base32
+                                "1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7"))))))
                        "ld"                      ; the program to test
                        "Bootstrap binaries of the GNU Binutils"))

@@ -278,16 +295,19 @@ $out/bin/guile --version~%"
                    (origin
                     (method url-fetch)
                     (uri (map (cut string-append <> "/" (%current-system)
-                                    "/20130105/glibc-2.17.tar.xz")
+                                    "/20131110/glibc-2.18.tar.xz")
                               %bootstrap-base-urls))
                     (sha256
                      (match (%current-system)
                        ("x86_64-linux"
                         (base32
-                          "18kv1z9d8dr1j3hm9w7663kchqw9p6rsx11n1m143jgba2jz6jy3"))
+                          "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v"))
                        ("i686-linux"
                         (base32
-                          "08hv8i0axwnihrcgbz19x0a7s6zyv3yx38x8r29liwl8h82x9g88")))))))))
+                          "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w"))
+                        ("mips64el-linux"
+                         (base32
+                          "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg")))))))))
    (synopsis "Bootstrap binaries and headers of the GNU C Library")
    (description #f)
    (home-page #f)
@@ -346,16 +366,19 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
                    (origin
                     (method url-fetch)
                     (uri (map (cut string-append <> "/" (%current-system)
-                                    "/20130105/gcc-4.7.2.tar.xz")
+                                    "/20131110/gcc-4.8.2.tar.xz")
                               %bootstrap-base-urls))
                     (sha256
                      (match (%current-system)
                        ("x86_64-linux"
                         (base32
-                          "1x1p7han5crnbw906iwdifykr6grzm0w27dy9gz75j0q1b32i4px"))
+                          "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls"))
                        ("i686-linux"
                         (base32
-                          "06wqs0xxnpw3hn0xjb4c9cs0899p1xwkcysa2rvzhvpra0c5vsg2")))))))))
+                          "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw"))
+                        ("mips64el-linux"
+                         (base32
+                          "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks")))))))))
    (native-search-paths
     (list (search-path-specification
            (variable "CPATH")
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,15 +20,19 @@
 (define-module (gnu packages cdrom)
  #:use-module (guix download)
  #:use-module (guix packages)
-  #:use-module ((guix licenses) #:select (lgpl2.1+ gpl3+))
+  #:use-module ((guix licenses) #:select (lgpl2.1+ gpl2 gpl2+ gpl3+))
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages)
  #:use-module (gnu packages acl)
  #:use-module (gnu packages compression)
-  #:use-module (gnu packages readline)
-  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages gtk)
  #:use-module (gnu packages help2man)
-  #:use-module (gnu packages pkg-config))
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages patchelf)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages which))

 (define-public libcddb
  (package
@@ -80,22 +85,26 @@ caching facility provided by the library.")
    (home-page "http://www.gnu.org/software/libcdio/")
    (synopsis "CD Input and Control library")
    (description
-     "GNU libcdio is a library for OS-idependent CD-ROM and CD image access.
-It includes a library for working with ISO-9660 filesystems (libiso9660), as
-well as utility programs such as an audio CD player and an extractor.")
+     "The GNU Compact Disc Input and Control Library (libcdio) is a library
+for CD-ROM and CD image file access.  It allows the developer to add CD
+access to an application without having to worry about the OS- and
+device-dependent properties of CD-ROM or the specific details of CD image
+formats.  It includes pycdio, a Python interface to libcdio, and
+libcdio-paranoia, a library providing jitter-free and error-free audio
+extraction from CDs.")
    (license gpl3+)))

 (define-public xorriso
  (package
    (name "xorriso")
-    (version "1.3.0")
+    (version "1.3.2")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/xorriso/xorriso-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "1gvyf1ppq764hsk8iyffip7h1dnz2b9k2cchf7himnns03aadavn"))))
+               "1z04580nkkziy2flbxjjx0q6vp9p7vcp7yp0agx2aqz3l1vjcwhf"))))
    (build-system gnu-build-system)
    (inputs
     `(("acl" ,acl)
@@ -106,10 +115,93 @@ well as utility programs such as an audio CD player and an extractor.")
    (home-page "http://www.gnu.org/software/xorriso/")
    (synopsis "Create, manipulate, burn ISO-9660 filesystems")
    (description
-     "GNU xorriso copies file objects from POSIX compliant filesystems into
-Rock Ridge enhanced ISO 9660 filesystems and allows session-wise manipulation
-of such filesystems.  It can load the management information of existing ISO
-images and it writes the session results to optical media or to filesystem
-objects.  Vice versa xorriso is able to copy file objects out of ISO 9660
-filesystems.")
+     "GNU Xorriso is a tool for copying files to and from ISO 9660 Rock
+Ridge, a.k.a. Compact Disc File System, filesystems and it allows
+session-wise manipulation of them.  It features a formatter and burner for
+CD, DVD and BD.  It can operate on existing ISO images or it can create new
+ones.  xorriso can then be used to copy files directly into or out of ISO
+files.")
    (license gpl3+)))
+
+(define-public cdparanoia
+  (package
+    (name "cdparanoia")
+    (version "10.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-"
+                                 version ".src.tgz"))
+             (sha256
+              (base32
+               "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"))
+             (patches (list (search-patch "cdparanoia-fpic.patch")))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("patchelf" ,patchelf)))
+    (arguments
+     `(#:tests? #f ; there is no check target
+       #:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  (guix build rpath)
+                  (srfi srfi-26))
+       #:imported-modules ((guix build gnu-build-system)
+                           (guix build utils)
+                           (guix build rpath))
+       #:phases
+        (alist-cons-after
+         'strip 'add-lib-to-runpath
+         (lambda* (#:key outputs #:allow-other-keys)
+           (let* ((out (assoc-ref outputs "out"))
+                  (lib (string-append out "/lib")))
+             ;; Add LIB to the RUNPATH of all the executables.
+             (with-directory-excursion out
+               (for-each (cut augment-rpath <> lib)
+                         (find-files "bin" ".*")))))
+         %standard-phases)))
+    (home-page "http://www.xiph.org/paranoia/")
+    (synopsis "audio CD reading utility which includes extra data verification features")
+    (description "Cdparanoia retrieves audio tracks from CDDA capable CDROM
+drives.  The data can be saved to a file or directed to standard output
+in WAV, AIFF, AIFF-C or raw format.  Most ATAPI, SCSI and  several
+proprietary CDROM drive makes are supported; cdparanoia can determine if the
+target drive is CDDA capable.  In addition to simple reading, cdparanoia adds
+extra-robust data verification, synchronization, error handling and scratch
+reconstruction capability.")
+    (license gpl2))) ; libraries under lgpl2.1
+
+(define-public dvdisaster
+  (package
+    (name "dvdisaster")
+    (version "0.72.4")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://dvdisaster.net/downloads/dvdisaster-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "0pm039a78h7m9vvjmmjfkl05ii6qdmfhvbypxjbc7j5w82y66is4"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gettext" ,gnu-gettext)
+       ("gtk+" ,gtk+-2)
+       ("pkg-config" ,pkg-config)
+       ("which" ,which)))
+    (arguments
+     `(#:tests? #f)) ; no check target
+    (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
+finite time (typically for many years).  After that time, data loss develops
+slowly with read errors growing from the outer media region towards the
+inside.
+
+Dvdisaster stores data on CD/DVD/BD (supported media) in a way that it is
+fully recoverable even after some read errors have developed.  This enables
+you to rescue the complete data to a new medium.
+
+Data loss is prevented by using error correcting codes.  Error correction
+data is either added to the medium or kept in separate error correction
+files.  Dvdisaster works at the image level so that the recovery does not
+depend on the file system of the medium.  The maximum error correction
+capacity is user-selectable.")
+    (license gpl2+)))
@@ -35,17 +35,15 @@
              (base32
               "1jkbq97ajcf834z68hbn3xfhiz921zhn39gklml1racf0kb3jzh3"))))
    (build-system gnu-build-system)
+
+    ;; Needed to have cflow-mode.el installed.
+    (native-inputs `(("emacs" ,emacs)))
+
    (home-page "http://www.gnu.org/software/cflow/")
    (synopsis "Create a graph of control flow within a program")
    (description
-     "GNU cflow analyzes a collection of C source files and prints a
-graph, charting control flow within the program.
-
-GNU cflow is able to produce both direct and inverted flowgraphs
-for C sources.  Optionally a cross-reference listing can be
-generated.  Two output formats are implemented: POSIX and GNU
-(extended).
-
-The package also provides Emacs major mode for examining the
-produced flowcharts in Emacs.")
+     "GNU cflow analyzes C source files and produces a graph charting the
+control flow of the program.  It can output the graph in several styles and
+in either the POSIX format or in an extended GNU format. cflow also includes
+a major mode for Emacs for examining the flowcharts that it produces.")
   (license gpl3+)))
@@ -27,7 +27,7 @@
 (define-public cmake
  (package
    (name "cmake")
-    (version "2.8.10.2")
+    (version "2.8.12")
    (source (origin
             (method url-fetch)
             (uri (string-append
@@ -36,12 +36,11 @@
                    (string-index version #\. (+ 1 (string-index version #\.))))
                   "/cmake-" version ".tar.gz"))
             (sha256
-              (base32 "1c8fj6i2x9sb39wc9av2ighj415mw33cxfrlfpafcvm0knrlylnf"))))
+              (base32 "11q21vyrr6c6smyjy81k2k07zmn96ggjia9im9cxwvj0n88bm1fq"))
+             (patches (list (search-patch "cmake-fix-tests.patch")))))
    (build-system gnu-build-system)
    (arguments
     '(#:test-target "test"
-       #:patches (list (assoc-ref %build-inputs "fix-tests"))
-       #:patch-flags '("-p0")
       #:phases (alist-replace
                 'configure
                 (lambda* (#:key outputs #:allow-other-keys)
@@ -66,10 +65,9 @@
                             (string-append "--prefix=" out)))))
                 %standard-phases)))
    (inputs
-     `(("file" ,file)
-       ("fix-tests" ,(search-patch "cmake-fix-tests.patch"))))
+     `(("file" ,file)))
    (home-page "http://www.cmake.org/")
-    (synopsis "A cross-platform, open-source build system")
+    (synopsis "Cross-platform build system")
    (description
     "CMake is a family of tools designed to build, test and package software.
 CMake is used to control the software compilation process using simple platform
@@ -0,0 +1,49 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 complexity)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix licenses)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages autogen))
+
+(define-public complexity
+  (package
+    (name "complexity")
+    (version "1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/complexity/complexity-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1aad7n35ymxbj5dlpvm64dcd71b6i7hbmps0g7nkf47vj53l6y2j"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("texinfo" ,texinfo)
+       ("autogen" ,autogen)))
+    (home-page "http://www.gnu.org/software/complexity/")
+    (synopsis "Analyze complexity of C functions")
+    (description
+     "GNU complexity provides tools for finding procedures that are
+convoluted, overly long or otherwise difficult to understand.  This
+may help in learning or reviewing unfamiliar code or perhaps
+highlighting your own code that seemed comprehensible when you wrote it.")
+    (license gpl3+)))
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,7 +22,8 @@
                #:renamer (symbol-prefix-proc 'license:))
  #:use-module (guix packages)
  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages which))

 (define-public zlib
  (package
@@ -42,12 +44,17 @@
     `(#:phases (alist-replace
                 'configure
                 (lambda* (#:key outputs #:allow-other-keys)
-                   ;; Zlib's home-made `configure' doesn't fails when passed
+                   ;; Zlib's home-made `configure' fails when passed
                   ;; extra flags like `--enable-fast-install', so we need to
                   ;; invoke it with just what it understand.
                   (let ((out (assoc-ref outputs "out")))
-                     (zero? (system* "./configure"
-                                     (string-append "--prefix=" out)))))
+                     ;; 'configure' doesn't understand '--host'.
+                     ,@(if (%current-target-system)
+                           `((setenv "CHOST" ,(%current-target-system)))
+                           '())
+                     (zero?
+                      (system* "./configure"
+                               (string-append "--prefix=" out)))))
                 %standard-phases)))
    (home-page "http://zlib.net/")
    (synopsis "The zlib compression library")
@@ -80,13 +87,10 @@ in compression.")
    ;; FIXME: The test suite wants `less', and optionally Perl.
    '(#:tests? #f))
   (description
-    "gzip (GNU zip) is a popular data compression program written by Jean-loup
-Gailly for the GNU project.  Mark Adler wrote the decompression part.
-
-We developed this program as a replacement for compress because of the Unisys
-and IBM patents covering the LZW algorithm used by compress.  These patents
-made it impossible for us to use compress, and we needed a replacement.  The
-superior compression ratio of gzip is just a bonus.")
+    "GNU Gzip provides data compression and decompression utilities; the
+typical extension is \".gz\".  Unlike the \"zip\" format, it compresses a single
+file; as a result, it is often used in conjunction with \"tar\", resulting in
+\".tar.gz\" or \".tgz\", etc.")
   (license license:gpl3+)
   (home-page "http://www.gnu.org/software/gzip/")))

@@ -112,7 +116,19 @@ superior compression ratio of gzip is just a bonus.")
                                    base libdir)
                            (copy-file file
                                       (string-append libdir "/" base))))
-                        (find-files "." "^libbz2\\.so"))))))
+                        (find-files "." "^libbz2\\.so")))))
+        (set-cross-environment
+         '(lambda* (#:key target #:allow-other-keys)
+            (substitute* (find-files "." "Makefile")
+              (("CC=.*$")
+               (string-append "CC = " target "-gcc\n"))
+              (("AR=.*$")
+               (string-append "AR = " target "-ar\n"))
+              (("RANLIB=.*$")
+               (string-append "RANLIB = " target "-ranlib\n"))
+              (("^all:(.*)test" _ prerequisites)
+               ;; Remove 'all' -> 'test' dependency.
+               (string-append "all:" prerequisites "\n"))))))
    (package
      (name "bzip2")
      (version "1.0.6")
@@ -129,15 +145,34 @@ superior compression ratio of gzip is just a bonus.")
                    (guix build utils)
                    (srfi srfi-1))
         #:phases
-         (alist-cons-before
-          'build 'build-shared-lib ,build-shared-lib
-          (alist-cons-after
-           'install 'fix-man-dir ,fix-man-dir
-           (alist-cons-after
-            'install 'install-shared-lib ,install-shared-lib
-            (alist-delete 'configure %standard-phases))))
+         ,(if (%current-target-system)
+
+              ;; Cross-compilation: use the cross tools.
+              `(alist-cons-before
+                'build 'build-shared-lib ,build-shared-lib
+                (alist-cons-after
+                 'install 'fix-man-dir ,fix-man-dir
+                 (alist-cons-after
+                  'install 'install-shared-lib ,install-shared-lib
+                  (alist-replace 'configure ,set-cross-environment
+                                 %standard-phases))))
+
+              ;; Native compilation: build the shared library.
+              `(alist-cons-before
+                'build 'build-shared-lib ,build-shared-lib
+                (alist-cons-after
+                 'install 'fix-man-dir ,fix-man-dir
+                 (alist-cons-after
+                  'install 'install-shared-lib ,install-shared-lib
+                  (alist-delete 'configure %standard-phases)))))
+
         #:make-flags (list (string-append "PREFIX="
-                                           (assoc-ref %outputs "out")))))
+                                           (assoc-ref %outputs "out")))
+
+         ;; Don't attempt to run the tests when cross-compiling.
+         ,@(if (%current-target-system)
+               '(#:tests? #f)
+               '())))
      (synopsis "high-quality data compression program")
      (description
       "bzip2 is a freely available, patent free (see below), high-quality data
@@ -189,6 +224,7 @@ than gzip and 15 % smaller output than bzip2.")
       (base32
        "0wryshs446s7cclrbjykyj766znhcpnr7s3cxy33ybfn6vwfcygz"))))
    (build-system gnu-build-system)
+    (arguments '(#:configure-flags '("--enable-shared")))
    (home-page "http://www.oberhumer.com/opensource/lzo")
    (synopsis
     "A data compresion library suitable for real-time data de-/compression")
@@ -200,3 +236,58 @@ compression ratio.
 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 lzip
+  (package
+    (name "lzip")
+    (version "1.15")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://savannah/lzip/lzip-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "1dh5vmj5apizfawnsm50y7z064yx7cz3313przph16gwd3dgrlvw"))))
+    (build-system gnu-build-system)
+    (home-page "http://www.nongnu.org/lzip/lzip.html")
+    (synopsis "Lossless data compressor based on the LZMA algorithm")
+    (description
+     "Lzip is a lossless data compressor with a user interface similar to the
+one of gzip or bzip2.  Lzip decompresses almost as fast as gzip and compresses
+more than bzip2, which makes it well suited for software distribution and data
+archiving.  Lzip is a clean implementation of the LZMA algorithm.")
+    (license license:gpl3+)))
+
+(define-public sharutils
+  (package
+    (name "sharutils")
+    (version "4.14")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/sharutils/sharutils-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "033sq1v0cp0bi1mp320xaqwd4fhakqc5747hh6qa1asjrzpqiqza"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("which" ,which)))
+    (arguments
+     `(#:phases
+        (alist-cons-after
+         '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)
+           (substitute* "tests/shar-1.ok"
+             (((which "sh")) "/bin/sh")))
+         %standard-phases)))
+    (home-page "http://www.gnu.org/software/sharutils/")
+    (synopsis "Archives in shell scripts, uuencode/uudecode")
+    (description
+     "GNU sharutils is a package for creating and manipulating shell
+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+)))
@@ -27,31 +27,21 @@
  (package
    (name "cpio")
    (version "2.11")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/cpio/cpio-"
-                          version ".tar.bz2"))
-      (sha256
-       (base32
-        "1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv"))))
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/cpio/cpio-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv"))
+             (patches (list (search-patch "cpio-gets-undeclared.patch")))))
    (build-system gnu-build-system)
-    (arguments
-     `(#:patches (list (assoc-ref %build-inputs
-                                  "patch/gets"))))
-    (inputs
-     `(("patch/gets" ,(search-patch "cpio-gets-undeclared.patch"))))
    (home-page "https://www.gnu.org/software/cpio/")
    (synopsis "Manage cpio and tar file archives")
    (description
-     "GNU Cpio copies files into or out of a cpio or tar archive. The
-archive can be another file on the disk, a magnetic tape, or a pipe.
-
-GNU Cpio supports the following archive formats: binary, old ASCII, new
-ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 tar. The
-tar format is provided for compatability with the tar program. By
-default, cpio creates binary format archives, for compatibility with
-older cpio programs. When extracting from archives, cpio automatically
-recognizes which kind of archive it is reading and can read archives
-created on machines with a different byte-order.")
+     "GNU cpio copies files into or out of cpio or tar archives. Indeed,
+many formats are supported, including legacy formats.  The format is
+determined automatically by the program and is handled appropriately. 
+Furthermore, the location of the archive is not important.  It can be another
+file on the drive, a tape, or data on a pipe.")
    (license gpl3+)))
@@ -37,9 +37,8 @@
    (home-page "http://www.gnu.org/software/cppi/")
    (synopsis "Indent C preprocessor directives to reflect nesting and more")
    (description
-     "GNU cppi indents C preprocessor directives to reflect their nesting and
-ensure that there is exactly one space character between each #if, #elif,
-#define directive and the following token.  The number of spaces between the
-`#' and the following directive must correspond to the level of nesting of
-that directive.")
+     "GNU Cppi processes C source code files to properly indent the
+preprocessor directives to reflect their nesting.  It also performs other
+standardizations, such as correcting the number of spaces between directives
+and the text following them.")
    (license gpl3+)))
@@ -70,10 +70,13 @@
  "Return a cross-compiler for TARGET, where TARGET is a GNU triplet.  Use
 XBINUTILS as the associated cross-Binutils.  If LIBC is false, then build a
 GCC that does not target a libc; otherwise, target that libc."
-  (package (inherit gcc-4.7)
+  (package (inherit gcc-4.8)
    (name (string-append "gcc-cross-"
                         (if libc "" "sans-libc-")
                         target))
+    (source (origin (inherit (package-source gcc-4.8))
+              (patches
+               (list (search-patch "gcc-cross-environment-variables.patch")))))
    (arguments
     `(#:implicit-inputs? #f
       #:modules ((guix build gnu-build-system)
@@ -81,9 +84,8 @@ GCC that does not target a libc; otherwise, target that libc."
                  (ice-9 regex)
                  (srfi srfi-1)
                  (srfi srfi-26))
-       #:patches (list (assoc-ref %build-inputs "patch/cross-env-vars"))

-       ,@(substitute-keyword-arguments (package-arguments gcc-4.7)
+       ,@(substitute-keyword-arguments (package-arguments gcc-4.8)
           ((#:configure-flags flags)
            `(append (list ,(string-append "--target=" target)
                           ,@(gcc-configure-flags-for-triplet target)
@@ -99,6 +101,7 @@ GCC that does not target a libc; otherwise, target that libc."
                                   "--enable-languages=c"

                                   "--disable-threads" ; libgcc, would need libc
+                                   "--disable-libatomic"
                                   "--disable-libmudflap"
                                   "--disable-libgomp"
                                   "--disable-libssp"
@@ -177,17 +180,14 @@ GCC that does not target a libc; otherwise, target that libc."
            #f))))

    (native-inputs
-     `(("patch/cross-env-vars"
-        ,(search-patch "gcc-cross-environment-variables.patch"))
-
-       ("binutils-cross" ,xbinutils)
+     `(("binutils-cross" ,xbinutils)

       ;; Call it differently so that the builder can check whether the "libc"
       ;; input is #f.
       ("libc-native" ,@(assoc-ref %final-inputs "libc"))

       ;; Remaining inputs.
-       ,@(let ((inputs (append (package-inputs gcc-4.7)
+       ,@(let ((inputs (append (package-inputs gcc-4.8)
                               (alist-delete "libc" %final-inputs))))
           (if libc
               `(("libc" ,libc)
@@ -45,7 +45,7 @@
    `(("libgcrypt" ,libgcrypt)
      ("lvm2" ,lvm2)
      ("popt" ,popt)
-      ("python" ,python)
+      ("python" ,python-wrapper)
      ("util-linux" ,util-linux)))
   (synopsis "hard disk encryption tool")
   (description
@@ -20,38 +20,28 @@
  #: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) #:select (lzip)))

 (define-public ddrescue
  (package
    (name "ddrescue")
-    (version "1.16")
+    (version "1.17")
    (source
     (origin
      (method url-fetch)
      (uri (string-append "mirror://gnu/ddrescue/ddrescue-"
-                          version ".tar.gz"))
+                          version ".tar.lz"))
      (sha256
       (base32
-        "1rixya7p8c4jrn4p0flf6h5dqwybrilf3hrj4r7x41h3zgjz5cvn"))))
+        "0bvmsbzli2j4czwkabzs978n1y6vx31axh02kpgcf7033cc6rydy"))))
    (build-system gnu-build-system)
-    (home-page
-     "http://www.gnu.org/software/ddrescue/ddrescue.html")
+    (home-page "http://www.gnu.org/software/ddrescue/ddrescue.html")
    (synopsis "Data recovery utility")
+    (native-inputs `(("lzip" ,lzip)))
    (description
-     "GNU Ddrescue is a data recovery tool.  It copies data from one
-file or block device (e.g., hard disk, CD-ROM) to another, trying hard to
-rescue data in case of read errors.
-
-The basic operation of Ddrescue is fully automatic.  That is, you don't
-have to wait for an error, stop the program, read the log, run it in
-reverse mode, etc.
-
-If you use the logfile feature of Ddrescue, the data is rescued very
-efficiently (only the needed blocks are read).  Also, you can interrupt
-the rescue at any time and resume it later at the same point.
-
-Automatic merging of backups: If you have two or more damaged copies of
-a file and run Ddrescue on all of them, one at a time, with the same
-output file, you will probably obtain a complete and error-free file.")
+     "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+)))
@@ -77,12 +77,7 @@
     "http://www.gnu.org/software/dejagnu/")
    (synopsis "GNU software testing framework")
    (description
-     "DejaGnu is a framework for testing other programs.  Its purpose
-is to provide a single front end for all tests.  Think of it as a
-custom library of Tcl procedures crafted to support writing a
-test harness.  A test harness is the testing infrastructure that
-is created to support a specific program or tool.  Each program
-can have multiple testsuites, all supported by a single test
-harness.  DejaGnu is written in Expect, which in turn uses Tcl --
-Tool command language.")
+     "DejaGnu is a framework for testing software.  In effect, it serves as
+a front-end for all tests written for a program.  Thus, each program can have
+multiple test suites, which are then all managed by a single harness.")
    (license gpl2+)))
@@ -45,12 +45,9 @@
    (home-page "http://www.gnu.org/software/ed/")
    (synopsis "Line-oriented text editor")
    (description
-     "GNU ed is a line-oriented text editor.  It is used to create,
-display, modify and otherwise manipulate text files, both
-interactively and via shell scripts.  A restricted version of ed,
-red, can only edit files in the current directory and cannot
-execute shell commands.  Ed is the \"standard\" text editor in the
-sense that it is the original editor for Unix, and thus widely
-available.  For most purposes, however, it is superseded by
-full-screen editors such as GNU Emacs or GNU Moe.")
+     "Ed is a line-oriented text editor: rather than offering an overview of
+a document, ed performs editing one line at a time.  It can be executed both
+interactively and via shell scripts.  Its method of command input allows
+complex tasks to be performed in an automated way. GNU ed offers several
+extensions over the standard utility.")
    (license gpl3+)))
@@ -22,6 +22,7 @@
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages)
+  #:use-module (gnu packages gtk)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages gnutls)
@@ -47,14 +48,14 @@
                                 version ".tar.xz"))
             (sha256
              (base32
-               "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"))))
+               "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"))
+             (patches (list (search-patch "emacs-configure-sh.patch")))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags
       (list (string-append "--with-crt-dir=" (assoc-ref %build-inputs "libc")
                            "/lib")
             "--with-gif=no")                     ; XXX: add libungif
-       #:patches (list (assoc-ref %build-inputs "patch/epaths"))
       #:phases (alist-cons-before
                 'configure 'fix-/bin/pwd
                 (lambda _
@@ -71,8 +72,7 @@

       ;; TODO: Add the optional dependencies.
       ("xlibs" ,libx11)
-       ("libXaw" ,libxaw)                    ; XXX: eventually replace by GTK+
-       ;; ("gtk+" ,gtk+)
+       ("gtk+" ,gtk+-2)
       ("libXft" ,libxft)
       ("libtiff" ,libtiff)
       ;; ("libungif" ,libungif)
@@ -85,27 +85,18 @@

       ("libXpm" ,libxpm)
       ("libxml2" ,libxml2)
-       ("dbus" ,dbus)
-
-       ("patch/epaths" ,(search-patch "emacs-configure-sh.patch"))
-       ))
+       ("dbus" ,dbus)))
    (home-page "http://www.gnu.org/software/emacs/")
    (synopsis "The extensible, customizable, self-documenting text editor")
    (description
-     "GNU Emacs is an extensible, customizable text editor—and more.  At its
-core is an interpreter for Emacs Lisp, a dialect of the Lisp
-programming language with extensions to support text editing.
-
-The features of GNU Emacs include: content-sensitive editing modes,
-including syntax coloring, for a wide variety of file types including
-plain text, source code, and HTML; complete built-in documentation,
-including a tutorial for new users; full Unicode support for nearly all
-human languages and their scripts; highly customizable, using Emacs
-Lisp code or a graphical interface; a large number of extensions that
-add other functionality, including a project planner, mail and news
-reader, debugger interface, calendar, and more.  Many of these
-extensions are distributed with GNU Emacs; others are available
-separately.")
+     "GNU Emacs is an extensible and highly customizable text editor.  It is
+based on an Emacs Lisp interpreter with extensions for text editing.  Emacs
+has been extended in essentially all areas of computing, giving rise to a
+vast array of packages supporting, e.g., email, IRC and XMPP messaging,
+spreadsheets, remote server editing, and much more.  Emacs includes extensive
+documentation on all aspects of the system, from basic editing to writing
+large Lisp programs.  It has full Unicode support for nearly all human
+languages.")
    (license gpl3+)))


@@ -18,8 +18,7 @@

 (define-module (gnu packages fdisk)
  #:use-module ((guix licenses) #:select (gpl3+))
-  #:use-module ((gnu packages gettext)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module (gnu packages gettext)
  #:use-module (gnu packages guile)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages parted)
@@ -41,13 +40,14 @@
        "04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3"))))
    (build-system gnu-build-system)
    (inputs
-     `(("gettext" ,guix:gettext)
+     `(("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 alternatives to util-linux fdisk and util-linux
-cfdisk.  It uses GNU Parted.")
+     "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,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,9 +24,11 @@
  #:use-module (gnu packages)
  #:use-module (gnu packages m4)
  #:use-module (gnu packages bison)
-  #:use-module (gnu packages indent))
+  #:use-module (gnu packages indent)
+  #:use-module (srfi srfi-1)
+  #:export (flex))

-(define-public flex
+(define flex
  (package
    (name "flex")
    (version "2.5.37")
@@ -36,13 +38,28 @@
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "0ah5mi4j62b85a9rllv1004mzjb5cd0mn4glvz13p88rpx77pahp"))))
+               "0ah5mi4j62b85a9rllv1004mzjb5cd0mn4glvz13p88rpx77pahp"))
+             (patches (list (search-patch "flex-bison-tests.patch")))))
    (build-system gnu-build-system)
-    (arguments
-     '(#:patches (list (assoc-ref %build-inputs "patch/bison-tests"))))
-    (inputs `(("patch/bison-tests" ,(search-patch "flex-bison-tests.patch"))
-              ("bison" ,bison)
-              ("indent" ,indent)))
+    (inputs
+     (let ((bison-for-tests
+            ;; Work around an incompatibility with Bison 3.0:
+            ;; <http://lists.gnu.org/archive/html/bug-bison/2013-09/msg00014.html>.
+            (package (inherit bison)
+              (version "2.7.1")
+              (source (origin
+                       (method url-fetch)
+                       (uri (string-append "mirror://gnu/bison/bison-"
+                                           version ".tar.xz"))
+                       (sha256
+                        (base32
+                         "1yx7isx67sdmyijvihgyra1f59fwdz7sqriginvavfj5yb5ss2dl"))))
+
+              ;; Unlike Bison 3.0, this version did not need Flex for its
+              ;; tests, so it allows us to break the cycle.
+              (inputs (alist-delete "flex" (package-inputs bison))))))
+       `(("bison" ,bison-for-tests)
+         ("indent" ,indent))))
    (propagated-inputs `(("m4" ,m4)))
    (home-page "http://flex.sourceforge.net/")
    (synopsis "A fast lexical analyser generator")
@@ -0,0 +1,133 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 fonts)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system trivial)
+  #:use-module ((gnu packages base)
+                #:select (tar))
+  #:use-module (gnu packages compression))
+
+(define-public ttf-bitstream-vera
+  (package
+    (name "ttf-bitstream-vera")
+    (version "1.10")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnome/sources/ttf-bitstream-vera/"
+                                 version "/ttf-bitstream-vera-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils)
+                                (srfi srfi-26))
+
+                   (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"))
+                         (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 doc-dir)
+                     (chdir (string-append "ttf-bitstream-vera-" ,version))
+                     (for-each (lambda (ttf)
+                                 (copy-file ttf
+                                            (string-append font-dir "/" ttf)))
+                               (find-files "." "\\.ttf$"))
+                     (for-each (lambda (doc)
+                                 (copy-file doc
+                                            (string-append doc-dir "/" doc)))
+                               (find-files "." "\\.TXT$"))))))
+    (native-inputs `(("source" ,source)
+                     ("tar" ,tar)
+                     ("bzip2" ,bzip2)))
+    (home-page "https://www-old.gnome.org/fonts/")
+    (synopsis "Bitstream Vera sans-serif typeface")
+    (description "Vera is a sans-serif typeface from Bitstream, Inc.  This
+package provides the TrueType (TTF) files.")
+    (license
+     (license:x11-style
+      "https://www-old.gnome.org/fonts/#Final_Bitstream_Vera_Fonts"))))
+
+(define-public freefont-ttf
+  (package
+    (name "freefont-ttf")
+    (version "20100919")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/freefont/freefont-ttf-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "1q3h5jp1mbdkinkwxy0lfd0a1q7azlbagraydlzaa2ng82836wg4"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils)
+                                (srfi srfi-26))
+
+                   (let ((tar      (string-append (assoc-ref %build-inputs
+                                                             "tar")
+                                                  "/bin/tar"))
+                         (PATH     (string-append (assoc-ref %build-inputs
+                                                             "gzip")
+                                                  "/bin"))
+                         (font-dir (string-append %output
+                                                  "/share/fonts/truetype"))
+                         (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 doc-dir)
+                     (chdir (string-append "freefont-" ,version))
+                     (for-each (lambda (file)
+                                 (let ((dir (if (string-suffix? "ttf" file)
+                                                font-dir
+                                                doc-dir)))
+                                   (copy-file file
+                                              (string-append dir "/" file))))
+                               (find-files "." ""))))))
+    (native-inputs `(("source" ,source)
+                     ("tar" ,tar)
+                     ("gzip" ,gzip)))
+    (home-page "http://www.gnu.org/software/freefont/")
+    (synopsis "Unicode-encoded outline fonts")
+    (description
+     "The GNU Freefont project aims to provide a set of free outline
+ (PostScript Type0, TrueType, OpenType...) fonts covering the ISO
+10646/Unicode UCS (Universal Character Set).")
+   (license license:gpl3+)))
@@ -19,6 +19,7 @@
 (define-module (gnu packages fontutils)
  #:use-module (gnu packages)
  #:use-module (gnu packages compression)
+  #:use-module (gnu packages ghostscript)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages xml)
  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
@@ -64,18 +65,27 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
 (define-public fontconfig
  (package
   (name "fontconfig")
-   (version "2.10.91")
+   (version "2.10.93")
   (source (origin
            (method url-fetch)
            (uri (string-append
                   "http://www.freedesktop.org/software/fontconfig/release/fontconfig-"
                   version ".tar.bz2"))
            (sha256 (base32
-                     "1vk37q3zj8bjppj3l0pkby1psialpwl263jqf6pbih2hx5a7jwm4"))))
+                     "172j5vsgx2xplsk5mrxrspbn5lrswq6gnxkxjgcrx0j8i0kiz47a"))))
   (build-system gnu-build-system)
   (inputs `(("expat" ,expat)
             ("freetype" ,freetype)
+             ("gs-fonts" ,gs-fonts)
             ("pkg-config" ,pkg-config)))
+   (arguments
+     `(#:configure-flags
+               ;; point to user profile instead of /usr/share/fonts in /etc/fonts.conf
+        (list "--with-default-fonts=~/.guix-profile/share/fonts"
+              ;; register gs-fonts
+              (string-append "--with-add-fonts="
+                             (assoc-ref %build-inputs "gs-fonts")
+                             "/share/fonts"))))
   (synopsis "Fontconfig, a library for configuring and customising font access.")
   (description
    "Fontconfig can discover new fonts when installed automatically;
@@ -131,12 +141,10 @@ X11-system or any other graphical user interface. ")
                   (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
                   ".tar.gz"))
            (sha256 (base32
-                     "0fjiwvic8mdxpkyccfp7zh26y9xnvkp0skqbyfkrjiacd191k82r"))))
+                     "0fjiwvic8mdxpkyccfp7zh26y9xnvkp0skqbyfkrjiacd191k82r"))
+            (patches (list (search-patch "teckit-cstdio.patch")))))
   (build-system gnu-build-system)
-   (inputs `(("patch/teckit" ,(search-patch "teckit-cstdio.patch"))
-             ("zlib" ,zlib)))
-   (arguments
-    `(#:patches (list (assoc-ref %build-inputs "patch/teckit"))))
+   (inputs `(("zlib" ,zlib)))
   (synopsis "TECkit, a toolkit for encoding conversions")
   (description
    "TECkit is a low-level toolkit intended to be used by other applications
@@ -27,27 +27,23 @@
 (define-public freeipmi
  (package
    (name "freeipmi")
-    (version "1.2.8")
+    (version "1.3.3")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/freeipmi/freeipmi-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "0aqbjlqv8nh5nnfx5icyvcvws87xnwqjqsfszjx0jqb539snrc58"))))
+               "0pmgr66k4cx0gdwzfby6643m15bb4q2yx2g5r2jr3qidrfyxhi3j"))))
    (build-system gnu-build-system)
    (inputs
     `(("readline" ,readline) ("libgcrypt" ,libgcrypt)))
    (home-page "http://www.gnu.org/software/freeipmi/")
    (synopsis "Platform management, including sensor and power monitoring")
    (description
-     "GNU FreeIPMI provides in-band and out-of-band IPMI software based on the
-IPMI v1.5/2.0 specification.  The IPMI specification defines a set of
-interfaces for platform management and is implemented by a number vendors for
-system management.  The features of IPMI that most users will be interested in
-are sensor monitoring, system event monitoring, power control, and
-serial-over-LAN (SOL).  The FreeIPMI tools and libraries listed below should
-provide users with the ability to access and utilize these and many other
-features.  A number of useful features for large HPC or cluster environments
-have also been implemented into FreeIPMI.")
+     "GNU FreeIPMI is a collection of in-band and out-of-band IPMI software
+in accordance with the IPMI v1.5/2.0 specification.  These programs provide a
+set of interfaces for platform management.  Common functionality includes
+sensor monitoring, system event monitoring, power control and
+serial-over-LAN.")
    (license gpl3+)))
@@ -65,14 +65,8 @@
   (home-page "http://www.gnu.org/software/gawk/")
   (synopsis "A text scanning and processing language")
   (description
-    "Many computer users need to manipulate text files: extract and then
-operate on data from parts of certain lines while discarding the rest, make
-changes in various text files wherever certain patterns appear, and so on.
-To write a program to do these things in a language such as C or Pascal is a
-time-consuming inconvenience that may take many lines of code.  The job is
-easy with awk, especially the GNU implementation: Gawk.
-
-The awk utility interprets a special-purpose programming language that makes
-it possible to handle many data-reformatting jobs with just a few lines of
-code.")
+    "Gawk is the GNU implementation of Awk, a specialized programming
+language for the easy manipulation of formatted text, such as tables of data.
+ Gawk features many extensions beyond the traditional implementation,
+including network access, sorting, and large libraries.")
   (license gpl3+)))
@@ -37,13 +37,11 @@
    (home-page "http://www.gnu.org/software/gcal")
    (synopsis "Calculating and printing a wide variety of calendars")
    (description
-     "Gcal is a program for calculating and printing calendars.  Gcal displays
-hybrid and proleptic Julian and Gregorian calendar sheets,respectively for one
-month, three months, or a whole year.  It also displays eternal holiday lists
-for many countries around the globe, and features a very powerful creation of
-fixed date lists that can be used for reminding purposes.  Gcal can calculate
-various astronomical data and times of the Sun and the Moon for pleasure at
-any location, precisely enough for most civil purposes.  Gcal supports some
-other calendar systems, for example, the Chinese and Japanese calendars, the
-Hebrew calendar, and the civil Islamic calendar, too.")
+     "Gcal is a program to calculate and print calendars on the
+command-line.  Calendars can be printed in 1-month, 3-month or whole-year
+views. In addition, eternal holiday lists can be generated for many
+countries, which can be complemented by user-made lists of fixed dates to
+make an agenda.  Gcal can also calculate astronomical data, such as the
+phases of the moon, and supports alternative calendar formats: Julian,
+Gregorian, Islamic, Chinese and more.")
    (license gpl3+)))
@@ -27,6 +27,7 @@
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
+  #:use-module (guix utils)
  #:use-module (ice-9 regex))

 (define %gcc-infrastructure
@@ -72,6 +73,9 @@ where the OS part is overloaded to denote a specific ABI---into GCC
                     "--enable-languages=c,c++"
                     "--disable-multilib"

+                     ;; No pre-compiled libstdc++ headers, to save space.
+                     "--disable-libstdcxx-pch"
+
                     "--with-local-prefix=/no-gcc-local-prefix"

                     ,(let ((libc (assoc-ref %build-inputs "libc")))
@@ -114,7 +118,9 @@ 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")))
+         (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 "
@@ -122,6 +128,12 @@ where the OS part is overloaded to denote a specific ABI---into GCC
                                        "-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"))))

@@ -147,18 +159,21 @@ where the OS part is overloaded to denote a specific ABI---into GCC
                ;; Tell where to find libstdc++, libc, and `?crt*.o', except
                ;; `crt{begin,end}.o', which come with GCC.
                (substitute* (find-files "gcc/config"
-                                         "^(gnu-user(64)?|linux-elf)\\.h$")
-                  (("#define LIB_SPEC (.*)$" _ suffix)
-                   ;; Note that with this "lib" spec, we may still add a
-                   ;; RUNPATH to GCC even when `libgcc_s' is not NEEDED.
-                   ;; There's not much that can be done to avoid it, though.
-                   (format #f "#define LIB_SPEC \"-L~a/lib %{!static:-rpath=~a/lib \
-%{!static-libgcc:-rpath=~a/lib64 -rpath=~a/lib}} \" ~a"
+                                         "^gnu-user.*\\.h$")
+                  (("#define GNU_USER_TARGET_LIB_SPEC (.*)$" _ suffix)
+                   ;; Help libgcc_s.so be found (see also below.)  Always use
+                   ;; '-lgcc_s' so that libgcc_s.so is always found by those
+                   ;; programs that use 'pthread_cancel' (glibc dlopens
+                   ;; libgcc_s.so when pthread_cancel support is needed, but
+                   ;; having it in the application's RUNPATH isn't enough; see
+                   ;; <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))
-                  (("#define STARTFILE_SPEC.*$" line)
+                  (("#define GNU_USER_TARGET_STARTFILE_SPEC.*$" line)
                   (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib\"
 #define STANDARD_STARTFILE_PREFIX_2 \"\"
-~a~%"
+~a"
                           libc line))))

              ;; Don't retain a dependency on the build-time sed.
@@ -194,25 +209,51 @@ where the OS part is overloaded to denote a specific ABI---into GCC
      (properties `((gcc-libc . ,(assoc-ref inputs "libc"))))
      (synopsis "GNU Compiler Collection")
      (description
-       "The GNU Compiler Collection includes compiler front ends for C, C++,
-Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well as
-libraries for these languages (libstdc++, libgcj, libgomp,...).
-
-GCC development is a part of the GNU Project, aiming to improve the compiler
-used in the GNU system including the GNU/Linux variant.")
+       "GCC is the GNU Compiler Collection.  It provides compiler front-ends
+for several languages, including C, C++, Objective-C, Fortran, Java, Ada, and
+Go.  It also includes runtime support libraries for these languages.")
      (license gpl3+)
      (home-page "http://gcc.gnu.org/"))))

 (define-public gcc-4.8
  (package (inherit gcc-4.7)
-    (version "4.8.1")
+    (version "4.8.2")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/gcc/gcc-"
                                 version "/gcc-" version ".tar.bz2"))
             (sha256
              (base32
-               "04sqn0ds17ys8l6zn7vyyvjz1a7hsk4zb0381vlw9wnr7az48nsl"))))))
+               "1j6dwgby4g3p3lz7zkss32ghr45zpdidrg8xvazvn91lqxv25p09"))))))
+
+(define (custom-gcc gcc name languages)
+  "Return a custom version of GCC that supports LANGUAGES."
+  (package (inherit gcc)
+    (name name)
+    (arguments
+     (substitute-keyword-arguments `(#:modules ((guix build gnu-build-system)
+                                                (guix build utils)
+                                                (ice-9 regex)
+                                                (srfi srfi-1)
+                                                (srfi srfi-26))
+                                               ,@(package-arguments gcc))
+       ((#:configure-flags flags)
+        `(cons (string-append "--enable-languages="
+                              ,(string-join languages ","))
+               (remove (cut string-match "--enable-languages.*" <>)
+                       ,flags)))))))
+
+(define-public gfortran-4.8
+  (custom-gcc gcc-4.8 "gfortran" '("fortran")))
+
+(define-public gccgo-4.8
+  (custom-gcc gcc-4.8 "gccgo" '("go")))
+
+(define-public gcc-objc-4.8
+  (custom-gcc gcc-4.8 "gcc-objc" '("objc")))
+
+(define-public gcc-objc++-4.8
+  (custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++")))

 (define-public isl
  (package
@@ -221,7 +262,7 @@ used in the GNU system including the GNU/Linux variant.")
    (source (origin
             (method url-fetch)
             (uri (list (string-append
-                         "ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/isl-"
+                         "http://isl.gforge.inria.fr/isl-"
                         version
                         ".tar.bz2")
                        (string-append %gcc-infrastructure
@@ -231,7 +272,7 @@ used in the GNU system including the GNU/Linux variant.")
               "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"))))
    (build-system gnu-build-system)
    (inputs `(("gmp" ,gmp)))
-    (home-page "http://www.kotnet.org/~skimo/isl/")
+    (home-page "http://isl.gforge.inria.fr/")
    (synopsis
     "A library for manipulating sets and relations of integer points bounded
 by linear constraints")
@@ -20,6 +20,7 @@
  #:use-module (guix packages)
  #: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 fontutils)
@@ -40,7 +41,9 @@
             (uri "https://bitbucket.org/libgd/gd-libgd/get/GD_2_0_33.tar.gz")
             (sha256
              (base32
-               "0yrbx8mj9pykyzm0zl1q86xlkdvkajcsf5jmg688vhw9yc5wmbbw"))))
+               "0yrbx8mj9pykyzm0zl1q86xlkdvkajcsf5jmg688vhw9yc5wmbbw"))
+             (patches
+              (list (search-patch "gd-mips64-deplibs-fix.patch")))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases (alist-cons-after
@@ -17,6 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages gdb)
+  #:use-module (gnu packages)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages readline)
  #:use-module (gnu packages dejagnu)
@@ -32,20 +33,22 @@
 (define-public gdb
  (package
    (name "gdb")
-    (version "7.6")
+    (version "7.6.2")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/gdb/gdb-"
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "06yzggy97qka6fs1vdz4q0d2fgrpm3iaj7dzvf1ww377bvryh454"))))
+               "1s6hjqmq7xz10hqx45dgrpfh5mla578shn3zxgnrsv66w4n0wsig"))
+             (patches (list (search-patch "gdb-loongson-madd-fix.patch")))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases (alist-cons-after
                 'configure 'post-configure
                 (lambda _
-                   (patch-makefile-SHELL "gdb/gdbserver/Makefile.in"))
+                   (for-each patch-makefile-SHELL
+                             (find-files "." "Makefile\\.in")))
                 %standard-phases)))
    (inputs
     `(("expat" ,expat)
@@ -53,13 +56,15 @@
       ("gmp" ,gmp)
       ("readline" ,readline)
       ("ncurses" ,ncurses)
-       ("python" ,python)
+       ("python" ,python-wrapper)
       ("texinfo" ,texinfo)
       ("dejagnu" ,dejagnu)))
    (home-page "http://www.gnu.org/software/gdb/")
    (synopsis "The GNU debugger")
    (description
-     "GDB, the GNU Project debugger, allows you to see what is going
-on `inside' another program while it executes -- or what another
-program was doing at the moment it crashed.")
+     "GDB is the GNU debugger.  With it, you can monitor what a program is
+doing while it runs or what it was doing just before a crash.  It allows you
+to specify the runtime conditions, to define breakpoints, and to change how
+the program is running to try to fix bugs.  It can be used to debug programs
+written in C, C++, Ada, Objective-C, Pascal and more.")
    (license gpl3+)))
@@ -40,19 +40,7 @@
    (synopsis
     "Hash library of database functions compatible with traditional dbm")
    (description
-     "GNU dbm (or GDBM, for short) is a library of database functions
-that use extensible hashing and work similar to the standard UNIX dbm.
-These routines are provided to a programmer needing to create and
-manipulate a hashed database.
-
-The basic use of GDBM is to store key/data pairs in a data file.  Each
-key must be unique and each key is paired with only one data item.
-
-The library provides primitives for storing key/data pairs, searching
-and retrieving the data by its key and deleting a key along with its
-data.  It also support sequential iteration over all key/data pairs in a
-database.
-
-For compatibility with programs using old UNIX dbm function, the package
-also provides traditional dbm and ndbm interfaces.")
+     "GDBM is a library for manipulating hashed databases.  It is used to
+store key/value pairs in a file in a manner similar to the Unix dbm library
+and provides interfaces to the traditional file format.")
    (license gpl3+)))
@@ -0,0 +1,90 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 geeqie)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'l:))
+  #: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 libpng)
+  #:use-module ((gnu packages ghostscript)
+                #:select (lcms))
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages xml))
+
+(define-public exiv2                              ; XXX: move elsewhere?
+  (package
+    (name "exiv2")
+    (version "0.23")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://www.exiv2.org/exiv2-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "04bbg2cg6mgcyz435zamx37sp5zw44n2alb59ki1daz71f851yl1"))))
+    (build-system gnu-build-system)
+    (arguments '(#:tests? #f))                    ; no `check' target
+    (propagated-inputs
+     `(("expat" ,expat) ("zlib" ,zlib)))
+    (home-page "http://www.exiv2.org/")
+    (synopsis "Library and command-line utility to manage image metadata")
+    (description
+     "Exiv2 is a C++ library and a command line utility to manage image
+metadata. It provides fast and easy read and write access to the Exif, IPTC
+and XMP metadata of images in various formats.")
+
+    ;; Files under `xmpsdk' are a copy of Adobe's XMP SDK, licensed under the
+    ;; 3-clause BSD license: <http://www.adobe.com/devnet/xmp/sdk/eula.html>.
+    ;; The core is GPLv2+: <https://launchpad.net/ubuntu/precise/+source/exiv2/+copyright>.
+    (license l:gpl2+)))
+
+(define-public geeqie
+  (package
+    (name "geeqie")
+    (version "1.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://sourceforge/geeqie/geeqie-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "1kzy39z9505xkayyx7rjj2wda76xy3ch1s5z35zn8yli54ffhi2m"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(;; ("libchamplain" ,libchamplain)
+       ("intltool" ,intltool)
+       ("lcms" ,lcms)
+       ("exiv2" ,exiv2)
+       ("libpng" ,libpng)
+       ("gtk+" ,gtk+-2)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://geeqie.sourceforge.net")
+    (synopsis "Lightweight GTK+ based image viewer")
+    (description
+     "Geeqie is a lightweight GTK+ based image viewer for Unix like operating
+systems.  It features: EXIF, IPTC and XMP metadata browsing and editing
+interoperability; easy integration with other software; geeqie works on files
+and directories, there is no need to import images; fast preview for many raw
+image formats; tools for image comparison, sorting and managing photo
+collection.  Geeqie was initially based on GQview.")
+    (license l:gpl2+)))
@@ -17,26 +17,42 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages gettext)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:select (gpl3))
  #:use-module (gnu packages)
  #:use-module (guix packages)
  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages xml))

-(define-public gettext
+;; Use that name to avoid clashes with Guile's 'gettext' procedure.
+;;
+;; We used to resort to #:renamer on the user side, but that prevented
+;; circular dependencies involving (gnu packages gettext).  This is because
+;; 'resolve-interface' (as of Guile 2.0.9) iterates eagerly over the used
+;; module when there's a #:renamer, and that module may be empty at that point
+;; in case or circular dependencies.
+(define-public gnu-gettext
  (package
    (name "gettext")
-    (version "0.18.3")
+    (version "0.18.3.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/gettext/gettext-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "0j7rp56c61j4k1bz1xdc041hzv7186yyzhbp95fmc0zq7l2c3wrn"))))
+               "0p940zmmw1lndvdhck2vrazikjhr02affwy47mmpfxqvacrrm3qd"))))
    (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")))
@@ -48,24 +64,13 @@
                                              "posix_spawn")
                       (("/bin/sh")
                        bash))))
-                 %standard-phases)))
+                 %standard-phases))))
    (home-page "http://www.gnu.org/software/gettext/")
    (synopsis "Tools and documentation for translation")
    (description
-     "Usually, programs are written and documented in English, and use
-English at execution time for interacting with users.  Using a common
-language is quite handy for communication between developers,
-maintainers and users from all countries.  On the other hand, most
-people are less comfortable with English than with their own native
-language, and would rather be using their mother tongue for day to
-day's work, as far as possible.  Many would simply love seeing their
-computer screen showing a lot less of English, and far more of their
-own language.
-
-GNU `gettext' is an important step for the GNU Translation Project, as
-bit is an asset on which we may build many other steps. This package
-offers to programmers, translators, and even users, a well integrated
-set of tools and documentation. Specifically, the GNU `gettext'
-utilities are a set of tools that provides a framework to help other
-GNU packages produce multi-lingual messages.")
+     "GNU Gettext is a package providing a framework for translating the
+textual output of programs into multiple languages.  It provides translators
+with the means to create message catalogs, as well as an Emacs mode to work
+with them, and a runtime library to load translated messages from the
+catalogs.  Nearly all GNU packages use Gettext.")
    (license gpl3))) ; some files are under GPLv2+
@@ -136,7 +136,7 @@ printing, and psresize, for adjusting page sizes.")
             ("libtiff" ,libtiff)
             ("perl" ,perl)
             ("pkg-config" ,pkg-config) ; needed to find libtiff
-             ("python" ,python)
+             ("python" ,python-wrapper)
             ("tcl" ,tcl)
             ("zlib" ,zlib)))
   (arguments
@@ -165,10 +165,10 @@ printing, and psresize, for adjusting page sizes.")
      %standard-phases)))))
   (synopsis "PostScript and PDF interpreter")
   (description
-    "GNU Ghostscript is an interpreter for PostScript and Portable Document
-Format (PDF) files.
-It consists of a PostScript interpreter layer, and a graphics
-library.")
+    "Ghostscript is an interpreter for the PostScript language and the PDF
+file format.  It also includes a C library that implements the graphics
+capabilities of the PostScript language.  It supports a wide variety of
+output file formats and printers.")
   (license license:gpl3+)
   (home-page "http://www.gnu.org/software/ghostscript/")))

@@ -0,0 +1,67 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 gkrellm)
+  #: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 gettext)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xorg))
+
+(define-public gkrellm
+  (package
+    (name "gkrellm")
+    (version "2.3.5")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://members.dslextreme.com/users/billw/gkrellm/gkrellm-"
+                          version ".tar.bz2"))
+      (sha256
+       (base32
+        "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gettext" ,gnu-gettext)
+       ("gtk+" ,gtk+-2)
+       ("libice" ,libice)
+       ("libsm" ,libsm)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     `(#:tests? #f ; there is no check target
+       #:phases
+       (alist-delete
+        'configure
+        %standard-phases)
+       #:make-flags
+       (let ((out (assoc-ref %outputs "out")))
+         (list (string-append "INSTALLROOT=" out)
+               "CC=gcc"
+               "X11_LIBS = -lX11 -lSM -lICE -lgmodule-2.0"))))
+    (home-page "http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html")
+    (synopsis "System monitors")
+    (description
+     "GKrellM is a single process stack of system monitors which supports
+applying themes to match its appearance to your window manager, Gtk, or any
+other theme.")
+    (license license:gpl3+)))
@@ -0,0 +1,112 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Guy Grant <gzg@riseup.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages gl)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix packages)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fontutils))
+
+(define-public glu
+  (package
+    (name "glu")
+    (version "9.0.0")
+    (source (origin
+	     (method url-fetch)
+	     (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-"
+				  version ".tar.gz"))
+	     (sha256
+	      (base32 "0r72yyhj09x3krn3kn629jqbwyq50ji8w5ri2pn6zwrk35m4g1s3"))))
+    (build-system gnu-build-system)
+    (inputs `(("mesa" ,mesa)))
+    (home-page "http://www.opengl.org/archives/resources/faq/technical/glu.htm")
+    (synopsis "Mesa OpenGL Utility library")
+    (description
+     "GLU, or OpenGL Utility Library provides some higher-level functionality
+not provided by just OpenGL itself. Some of GLU's Features
+include: Scaling of 2D images and creation of mipmap pyramids,
+Transformation of object coordinates into device coordinates and
+vice versa, Support for NURBS surfaces, Support for tessellation
+of concave or bow tie polygonal primitives, Specialty transformation
+matrices for creating perspective and orthographic projections,
+positioning a camera, and selection/picking, Rendering of disk,
+cylinder, and sphere primitives, Interpreting OpenGL error values
+as ASCII text.")
+    (license (l:x11-style "http://directory.fsf.org/wiki/License:SGIFreeBv2"))))
+
+(define-public freeglut
+  (package
+    (name "freeglut")
+    (version "2.8.1")
+    (source (origin
+	     (method url-fetch)
+	     (uri (string-append "mirror://sourceforge/project/freeglut/freeglut/"
+				  version "/freeglut-" version ".tar.gz"))
+	     (sha256
+	      (base32 "16lrxxxd9ps9l69y3zsw6iy0drwjsp6m26d1937xj71alqk6dr6x"))))
+    (build-system gnu-build-system)
+    (inputs `(("mesa" ,mesa)
+	      ("libx11" ,libx11)
+	      ("libxi" ,libxi)
+	      ("libxrandr" ,libxrandr)
+	      ("libxxf86vm" ,libxxf86vm)
+	      ("inputproto" ,inputproto)
+	      ("xinput" ,xinput)
+	      ("glu" ,glu)))
+    (home-page "http://freeglut.sourceforge.net/")
+    (synopsis "Alternative to the OpenGL Utility Toolkit (GLUT)")
+    (description
+     "Freeglut is a completely Free/OpenSourced alternative to
+the OpenGL Utility Toolkit (GLUT) library. GLUT was originally
+written by Mark Kilgard to support the sample programs in the
+second edition OpenGL 'RedBook'. Since then, GLUT has been used
+in a wide variety of practical applications because it is simple,
+widely available and highly portable.
+
+GLUT (and hence freeglut) allows the user to create and manage windows
+containing OpenGL contexts on a wide range of platforms and also read
+the mouse, keyboard and joystick functions. freeglut is released under
+the X-Consortium license.")
+    (license l:x11)))
+
+(define-public ftgl
+  (package
+    (name "ftgl")
+    (version "2.1.3-rc5")
+    (source (origin
+	     (method url-fetch)
+	     (uri (string-append "mirror://sourceforge/project/ftgl/FTGL%20Source/2.1.3~rc5/ftgl-"
+				  version ".tar.gz"))
+	     (sha256
+	      (base32 "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"))))
+    (build-system gnu-build-system)
+    (inputs `(("freetype" ,freetype)
+	      ("libx11" ,libx11)
+	      ("mesa" ,mesa)
+	      ("glu" ,glu)))
+    (home-page "http://ftgl.sourceforge.net")
+    (synopsis "Font rendering library for OpenGL applications")
+    (description
+     "FTGL is a font rendering library for OpenGL applications. Supported
+rendering modes are: Bitmaps, Anti-aliased pixmaps, Texture maps, Outlines,
+Polygon meshes, and Extruded polygon meshes")
+    (license l:x11)))
@@ -26,17 +26,33 @@
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages)
  #:use-module (gnu packages base)
+  #:use-module (gnu packages bison)
  #:use-module (gnu packages compression)
-  #:use-module ((gnu packages gettext)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages gtk)
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
  #:use-module (gnu packages xml)
-  #:use-module (gnu packages bash))
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages file)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages m4)

-(define-public dbus
+  ;; Export variables up-front to allow circular dependency with the 'xorg'
+  ;; module.
+  #:export (dbus
+            glib
+            gobject-introspection
+            dbus-glib
+            intltool
+            itstool
+            libsigc++
+            glibmm))
+
+(define dbus
  (package
    (name "dbus")
    (version "1.6.4")
@@ -47,11 +63,26 @@
                             version ".tar.gz"))
             (sha256
              (base32
-               "1wacqyfkcpayg7f8rvx9awqg275n5pksxq5q7y21lxjx85x6pfjz"))))
+               "1wacqyfkcpayg7f8rvx9awqg275n5pksxq5q7y21lxjx85x6pfjz"))
+             (patches (list (search-patch "dbus-localstatedir.patch")))))
    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags (list ;; Install the system bus socket under /var.
+                               "--localstatedir=/var"
+
+                               ;; XXX: Fix the following to allow system-wide
+                               ;; config.
+                               ;; "--sysconfdir=/etc"
+
+                               "--with-session-socket-dir=/tmp")))
    (inputs
     `(("expat" ,expat)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+
+       ;; Add a dependency on libx11 so that 'dbus-launch' has support for
+       ;; '--autolaunch'.
+       ("libx11" ,libx11)))
+
    (home-page "http://dbus.freedesktop.org/")
    (synopsis "Message bus for inter-process communication (IPC)")
    (description
@@ -72,43 +103,38 @@ or through unencrypted TCP/IP suitable for use behind a firewall with
 shared NFS home directories.")
    (license license:gpl2+)))                     ; or Academic Free License 2.1

-(define-public glib
+(define glib
  (package
   (name "glib")
-   (version "2.37.1")
+   (version "2.38.0")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnome/sources/"
-                                name "/2.37/"
+                                name "/" (string-take version 4) "/"
                                name "-" version ".tar.xz"))
            (sha256
-             (base32 "1lp705q0g9jlfj24x8fpgjh7awmmara5iyj9kz5lhd49sr9s813k"))))
+             (base32 "0cpzqadqk6z6bmb79p04pykxc8x57rvshh33414cnk41bvgaf4vm"))
+            (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")))))
   (build-system gnu-build-system)
   (outputs '("out"                        ; everything
              "doc"))                      ; 20 MiB of GTK-Doc reference
   (inputs
    `(("coreutils" ,coreutils)
-      ("gettext" ,guix:gettext)
+      ("gettext" ,gnu-gettext)
      ("libffi" ,libffi)
      ("pkg-config" ,pkg-config)
-      ("python" ,python)
+      ("python" ,python-wrapper)
      ("zlib" ,zlib)
      ("perl" ,perl)                              ; needed by GIO tests
      ("dbus" ,dbus)                              ; for GDBus tests
      ("bash" ,bash)
      ("tzdata" ,tzdata)                          ; for tests/gdatetime.c
-
-      ("patch/tests-homedir"
-       ,(search-patch "glib-tests-homedir.patch"))
-      ("patch/tests-desktop"
-       ,(search-patch "glib-tests-desktop.patch"))
-      ("patch/tests-prlimit"
-       ,(search-patch "glib-tests-prlimit.patch"))))
+      ))
   (arguments
-    '(#:patches (list (assoc-ref %build-inputs "patch/tests-homedir")
-                      (assoc-ref %build-inputs "patch/tests-desktop")
-                      (assoc-ref %build-inputs "patch/tests-prlimit"))
-      #:phases (alist-cons-before
+    '(#:phases (alist-cons-before
                'build 'pre-build
                (lambda* (#:key inputs outputs #:allow-other-keys)
                  ;; For tests/gdatetime.c.
@@ -123,13 +149,7 @@ shared NFS home directories.")
                                 "glib/tests/utils.c"
                                 "tests/spawn-test.c")
                    (("/bin/sh")
-                     (string-append (assoc-ref inputs "bash") "/bin/sh")))
-
-                  ;; Honor $(TESTS_ENVIRONMENT).
-                  (substitute* (find-files "." "^Makefile(\\.in)?$")
-                    (("^GTESTER[[:blank:]]*=(.*)$" _ rest)
-                     (string-append "GTESTER = $(TESTS_ENVIRONMENT) "
-                                    rest))))
+                     (string-append (assoc-ref inputs "bash") "/bin/sh"))))
                %standard-phases)

      ;; Note: `--docdir' and `--htmldir' are not honored, so work around it.
@@ -144,7 +164,50 @@ dynamic loading, and an object system.")
   (home-page "http://developer.gnome.org/glib/")
   (license license:lgpl2.0+)))                        ; some files are under lgpl2.1+

-(define-public intltool
+(define gobject-introspection
+  (package
+    (name "gobject-introspection")
+    (version "1.38.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://ftp.gnome.org/pub/GNOME/sources/"
+                   "gobject-introspection/"
+                   (substring version 0 (string-rindex version #\.))
+                   "/gobject-introspection-"
+                   version ".tar.xz"))
+             (sha256
+              (base32 "0wvxyvgajmms2bb6k3pf1rdpnd79xdxamykzvxzmcyn1ag9yax9m"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("bison" ,bison)
+       ("cairo" ,cairo)
+       ("flex" ,flex)
+       ("glib" ,glib)
+       ("libffi" ,libffi)
+       ("pkg-config" ,pkg-config)
+       ("python-2" ,python-2)))
+    (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)))
+         %standard-phases)))
+    (home-page "https://wiki.gnome.org/GObjectIntrospection")
+    (synopsis "Generate interface introspection data for GObject libraries")
+    (description
+     "GObject introspection is a middleware layer between C libraries (using
+GObject) and language bindings.  The C library can be scanned at compile time
+and generate a metadata file, in addition to the actual native C library.  Then
+at runtime, language bindings can read this metadata and automatically provide
+bindings to call into the C library.")
+    ; Some bits are distributed under the LGPL2+, others under the GPL2+
+    (license license:gpl2+)))
+
+(define intltool
  (package
    (name "intltool")
    (version "0.50.2")
@@ -160,7 +223,10 @@ dynamic loading, and an object system.")
    (propagated-inputs
     `(;; Propagate gettext because users expect it to be there, and so does
       ;; the `intltool-update' script.
-       ("gettext" ,guix:gettext)
+       ("gettext" ,gnu-gettext)
+
+       ;; `file' is used by `intltool-update' too.
+       ("file" ,file)

       ("perl-xml-parser" ,perl-xml-parser)
       ("perl" ,perl)))
@@ -181,3 +247,131 @@ The intltool collection can be used to do these things:
    Merge back the translations from .po files into .xml, .desktop and
    oaf files. This merge step will happen at build resp. installation time.")
    (license license:gpl2+)))
+
+(define itstool
+  (package
+    (name "itstool")
+    (version "1.2.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://files.itstool.org/itstool/itstool-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "1akq75aflihm3y7js8biy7b5mw2g11vl8yq90gydnwlwp0zxdzj6"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+     `(("libxml2" ,libxml2)
+       ("python-2" ,python-2)))
+    (home-page "http://www.itstool.org")
+    (synopsis "Tool to translate XML documents with PO files")
+    (description
+     "ITS Tool allows you to translate your XML documents with PO files, using
+rules from the W3C Internationalization Tag Set (ITS) to determine what to
+translate and how to separate it into PO file messages.
+
+PO files are the standard translation format for GNU and other Unix-like
+systems.  They present translatable information as discrete messages, allowing
+each message to be translated independently.  In contrast to whole-page
+translation, translating with a message-based format like PO means you can
+easily track changes to the source document down to the paragraph.  When new
+strings are added or existing strings are modified, you only need to update the
+corresponding messages.
+
+ITS Tool is designed to make XML documents translatable through PO files by
+applying standard ITS rules, as well as extension rules specific to ITS Tool.
+ITS also provides an industry standard way for authors to override translation
+information in their documents, such as whether a particular element should be
+translated.")
+    (license license:gpl3+)))
+
+(define dbus-glib
+  (package
+    (name "dbus-glib")
+    (version "0.100.2")
+    (source (origin
+             (method url-fetch)
+             (uri
+              (string-append "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-"
+                             version ".tar.gz"))
+             (sha256
+              (base32
+               "1ibav91yg70f2l3l18cr0hf4mna1h9d4mrg0c60w4l8zjbd45fx5"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("dbus" ,dbus)
+       ("expat" ,expat)
+       ("glib" ,glib)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://dbus.freedesktop.org/doc/dbus-glib/")
+    (synopsis "D-Bus GLib bindings")
+    (description
+     "GLib bindings for D-Bus.  The package is obsolete and superseded
+by GDBus included in Glib.")
+    (license license:gpl2)))                     ; or Academic Free License 2.1
+
+(define libsigc++
+  (package
+    (name "libsigc++")
+    (version "2.3.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnome/sources/libsigc++/2.3/libsigc++-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "14q3sq6d43f6wfcmwhw4v1aal4ba0h5x9v6wkxy2dnqznd95il37"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (native-inputs `(("m4" ,m4)))
+    (home-page "http://libsigc.sourceforge.net/")
+    (synopsis "Type-safe callback system for standard C++")
+    (description
+     "libsigc++ implements a type-safe callback system for standard C++.  It
+allows you to define signals and to connect those signals to any callback
+function, either global or a member function, regardless of whether it is
+static or virtual.
+
+It also contains adaptor classes for connection of dissimilar callbacks and
+has an ease of use unmatched by other C++ callback libraries.")
+    (license license:lgpl2.1+)))
+
+(define glibmm
+  (package
+    (name "glibmm")
+    (version "2.37.7")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnome/sources/glibmm/2.37/glibmm-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0mms4yl5izsya1135772z4jkb184ss86x0wlg6dm7yvwxvb6bjlw"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (alist-cons-before
+                 'build 'pre-build
+                 (lambda _
+                   ;; This test uses /etc/fstab as an example file to read
+                   ;; from; choose a better example.
+                   (substitute* "tests/giomm_simple/main.cc"
+                     (("/etc/fstab")
+                      (string-append (getcwd)
+                                     "/tests/giomm_simple/main.cc")))
+
+                   ;; This test does a DNS lookup, and then expects to be able
+                   ;; to open a TLS session; just skip it.
+                   (substitute* "tests/giomm_tls_client/main.cc"
+                     (("Gio::init.*$")
+                      "return 77;\n")))
+                 %standard-phases)))
+    (inputs `(("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("libsigc++" ,libsigc++)
+       ("glib" ,glib)))
+    (home-page "http://gtkmm.org/")
+    (synopsis "C++ interface to the GLib library")
+    (description
+     "glibmm provides a C++ programming interface to the part of GLib that are
+useful for C++.")
+    (license license:lgpl2.1+)))
@@ -28,14 +28,14 @@
 (define-public global                             ; a global variable
  (package
    (name "global")
-    (version "6.2.8")
+    (version "6.2.9")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/global/global-"
                                 version ".tar.gz"))
             (sha256
              (base32
-               "1l6g51kff5010gwmw08jbks1mssgddz7wggjvfsky3g000jkpvf1"))))
+               "00y38kp0zbpjl9c9phldy7j2ihqc54qn4cdgk0azbjdsv75k3n6q"))))
    (build-system gnu-build-system)
    (inputs `(("ncurses" ,ncurses)
              ("libtool" ,libtool)))
@@ -46,12 +46,8 @@
    (home-page "http://www.gnu.org/software/global/")
    (synopsis "Cross-environment source code tag system")
    (description
-     "GNU GLOBAL is a source code tagging system that works the same way
-across diverse environments (Emacs, vi, less, Bash, web browser, etc).
-You can locate specified objects in source files and move there easily.
-It is useful for hacking a large project containing many
-subdirectories, many #ifdef and many main() functions.  It is similar
-to ctags or etags but is different from them at the point of
-independence of any editor.  It runs on a UNIX (POSIX) compatible
-operating system like GNU and BSD.")
+     "GLOBAL is a source code tagging system that functions in the same way
+across a wide array of environments, such as different text editors, shells
+and web browsers.  The resulting tags are useful for quickly moving around in
+a large, deeply nested project.")
    (license gpl3+)))
@@ -0,0 +1,357 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 gnome)
+  #:use-module ((guix licenses) #:select (gpl2 gpl2+ lgpl2.0+ lgpl2.1+ lgpl3))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages pdf)
+  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages libcanberra)
+  #:use-module (gnu packages libpng)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg))
+
+(define-public brasero
+  (package
+    (name "brasero")
+    (version "3.8.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnome/sources/brasero/3.8/brasero-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "1r5wjsrm47amdaf862ymkdlwlb636c45wg14x20hdr99c653d2nr"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+     `(("hicolor-icon-theme" ,hicolor-icon-theme)))
+    (inputs
+     `(("glib" ,glib)
+       ("gnome-doc-utils" ,gnome-doc-utils)
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("gtk+" ,gtk+)
+       ("intltool" ,intltool)
+       ("itstool" ,itstool)
+       ("libcanberra" ,libcanberra)
+       ("libice" ,libice)
+       ("libnotify" ,libnotify)
+       ("libsm" ,libsm)
+       ("libxml2" ,libxml2)
+       ("pkg-config" ,pkg-config)))
+    (home-page "https://projects.gnome.org/brasero/")
+    (synopsis "CD/DVD burning tool for Gnome")
+    (description "Brasero is an application to burn CD/DVD for the Gnome
+Desktop.  It is designed to be as simple as possible and has some unique
+features to enable users to create their discs easily and quickly.")
+    (license gpl2+)))
+
+(define-public gnome-doc-utils
+  (package
+    (name "gnome-doc-utils")
+    (version "0.20.10")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnome/sources/" name "/0.20/"
+                          name "-" version ".tar.xz"))
+      (sha256
+       (base32
+        "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("intltool" ,intltool)
+       ("libxml2" ,libxml2)
+       ("libxslt" ,libxslt)
+       ("pkg-config" ,pkg-config)
+       ("python-2" ,python-2)))
+    (arguments
+     `(#:tests? #f)) ; tries to load http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd
+    (home-page "https://wiki.gnome.org/GnomeDocUtils")
+    (synopsis
+     "Documentation utilities for the Gnome project")
+    (description
+     "Gnome-doc-utils is a collection of documentation utilities for the
+Gnome project.  It includes xml2po tool which makes it easier to translate
+and keep up to date translations of documentation.")
+    (license gpl2+))) ; xslt under lgpl
+
+(define-public libgnome-keyring
+  (package
+    (name "libgnome-keyring")
+    (version "3.6.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "mirror://gnome/sources/libgnome-keyring/3.6/libgnome-keyring-"
+                   version
+                   ".tar.xz"))
+             (sha256
+              (base32
+               "0c4qrjpmv1hqga3xv6wsq2z10x2n78qgw7q3k3s01y1pggxkgjkd"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)))
+    (inputs
+     `(("pkg-config" ,pkg-config)
+       ("libgcrypt" ,libgcrypt)
+       ("dbus" ,dbus)))
+    (propagated-inputs
+     ;; Referred to in .h files and .pc.
+     `(("glib" ,glib)))
+    (home-page "http://www.gnome.org")
+    (synopsis "Accessing passwords from the GNOME keyring")
+    (description
+     "Client library to access passwords from the GNOME keyring.")
+
+    ;; Though a couple of files are LGPLv2.1+.
+    (license lgpl2.0+)))
+
+(define-public evince
+  (package
+    (name "evince")
+    (version "3.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnome/sources/evince/3.6/evince-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "1da1pij030dh8mb0pr0jnyszgsbjnh8lc17rj5ii52j3kmbv51qv"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--disable-nautilus")
+
+       ;; FIXME: Tests fail with:
+       ;;   ImportError: No module named gi.repository
+       ;; Where should that module come from?
+       #:tests? #f
+
+       #:phases (alist-cons-after
+                 'install 'set-mime-search-path
+                 (lambda* (#:key inputs outputs #:allow-other-keys)
+                   ;; Wrap 'evince' so that it knows where MIME info is.
+                   (let ((out  (assoc-ref outputs "out"))
+                         (mime (assoc-ref inputs "shared-mime-info")))
+                     (wrap-program (string-append out "/bin/evince")
+                                   `("XDG_DATA_DIRS" ":" prefix
+                                     ,(list (string-append mime "/share")
+                                            (string-append out "/share"))))))
+                 %standard-phases)))
+    (inputs
+     `(("libspectre" ,libspectre)
+       ;; ("djvulibre" ,djvulibre)
+       ("ghostscript" ,ghostscript)
+       ("poppler" ,poppler)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("libgnome-keyring" ,libgnome-keyring)
+       ("gnome-icon-theme" ,gnome-icon-theme)
+       ("itstool" ,itstool)
+       ("gdk-pixbuf" ,gdk-pixbuf)
+       ("atk" ,atk)
+       ("pango" ,pango)
+       ("gtk+" ,gtk+)
+       ("glib" ,glib)
+       ("libxml2" ,libxml2)
+       ("pkg-config" ,pkg-config)
+       ("libsm" ,libsm)
+       ("libice" ,libice)
+       ("shared-mime-info" ,shared-mime-info)
+
+       ;; For tests.
+       ("dogtail" ,python2-dogtail)))
+    (native-inputs
+     `(("intltool" ,intltool)))
+    (home-page
+     "http://www.gnome.org/projects/evince/")
+    (synopsis "GNOME's document viewer")
+    (description
+     "Evince is a document viewer for multiple document formats.  It
+currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal
+of Evince is to replace the multiple document viewers that exist
+on the GNOME Desktop with a single simple application.")
+    (license gpl2+)))
+
+(define-public gsettings-desktop-schemas
+  (package
+    (name "gsettings-desktop-schemas")
+    (version "3.10.0")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnome/sources/" name "/"
+                          (string-copy version 0 (string-rindex version #\.)) "/"
+                          name "-" version ".tar.xz"))
+      (sha256
+       (base32
+        "1km8qxwrzvravmg8j680qv64bwnwbdgrmy8bqmhs0dgxn2b1as6a"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("glib" ,glib)
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (home-page "https://launchpad.net/gsettings-desktop-schemas")
+    (synopsis
+     "GNOME settings for various desktop components")
+    (description
+     "Gsettings-desktop-schemas contains a collection of GSettings schemas
+for settings shared by various components of the GNOME desktop.")
+    (license lgpl2.1+)))
+
+(define-public icon-naming-utils
+  (package
+    (name "icon-naming-utils")
+    (version "0.8.90")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://tango.freedesktop.org/releases/icon-naming-utils-"
+                          version ".tar.bz2"))
+      (sha256
+       (base32
+        "1mc3v28fdfqanx3lqx233vcr4glb4c2376k0kx2v91a4vxwqcdxi"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("perl" ,perl)
+       ("perl-xml-simple" ,perl-xml-simple)))
+    (home-page "http://tango.freedesktop.org/Standard_Icon_Naming_Specification")
+    (synopsis
+     "Utility to implement the Freedesktop Icon Naming Specification")
+    (description
+     "To help with the transition to the Freedesktop Icon Naming
+Specification, the icon naming utility maps the icon names used by the
+GNOME and KDE desktops to the icon names proposed in the specification.")
+    (license lgpl2.1+)))
+
+(define-public gnome-icon-theme
+  (package
+    (name "gnome-icon-theme")
+    (version "3.10.0")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnome/sources/" name "/"
+                          (string-copy version 0 (string-rindex version #\.)) "/"
+                          name "-" version ".tar.xz"))
+      (sha256
+       (base32
+        "1xinbgkkvlhazj887ajcl13i7kdc1wcca02jwxzvjrvchjsp4m66"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("icon-naming-utils" ,icon-naming-utils)
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://art.gnome.org/")
+    (synopsis
+     "GNOME icon theme")
+    (description
+     "Icons for the GNOME desktop.")
+    (license lgpl3))) ; or Creative Commons BY-SA 3.0
+
+(define-public shared-mime-info
+  (package
+    (name "shared-mime-info")
+    (version "1.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://freedesktop.org/~hadess/shared-mime-info-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0y5vi0vr6rbhvfzcfg57cfskn362bpvcpca9cy598nmr87i6lld5"))))
+    (build-system gnu-build-system)
+    (arguments
+     ;; The build system appears not to be parallel-safe.
+     '(#:parallel-build? #f))
+    (inputs
+     `(("glib" ,glib)
+       ("libxml2" ,libxml2)
+       ("pkg-config" ,pkg-config)))
+    (native-inputs
+     `(("intltool" ,intltool)))
+    (home-page "http://freedesktop.org/wiki/Software/shared-mime-info")
+    (synopsis "Database of common MIME types")
+    (description
+     "The shared-mime-info package contains the core database of common types
+and the update-mime-database command used to extend it.  It requires glib2 to
+be installed for building the update command.  Additionally, it uses intltool
+for translations, though this is only a dependency for the maintainers.  This
+database is translated at Transifex.")
+    (license gpl2+)))
+
+(define-public hicolor-icon-theme
+  (package
+    (name "hicolor-icon-theme")
+    (version "0.12")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "0wzc7g4ldb2l8zc0x2785ck808c03i857jji942ikakyc68adp4y"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f)) ; no check target
+    (home-page "http://icon-theme.freedesktop.org/releases/")
+    (synopsis
+     "Freedesktop icon theme")
+    (description
+     "Freedesktop icon theme.")
+    (license gpl2)))
+
+(define-public libnotify
+  (package
+    (name "libnotify")
+    (version "0.7.6")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnome/sources/" name "/"
+                          (string-copy version 0 (string-rindex version #\.)) "/"
+                          name "-" version ".tar.xz"))
+      (sha256
+       (base32
+        "0dyq8zgjnnzcah31axnx6afb21kl7bks1gvrg4hjh3nk02j1rxhf"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gdk-pixbuf" ,gdk-pixbuf)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("libpng" ,libpng)
+       ("pkg-config" ,pkg-config)))
+    (home-page "https://developer-next.gnome.org/libnotify/")
+    (synopsis
+     "GNOME desktop notification library")
+    (description
+     "Libnotify is a library that sends desktop notifications to a
+notification daemon, as defined in the Desktop Notifications spec. These
+notifications can be used to inform the user about an event or display
+some form of information without getting in the user's way.")
+    (license lgpl2.1+)))
@@ -0,0 +1,49 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 gnu-pw-mgr)
+  #: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 which))
+
+(define-public gnu-pw-mgr
+  (package
+    (name "gnu-pw-mgr")
+    (version "1.0")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/gnu-pw-mgr/gnu-pw-mgr-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "0sn9gzngqkrv74iwxzn5ldqx3w73w9paldcdh8rsv9yvgarv2bm4"))))
+    (build-system gnu-build-system)
+    (inputs `(("which" ,which)))
+    (home-page "http://www.gnu.org/software/gnu-pw-mgr/")
+    (synopsis "Retrieve login credentials without recording passwords")
+    (description
+     "This program is designed to make it easy to reconstruct difficult
+passwords when they are needed while limiting the risk of attack.  The
+user of this program inputs a self-defined transformation of a web
+site URL and obtains the password and user name hint for that web
+site.")
+    (license gpl3+)))
@@ -0,0 +1,124 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 gnunet)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages geeqie)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages gnutls)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages libjpeg)
+  #:use-module (gnu packages libtiff)
+  #:use-module (gnu packages oggvorbis)
+  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages video)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public libextractor
+  (package
+   (name "libextractor")
+   (version "1.2")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://gnu/libextractor/libextractor-"
+                                version ".tar.gz"))
+            (sha256
+             (base32
+              "1n7z6s5ils6xmf6b0z1xda41maxj94c1n6wlyyxmacs5lrkh2a96"))))
+   (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.
+   ;; FIXME:
+   ;; The following dependencies are all optional, but should be
+   ;; available for maximum coverage:
+   ;; * libarchive
+   ;; * libgif (giflib)
+   ;; * libgtk+ >= 3.0.0 (may probably drop glib then as a propagated input of
+   ;;                     gtk)
+   ;; * libgsf
+   ;; * libmagic (file)
+   ;; * libmpeg2
+   ;; * libmp4v2
+   ;; * librpm
+   ;; * libsmf
+   ;; * libtidy
+   (inputs
+    `(("exiv2" ,exiv2)
+      ("flac" ,flac)
+      ("ffmpeg" ,ffmpeg)
+      ("gettext" ,gnu-gettext)
+      ("glib" ,glib)
+      ("gstreamer" ,gstreamer)
+      ("gst-plugins-base" ,gst-plugins-base)
+      ("libjpeg" ,libjpeg)
+      ("libogg" ,libogg)
+      ("libtiff" ,libtiff)
+      ("libtool" ,libtool)
+      ("libvorbis" ,libvorbis)
+      ("pkg-config" ,pkg-config)
+      ("zlib" ,zlib)))
+   (synopsis "Library to extract meta-data from media files")
+   (description
+    "GNU libextractor is a library for extracting metadata from files.  It
+supports a very large number of file formats, including audio files, document
+files, and archive files.  Each file format is implemented as a plugin, so
+new formats can be added easily.  The package also contains a command-line
+tool to extract metadata from a file and print the results.")
+   (license license:gpl3+)
+   (home-page "http://www.gnu.org/software/libextractor/")))
+
+(define-public libmicrohttpd
+  (package
+   (name "libmicrohttpd")
+   (version "0.9.32")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
+                                version ".tar.gz"))
+            (sha256
+             (base32
+              "176qf3xhpq1wa3fd9h8b6996bjf83yna1b30lhb6ccrv67hvhm75"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(("curl" ,curl)
+      ("gnutls" ,gnutls)
+      ("libgcrypt" ,libgcrypt)
+      ("openssl" ,openssl)
+      ("zlib" ,zlib)))
+   (arguments
+    `(#:parallel-tests? #f))
+   (synopsis "C library implementing an HTTP 1.1 server")
+   (description
+    "GNU libmicrohttpd is a small, embeddable HTTP server implemented as a
+C library.  It makes it easy to run an HTTP server as part of another
+application.  The library is fully HTTP 1.1 compliant.  It can listen on
+multiple ports, supports four different threading models, and supports
+IPv6.  It
+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/")))
@@ -57,25 +57,24 @@ Daemon and possibly more in the future.")
 (define-public libgcrypt
  (package
    (name "libgcrypt")
-    (version "1.5.2")
+    (version "1.5.3")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "0gwnzqd64cpwdmk93nll54nidsr74jpimxzj4p4z7502ylwl66p4"))))
+               "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw"))))
    (build-system gnu-build-system)
    (propagated-inputs
     `(("libgpg-error" ,libgpg-error)))
    (home-page "http://gnupg.org/")
    (synopsis "Cryptographic function library")
    (description
-     "GNU Libgcrypt is a general purpose cryptographic library based on
-the code from GnuPG.  It provides functions for all
-cryptographic building blocks: symmetric ciphers, hash
-algorithms, MACs, public key algorithms, large integer
-functions, random numbers and a lot of supporting functions.")
+     "Libgcrypt is a general-purpose cryptographic library.  It provides the
+standard cryptographic building blocks such as symmetric ciphers, hash
+algorithms, public key algorithms, large integer functions and random number
+generation.")
    (license lgpl2.0+)))

 (define-public libassuan
@@ -106,7 +105,7 @@ provided.")
 (define-public libksba
  (package
    (name "libksba")
-    (version "1.2.0")
+    (version "1.3.0")
    (source
     (origin
      (method url-fetch)
@@ -115,7 +114,7 @@ provided.")
            version ".tar.bz2"))
      (sha256
       (base32
-        "0jwk7hm3x3g4hd7l12z3d79dy7359x7lc88dq6z7q0ixn1jwxbq9"))))
+        "0w8rfb6yhcwkwzvjafrashcygy4hd9xwwmvlnkfd1m2h0paywqas"))))
    (build-system gnu-build-system)
    (propagated-inputs
     `(("libgpg-error" ,libgpg-error)))
@@ -131,7 +130,7 @@ specifications are building blocks of S/MIME and TLS.")
 (define-public gnupg
  (package
    (name "gnupg")
-    (version "2.0.20")
+    (version "2.0.22")
    (source
     (origin
      (method url-fetch)
@@ -139,12 +138,10 @@ specifications are building blocks of S/MIME and TLS.")
                          ".tar.bz2"))
      (sha256
       (base32
-        "16mp0j5inrcqcb3fxbn0b3aamascy3n923wiy0y8marc0rzrp53f"))))
+        "0lg210acj2rxq291q4cwamg9gx6gh2prb1xa93y5jhw5b6r0lza3"))))
    (build-system gnu-build-system)
    (inputs
-     `(;; TODO: Add missing optional dep libusb.
-;;        ("libusb" ,libusb)
-       ("bzip2" ,guix:bzip2)
+     `(("bzip2" ,guix:bzip2)
       ("curl" ,curl)
       ("libassuan" ,libassuan)
       ("libgcrypt" ,libgcrypt)
@@ -167,17 +164,45 @@ specifications are building blocks of S/MIME and TLS.")
    (home-page "http://gnupg.org/")
    (synopsis "GNU Privacy Guard")
    (description
-     "GnuPG is the GNU project's complete and free implementation of
-the OpenPGP standard as defined by RFC4880.  GnuPG allows to
-encrypt and sign your data and communication, features a
-versatile key managment system as well as access modules for all
-kind of public key directories.  GnuPG, also known as GPG, is a
-command line tool with features for easy integration with other
-applications.  A wealth of frontend applications and libraries
-are available.  Version 2 of GnuPG also provides support for
-S/MIME.")
+     "The GNU Privacy Guard is a complete implementation of the OpenPGP
+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).")
    (license gpl3+)))

+(define-public gpgme
+  (package
+    (name "gpgme")
+    (version "1.4.3")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnupg/gpgme/gpgme-" version
+                          ".tar.bz2"))
+      (sha256
+       (base32
+        "15h429h6pd67iiv580bjmwbkadpxsdppw0xrqpcm4dvm24jc271d"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gnupg" ,gnupg)
+       ("libassuan" ,libassuan)
+       ("libgpg-error" ,libgpg-error)))
+    (home-page "http://www.gnupg.org/related_software/gpgme/")
+    (synopsis "library providing simplified access to GnuPG functionality")
+    (description
+     "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
+easier for applications.  It provides a High-Level Crypto API for encryption,
+decryption, signing, signature verification and key management.  Currently
+it uses GnuPG as its backend but the API isn't restricted to this engine.
+
+Because the direct use of GnuPG from an application can be a complicated
+programming task, it is suggested that all software should try to use GPGME
+instead.  This way bug fixes or improvements can be done at a central place
+and every application benefits from this.")
+    (license lgpl2.1+)))
+
 (define-public pius
  (package
   (name "pius")
@@ -191,7 +216,8 @@ S/MIME.")
                     "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d"))))
   (build-system gnu-build-system)
   (inputs `(("perl" ,perl)
-             ("python" ,python)))
+             ("python" ,python-wrapper)
+             ("gpg" ,gnupg)))
   (arguments
    `(#:tests? #f
      #:phases
@@ -203,16 +229,19 @@ S/MIME.")
        (lambda* (#:key #:allow-other-keys) #t)
       (alist-replace
        'install
-        (lambda* (#:key outputs #:allow-other-keys)
-          (let ((out (assoc-ref outputs "out")))
+        (lambda* (#:key inputs outputs #:allow-other-keys)
+          (let* ((out (assoc-ref outputs "out"))
+                 (gpg (string-append (assoc-ref inputs "gpg")
+                                     "/bin/gpg2")))
            (mkdir out)
            (mkdir (string-append out "/bin"))
-            (for-each
-              (lambda (filename)
-                (copy-file filename (string-append out "/bin/" filename)))
-              '("pius" "pius-keyring-mgr" "pius-party-worksheet"))))
+            (for-each (lambda (file)
+                        (substitute* file
+                          (("/usr/bin/gpg") gpg))
+                        (copy-file file (string-append out "/bin/" file)))
+                      '("pius" "pius-keyring-mgr" "pius-party-worksheet"))))
       %standard-phases)))))
-   (synopsis "programs to simplify gnupg key signing")
+   (synopsis "Programs to simplify GnuPG key signing")
   (description
    "Pius (PGP Individual UID Signer) helps attendees of PGP keysigning
 parties. It is the main utility and makes it possible to quickly and easily
@@ -46,15 +46,16 @@
    (home-page "http://www.gnu.org/software/libtasn1/")
    (synopsis "ASN.1 library")
    (description
-     "Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some
-other packages.  The goal of this implementation is to be highly
-portable, and only require an ANSI C89 platform.")
+     "GNU libtasn1 is a library implementing the ASN.1 notation.  It is used
+for transmitting machine-neutral encodings of data objects in computer
+networking, allowing for formal validation of data according to some
+specifications.")
    (license lgpl2.0+)))

 (define-public gnutls
  (package
    (name "gnutls")
-    (version "3.2.1")
+    (version "3.2.4")
    (source (origin
             (method url-fetch)
             (uri
@@ -64,20 +65,14 @@ portable, and only require an ANSI C89 platform.")
                             version ".tar.xz"))
             (sha256
              (base32
-               "1zi2kq3vcbqdy9khl7r6pgk4hgwibniasm9k6siasdvqjijq3ymb"))))
+               "0zvhzy87v9dfxfvmg1pl951kw55rp647cqdza8942fxq7spp158i"))))
    (build-system gnu-build-system)
-    (arguments
-      `(#:patches (list (assoc-ref %build-inputs
-                                   "patch/fix-tests"))
-        #:patch-flags '("-p0")))
    (native-inputs
     `(("pkg-config" ,pkg-config)))
    (inputs
     `(("guile" ,guile-2.0)
       ("zlib" ,guix:zlib)
-       ("perl" ,perl)
-       ("patch/fix-tests"
-        ,(search-patch "gnutls-fix-tests-on-32-bits-system.patch"))))
+       ("perl" ,perl)))
    (propagated-inputs
     `(("libtasn1" ,libtasn1)
       ("nettle" ,nettle)
@@ -85,15 +80,8 @@ portable, and only require an ANSI C89 platform.")
    (home-page "http://www.gnu.org/software/gnutls/")
    (synopsis "Transport layer security library")
    (description
-     "GnuTLS is a project that aims to develop a library which provides
-a secure layer, over a reliable transport layer. Currently the GnuTLS
-library implements the proposed standards by the IETF's TLS working
-group.
-
-Quoting from the TLS protocol specification:
-
-\"The TLS protocol provides communications privacy over the
-Internet. The protocol allows client/server applications to communicate
-in a way that is designed to prevent eavesdropping, tampering, or
-message forgery.\"")
+     "GnuTLS is a secure communications library implementing the SSL, TLS
+and DTLS protocols.  It is provided in the form of a C library to support the
+protocols, as well as to parse and write X.5009, PKCS 12, OpenPGP and other
+required structures.")
    (license lgpl2.1+)))
@@ -0,0 +1,97 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 gnuzilla)
+  #:use-module (gnu packages)
+  #: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 glib)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages yasm)
+  #:use-module (gnu packages zip))
+
+(define-public icecat
+  (package
+    (name "icecat")
+    (version "24.0")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/gnuzilla/"
+                          (substring version 0 (string-index version #\.))
+                          "/icecat-" version ".tar.gz"))
+      (sha256
+       (base32
+        "1vxzjwmhad6yxx4sk9zvapjgv5salcv10id061q0991ii3dycy9a"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("dbus" ,dbus)
+       ("dbus-glib" ,dbus-glib)
+       ("glib" ,glib)
+       ("gstreamer" ,gstreamer-0.10)
+       ("gst-plugins-base" ,gst-plugins-base-0.10)
+       ("gtk+" ,gtk+-2)
+       ("libxt" ,libxt)
+       ("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)))
+    (arguments
+     `(#:tests? #f ; no check target
+       #:phases
+         (alist-cons-before
+          'patch-source-shebangs 'sanitise
+          (lambda _
+            ;; delete dangling symlinks
+            (delete-file "browser/base/content/.#aboutDialog.xul")
+            (delete-file "browser/base/content/abouthome/.#aboutHome.xhtml")
+            (delete-file "browser/branding/unofficial/content/.#aboutHome.xhtml")
+            (delete-file "toolkit/crashreporter/google-breakpad/autotools/compile"))
+         (alist-replace
+          'configure
+          ;; configure does not work followed by both "SHELL=..." and
+          ;; "CONFIG_SHELL=..."; set environment variables instead
+          (lambda* (#:key outputs configure-flags #:allow-other-keys)
+            (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
+          %standard-phases))))
+    (home-page "http://www.gnu.org/software/gnuzilla/")
+    (synopsis "Entirely free browser derived from Mozilla Firefox")
+    (description
+     "IceCat is the GNU version of the Firefox browser.  It is entirely free
+software, which does not recommend non-free plugins and addons. It also
+features built-in privacy-protecting features.")
+    (license license:mpl2.0))) ; and others, see toolkit/content/license.html
@@ -39,15 +39,8 @@
    (home-page "http://www.gnu.org/software/gperf/")
    (synopsis "Perfect hash function generator")
    (description
-     "GNU gperf is a perfect hash function generator.  For a given
-list of strings, it produces a hash function and hash table, in
-form of C or C++ code, for looking up a value depending on the
-input string.  The hash function is perfect, which means that
-the hash table has no collisions, and the hash table lookup
-needs a single string comparison only.
-
-GNU gperf is highly customizable.  There are options for
-generating C or C++ code, for emitting switch statements or
-nested ifs instead of a hash table, and for tuning the algorithm
-employed by gperf.")
+     "gperf is a perfect hash function generator.  For a given list of strings,
+it produces a hash function and hash table in C or C++ code. That the hash
+function is perfect means that no collisions can exist and that look-ups can be
+made by single string comparisons.")
    (license gpl3+)))
@@ -48,24 +48,8 @@
    (home-page "https://www.gnu.org/software/gprolog/")
    (synopsis "Prolog compiler")
    (description
-     "GNU Prolog is a free Prolog compiler with constraint solving over
-finite domains developed by Daniel Diaz.
-
-GNU Prolog accepts Prolog+constraint programs and produces native
-binaries (like gcc does from a C source).  The obtained executable is
-then stand-alone.  The size of this executable can be quite small since
-GNU Prolog can avoid to link the code of most unused built-in
-predicates.  The performances of GNU Prolog are very
-encouraging (comparable to commercial systems).
-
-Beside the native-code compilation, GNU Prolog offers a classical
-interactive interpreter (top-level) with a debugger.
-
-The Prolog part conforms to the ISO standard for Prolog with many
-extensions very useful in practice (e.g., global variables, OS
-interface, sockets).
-
-GNU Prolog also includes an efficient constraint solver over finite domains.
-This opens contraint logic programming to the user combining the power of
-constraint programming to the declarativity of logic programming.")
+     "GNU Prolog is a standards-compliant Prolog compiler with constraint
+solving over finite domains.  It accepts Prolog+ constraint programs and
+produces a compiled, native binary which can function in a stand-alone
+manner.  It also features an interactive interpreter.")
    (license (list gpl2+ lgpl3+))))
@@ -47,7 +47,8 @@
             ("texinfo" ,texinfo)))
   (synopsis "Typesetting from plain text mixed with formatting commands")
   (description
-    "GNU Troff (Groff) is a software typesetting package which reads plain
-text mixed with formatting commands and produces formatted output.")
+    "Groff is a typesetting package that reads plain text and produces
+formatted output based on formatting commands contained within the text.  It
+is usually the formatter of \"man\" documentation pages.")
   (license gpl3+)
   (home-page "http://www.gnu.org/software/groff/")))
@@ -24,12 +24,38 @@
  #:use-module (gnu packages)
  #:use-module (gnu packages flex)
  #:use-module (gnu packages bison)
-  #:use-module ((gnu packages gettext) #:renamer (symbol-prefix-proc 'gnu:))
+  #:use-module (gnu packages gettext)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages qemu)
  #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages cdrom))
+  #:use-module (gnu packages cdrom)
+  #:use-module (srfi srfi-1))
+
+(define qemu-for-tests
+  ;; Newer QEMU versions, such as 1.5.1, no longer support the 'shutdown'
+  ;; instruction.  This leads to test hangs, as reported at
+  ;; <https://bugs.launchpad.net/bugs/947597> and fixed at
+  ;; <http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/4828>.
+  ;; Work around it by using an older QEMU.
+  (package (inherit qemu-headless)
+    (version "1.3.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://wiki.qemu-project.org/download/qemu-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip"))))
+
+    ;; With recent GLib versions, we get a test failure:
+    ;;   ERROR:tests/rtc-test.c:176:check_time: assertion failed (ABS(t - s) <= wiggle): (382597824 <= 2)
+    ;; Simply disable the tests.
+    (arguments `(#:tests? #f
+                          ,@(package-arguments qemu)))
+
+    ;; The manual fails to build with Texinfo 5.x.
+    (native-inputs (alist-delete "texinfo" (package-native-inputs qemu)))))

 (define-public grub
  (package
@@ -41,11 +67,11 @@
                                 version ".tar.xz"))
             (sha256
              (base32
-               "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"))))
+               "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"))
+             (patches (list (search-patch "grub-gets-undeclared.patch")))))
    (build-system gnu-build-system)
    (arguments
-     '(#:patches (list (assoc-ref %build-inputs "patch/gets"))
-       #:configure-flags '("--disable-werror")
+     '(#:configure-flags '("--disable-werror")
       #:phases (alist-cons-before
                 'patch-source-shebangs 'patch-stuff
                 (lambda _
@@ -58,29 +84,25 @@
                 %standard-phases)))
    (inputs
     `(;; ("lvm2" ,lvm2)
-       ("gettext" ,gnu:gettext)
+       ("gettext" ,gnu-gettext)
       ("freetype" ,freetype)
       ;; ("libusb" ,libusb)
-       ("ncurses" ,ncurses)
-
-       ("patch/gets" ,(search-patch "grub-gets-undeclared.patch"))))
+       ("ncurses" ,ncurses)))
    (native-inputs
     `(("bison" ,bison)
       ("flex" ,flex)

       ;; Dependencies for the test suite.  The "real" QEMU is needed here,
       ;; because several targets are used.
-       ("qemu" ,qemu)
+       ("qemu" ,qemu-for-tests)
       ("xorriso" ,xorriso)))
    (home-page "http://www.gnu.org/software/grub/")
-    (synopsis "GRand unified boot loader")
+    (synopsis "GRand Unified Boot loader")
    (description
-     "GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand
-Unified Bootloader, which was originally designed and implemented by Erich
-Stefan Boleyn.
-
-Briefly, the boot loader is the first software program that runs when a
-computer starts.  It is responsible for loading and transferring control to
-the operating system kernel software (such as the Hurd or the Linux).  The
-kernel, in turn, initializes the rest of the operating system (e.g., GNU).")
+     "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
+menu to select one of the installed operating systems.")
    (license gpl3+)))
@@ -63,10 +63,12 @@
            ))
   (synopsis "Generic Security Service library")
   (description
-    "GNU GSS is an implementation of the Generic Security Service Application
-Program Interface (GSS-API). GSS-API is used by network servers to provide
-security services, e.g., to authenticate SMTP/IMAP clients against
-SMTP/IMAP servers. GSS consists of a library and a manual.")
+    "The GNU Generic Security Service provides a free implementation of the
+GSS-API specification.  It provides a generic application programming
+interface for programs to access security services. Security services present
+a generic, GSS interface, with which the calling application interacts via
+this library, freeing the application developer from needing to know about
+the underlying security implementation.")
   (license gpl3+)
   (home-page "http://www.gnu.org/software/gss/")))

@@ -91,25 +93,9 @@ SMTP/IMAP servers. GSS consists of a library and a manual.")
    `(("gnutls" ,gnutls)))
   (synopsis "Simple Authentication and Security Layer library")
   (description
-    "GNU SASL is an implementation of the Simple Authentication and Security
-Layer framework and a few common SASL mechanisms. SASL is used by network
-servers (e.g., IMAP, SMTP) to request authentication from clients, and in
-clients to authenticate against servers.
-
-GNU SASL consists of a library (libgsasl), a command line utility (gsasl)
-to access the library from the shell, and a manual. The library includes
-support for the framework (with authentication functions and application
-data privacy and integrity functions) and at least partial support for the
-CRAM-MD5, EXTERNAL, GSSAPI, ANONYMOUS, PLAIN, SECURID, DIGEST-MD5,
-SCRAM-SHA-1, SCRAM-SHA-1-PLUS, LOGIN, and NTLM mechanisms.
-
-The library is portable because it does not do network communication by
-itself, but rather leaves it up to the calling application. The library is
-flexible with regards to the authorization infrastructure used, as it
-utilises callbacks into the application to decide whether an user is
-authorised or not.
-
-The gsasl package distribution includes the library part as well,
-so there is no need to install two packages.")
+    "GNU SASL is an implementation of the Simple Authentication and
+Security Layer framework.  On network servers such as IMAP or SMTP servers,
+SASL is used to handle client/server authentication.  This package contains
+both a library and a command-line tool to access the library.")
   (license gpl3+)
   (home-page "http://www.gnu.org/software/gsasl/")))
@@ -0,0 +1,152 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 gstreamer)
+  #:use-module ((guix licenses) #:select (lgpl2.0+))
+  #: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 glib)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xml))
+
+(define-public gstreamer
+  (package
+    (name "gstreamer")
+    (version "1.0.10")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "0c0irk85jd2cihm5pmf4zxhlpg08qpxjcqv1l9qn2n3h2gsaj2lf"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("bison" ,bison)
+       ("flex" ,flex)
+       ("glib" ,glib)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("python-wrapper" ,python-wrapper)))
+    (home-page "http://gstreamer.freedesktop.org/")
+    (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.
+
+Applications can take advantage of advances in codec and filter technology
+transparently.  Developers can add new codecs and filters by writing a
+simple plugin with a clean, generic interface.
+
+This package provides the core library and elements.")
+    (license lgpl2.0+)))
+
+(define-public gstreamer-0.10
+  (package (inherit gstreamer)
+    (version "0.10.36")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci"))
+      (patches
+        (list (search-patch "gstreamer-0.10-bison3.patch")
+              (search-patch "gstreamer-0.10-silly-test.patch")))))
+    (propagated-inputs
+     `(("libxml2" ,libxml2)))
+    (inputs
+     `(("bison" ,bison)
+       ("flex" ,flex)
+       ("glib" ,glib)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-2)))))
+
+(define-public gst-plugins-base
+  (package
+    (name "gst-plugins-base")
+    (version "1.0.10")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "1s4pphbb5kpdh4rrmb8rala4sp499k4by59925k15xiz58xyhm4p"))))
+    (build-system gnu-build-system)
+    ;; FIXME: Add more dependencies for further plugins.
+    (inputs
+     `(("glib" ,glib)
+       ("gstreamer" ,gstreamer)
+       ("pkg-config" ,pkg-config)
+       ("python-wrapper" ,python-wrapper)))
+    (arguments
+     `(#:tests? #f))
+      ;; All tests pass except for one:
+      ;; Running suite(s): pbutils library
+      ;; 85%: Checks: 7, Failures: 1, Errors: 0
+      ;; libs/pbutils.c:522:F:general:test_pb_utils_install_plugins:0: gst_install_plugins_sync() failed ;; with unexpected ret 201, which is neither HELPER_MISSING nor 1
+      ;; FAIL: libs/pbutils
+      ;; According to the documentation, "gst_install_plugins_sync (...)
+      ;; should almost never be used".
+    (home-page "http://gstreamer.freedesktop.org/")
+    (synopsis
+     "Plugins for the gstreamer 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.
+
+Applications can take advantage of advances in codec and filter technology
+transparently.  Developers can add new codecs and filters by writing a
+simple plugin with a clean, generic interface.
+
+This package provides an essential exemplary set of elements.")
+    (license lgpl2.0+)))
+
+(define-public gst-plugins-base-0.10
+  (package (inherit gst-plugins-base)
+    (version "0.10.36")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z"))))
+    (inputs
+     `(("glib" ,glib)
+       ("gstreamer" ,gstreamer-0.10)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-2)))))
@@ -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.
 ;;;
@@ -26,30 +27,35 @@
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages ghostscript)
  #: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 pdf)
+  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg))

 (define-public atk
  (package
   (name "atk")
-   (version "2.8.0")
+   (version "2.10.0")
   (source (origin
            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/atk/2.8/atk-"
+            (uri (string-append "mirror://gnome/sources/" name "/"
+                                (string-take version 4) "/" name "-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "1x3dd3hg9l1j9dq70xwph13vxdp6a9wbfcnryryf1wr6c8bij9dj"))))
+              "1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3"))))
   (build-system gnu-build-system)
   (inputs `(("glib" ,glib)
             ("pkg-config" ,pkg-config)))
-   (synopsis "GNOME accessability toolkit")
+   (synopsis "GNOME accessibility toolkit")
   (description
    "ATK provides the set of accessibility interfaces that are implemented
 by other toolkits and applications. Using the ATK interfaces, accessibility
@@ -60,14 +66,14 @@ tools have full access to view and control running applications.")
 (define-public cairo
  (package
   (name "cairo")
-   (version "1.12.14")
+   (version "1.12.16")
   (source (origin
            (method url-fetch)
            (uri (string-append "http://cairographics.org/releases/cairo-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "04xcykglff58ygs0dkrmmnqljmpjwp2qgwcz8sijqkdpz7ix3l4n"))))
+              "0inqwsylqkrzcjivdirkjx5nhdgxbdc62fq284c3xppinfg9a195"))))
   (build-system gnu-build-system)
   (propagated-inputs
    `(("fontconfig" ,fontconfig)
@@ -83,7 +89,7 @@ tools have full access to view and control running applications.")
      ("libspectre" ,libspectre)
      ("pkg-config" ,pkg-config)
      ("poppler" ,poppler)
-      ("python" ,python)
+      ("python" ,python-wrapper)
      ("xextproto" ,xextproto)
      ("zlib" ,zlib)))
    (arguments
@@ -110,20 +116,20 @@ affine transformation (scale, rotation, shear, etc.)")
 (define-public harfbuzz
  (package
   (name "harfbuzz")
-   (version "0.9.18")
+   (version "0.9.22")
   (source (origin
            (method url-fetch)
            (uri (string-append "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-"
                                version ".tar.bz2"))
            (sha256
             (base32
-              "026rlwspf1zn5akds9fwibpqpn47kmlnmqm5fi0cp4k4dnygpw7y"))))
+              "1nkimwadri6v2kzrmz8y0crmy59gw0kg4i4f6cc786bngs0815lq"))))
   (build-system gnu-build-system)
   (inputs
    `(("cairo" ,cairo)
      ("icu4c" ,icu4c)
      ("pkg-config" ,pkg-config)
-      ("python" ,python)))
+      ("python" ,python-wrapper)))
   (synopsis "opentype text shaping engine")
   (description
    "HarfBuzz is an OpenType text shaping engine.")
@@ -157,6 +163,60 @@ used throughout the world.")
   (license license:lgpl2.0+)
   (home-page "https://developer.gnome.org/pango/")))

+
+(define-public gtksourceview
+  (package
+    (name "gtksourceview")
+    (version "2.10.5") ; This is the last version which builds against gtk+2
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/gtksourceview/"
+                                  (string-take version 4) "/gtksourceview-"
+                                  version ".tar.bz2"))
+              (sha256
+               (base32
+                "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)
+       ("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)))
+    (arguments
+     `(#:phases
+       ;; Unfortunately, some of the tests in "make check" are highly dependent
+       ;; on the environment therefore, some black magic is required.
+       (alist-cons-before
+        'check 'start-xserver
+        (lambda* (#:key inputs #:allow-other-keys)
+          (let ((xorg-server (assoc-ref inputs "xorg-server"))
+                (mime (assoc-ref inputs "shared-mime-info")))
+
+            ;; There must be a running X server and make check doesn't start one.
+            ;; Therefore we must do it.
+            (system (format #f "~a/bin/Xvfb :1 &" xorg-server))
+            (setenv "DISPLAY" ":1")
+
+            ;; The .lang files must be found in $XDG_DATA_HOME/gtksourceview-2.0
+            (system "ln -s gtksourceview gtksourceview-2.0")
+            (setenv "XDG_DATA_HOME" (getcwd))
+
+            ;; Finally, the mimetypes must be available.
+            (setenv "XDG_DATA_DIRS" (string-append mime "/share/")) ))
+        %standard-phases)))
+    (synopsis "Widget that extends the standard GTK+ 2.x 'GtkTextView' widget")
+    (description
+     "GtkSourceView is a portable C library that extends the standard GTK+
+framework for multiline text editing with support for configurable syntax
+highlighting, unlimited undo/redo, search and replace, a completion framework,
+printing and other features typical of a source code editor.")
+    (license license:lgpl2.0+)
+    (home-page "https://developer.gnome.org/gtksourceview/")))
+
 (define-public gdk-pixbuf
  (package
   (name "gdk-pixbuf")
@@ -182,24 +242,84 @@ in the GNOME project.")
   (license license:lgpl2.0+)
   (home-page "https://developer.gnome.org/gdk-pixbuf/")))

-(define-public gtk+
+(define-public at-spi2-core
  (package
-   (name "gtk+")
-   (version "2.24.20")
+   (name "at-spi2-core")
+   (version "2.10.0")
   (source (origin
            (method url-fetch)
-            (uri (string-append "mirror://gnome/sources/gtk+/2.24/gtk+-"
+            (uri (string-append "mirror://gnome/sources/" name "/"
+                                (string-take version 4) "/" name "-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "18qdvb7nxi25hfnpmcy01p3majw9jnx83ikm263dk9rrjazvqrnc"))))
+              "1ns44yibdgcwzwri7sr075hfs5rh5lgxkh71247a0822az3mahcn"))))
+   (build-system gnu-build-system)
+   (inputs `(("dbus" ,dbus)
+             ("glib" ,glib)
+             ("intltool" ,intltool)
+             ("libxi" ,libxi)
+             ("libxtst" ,libxtst)
+             ("pkg-config" ,pkg-config)))
+   (arguments
+    `(#:tests? #f)) ; FIXME: dbind/dbtest fails; one should disable tests in
+                    ; a more fine-grained way.
+   (synopsis "Assistive Technology Service Provider Interface, core components")
+   (description
+    "The Assistive Technology Service Provider Interface, core components,
+is part of the GNOME accessibility project.")
+   (license license:lgpl2.0+)
+   (home-page "https://projects.gnome.org/accessibility/")))
+
+(define-public at-spi2-atk
+  (package
+   (name "at-spi2-atk")
+   (version "2.10.0")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://gnome/sources/" name "/"
+                                (string-take version 4) "/" name "-"
+                                version ".tar.xz"))
+            (sha256
+             (base32
+              "150sqc21difazqd53llwfdaqnwfy73bic9hia41xpfy9kcpzz9yy"))))
+   (build-system gnu-build-system)
+   (inputs `(("atk" ,atk)
+             ("at-spi2-core" ,at-spi2-core)
+             ("dbus" ,dbus)
+             ("glib" ,glib)
+             ("pkg-config" ,pkg-config)))
+   (arguments
+    `(#:tests? #f)) ; FIXME: droute/droute-test fails; one should disable
+                    ; tests in a more fine-grained way.
+   (synopsis "Assistive Technology Service Provider Interface, ATK bindings")
+   (description
+    "The Assistive Technology Service Provider Interface
+is part of the GNOME accessibility project.")
+   (license license:lgpl2.0+)
+   (home-page "https://projects.gnome.org/accessibility/")))
+
+(define-public gtk+-2
+  (package
+   (name "gtk+")
+   (version "2.24.21")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://gnome/sources/" name "/"
+                                (string-take version 4) "/" name "-"
+                                version ".tar.xz"))
+            (sha256
+             (base32
+              "1qyw73pr9ryqhir2h1kbx3vm70km4dg2fxrgkrdlpv0rvlb94bih"))))
   (build-system gnu-build-system)
   (propagated-inputs
    `(("atk" ,atk)
      ("gdk-pixbuf" ,gdk-pixbuf)
      ("pango" ,pango)))
   (inputs
-    `(("pkg-config" ,pkg-config)))
+    `(("perl" ,perl)
+      ("pkg-config" ,pkg-config)
+      ("python-wrapper" ,python-wrapper)))
   (arguments
    `(#:phases
      (alist-replace
@@ -211,7 +331,7 @@ in the GNOME project.")
           (("SUBDIRS = theme-bits . tests") "SUBDIRS = theme-bits ."))
          (apply configure args)))
      %standard-phases)))
-   (synopsis "multi-platform toolkit for creating graphical user interfaces")
+   (synopsis "Cross-platform toolkit for creating graphical user interfaces")
   (description
    "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating
 graphical user interfaces. Offering a complete set of widgets, GTK+ is
@@ -219,3 +339,211 @@ suitable for projects ranging from small one-off tools to complete
 application suites.")
   (license license:lgpl2.0+)
   (home-page "http://www.gtk.org/")))
+
+(define-public gtk+
+  (package (inherit gtk+-2)
+   (version "3.10.1")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://gnome/sources/gtk+/"
+                                (string-take version 4) "/gtk+-"
+                                version ".tar.xz"))
+            (sha256
+             (base32
+              "1f3a7r3z7i9xh5imlfpfcgyydzkj2fnd0v6ylvqxij0yzfbnhbn1"))))
+   (propagated-inputs
+    `(("at-spi2-atk" ,at-spi2-atk)
+      ("atk" ,atk)
+      ("gdk-pixbuf" ,gdk-pixbuf)
+      ("libxi" ,libxi)
+      ("libxinerama" ,libxinerama)
+      ("pango" ,pango)))
+   (inputs
+    `(("libxml2" ,libxml2)
+      ("perl" ,perl)
+      ("pkg-config" ,pkg-config)
+      ("python-wrapper" ,python-wrapper)
+      ("xorg-server" ,xorg-server)))
+   (arguments
+    `(#:phases
+      (alist-replace
+       'configure
+       (lambda* (#:key #: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
+           ;; machine uuid: Failed to open "/etc/machine-id": No such file or
+           ;; directory.
+           ;; See the manual page for dbus-uuidgen to correct this issue.
+           (substitute* "testsuite/Makefile.in"
+            (("SUBDIRS = gdk gtk a11y css reftests") "SUBDIRS = gdk"))
+           (apply configure args)))
+       %standard-phases)))))
+
+;;;
+;;; Guile bindings.
+;;;
+
+(define-public guile-cairo
+  (package
+    (name "guile-cairo")
+    (version "1.4.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "http://download.gna.org/guile-cairo/guile-cairo-"
+                   version
+                   ".tar.gz"))
+             (sha256
+              (base32
+               "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-cons-before
+                 'configure 'set-module-directory
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   ;; Install modules under $out/share/guile/site/2.0.
+                   (let ((out (assoc-ref outputs "out")))
+                     (substitute* "Makefile.in"
+                       (("scmdir = ([[:graph:]]+).*" _ value)
+                        (string-append "scmdir = " value "/2.0\n")))
+                     (substitute* "cairo/Makefile.in"
+                       (("moduledir = ([[:graph:]]+).*" _ value)
+                        (string-append "moduledir = "
+                                       "$(prefix)/share/guile/site/2.0/cairo\n'")))))
+                 (alist-cons-after
+                  'install 'install-missing-file
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    ;; By default 'vector-types.scm' is not installed, so do
+                    ;; it here.
+                    (let ((out (assoc-ref outputs "out")))
+                      (copy-file "cairo/vector-types.scm"
+                                 (string-append out "/share/guile/site/2.0"
+                                                "/cairo/vector-types.scm"))))
+                  %standard-phases))))
+    (inputs
+     `(("guile-lib" ,guile-lib)
+       ("expat" ,expat)
+       ("cairo" ,cairo)
+       ("pkg-config" ,pkg-config)
+       ("guile" ,guile-2.0)))
+    (home-page "http://www.nongnu.org/guile-cairo/")
+    (synopsis "Cairo bindings for GNU Guile")
+    (description
+     "Guile-Cairo wraps the Cairo graphics library for Guile Scheme.
+Guile-Cairo is complete, wrapping almost all of the Cairo API.  It is API
+stable, providing a firm base on which to do graphics work.  Finally, and
+importantly, it is pleasant to use.  You get a powerful and well-maintained
+graphics library with all of the benefits of Scheme: memory management,
+exceptions, macros, and a dynamic programming environment.")
+    (license license:lgpl3+)))
+
+
+;;;
+;;; C++ bindings.
+;;;
+
+(define-public cairomm
+  (package
+    (name "cairomm")
+    (version "1.10.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://cairographics.org/releases/cairomm-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "13rrp96px95m6xnvmsaqb0wcqsnizg3bz334k0yhlyxf7v29d386"))))
+    (build-system gnu-build-system)
+    (arguments
+     ;; The examples lack -lcairo.
+     '(#:make-flags '("LDFLAGS=-lcairo")))
+    (inputs `(("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("libsigc++" ,libsigc++)
+       ("freetype" ,freetype)
+       ("fontconfig" ,fontconfig)
+       ("cairo" ,cairo)))
+    (home-page "http://cairographics.org/")
+    (synopsis "C++ bindings to the Cairo 2D graphics library")
+    (description
+     "Cairomm provides a C++ programming interface to the Cairo 2D graphics
+library.")
+    (license license:lgpl2.0+)))
+
+(define-public pangomm
+  (package
+    (name "pangomm")
+    (version "2.34.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnome/sources/pangomm/2.34/pangomm-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0hcyvv7c5zmivprdam6cp111i6hn2y5jsxzk00m6j9pncbzvp0hf"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("cairo" ,cairo)
+       ("cairomm" ,cairomm)
+       ("glibmm" ,glibmm)
+       ("pango" ,pango)))
+    (home-page "http://www.pango.org/")
+    (synopsis "C++ interface to the Pango text rendering library")
+    (description
+     "Pangomm provides a C++ programming interface to the Pango text rendering
+library.")
+    (license license:lgpl2.1+)))
+
+(define-public atkmm
+  (package
+    (name "atkmm")
+    (version "2.22.7")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnome/sources/atkmm/2.22/atkmm-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "06zrf2ymml2dzp53sss0d4ch4dk9v09jm8rglnrmwk4v81mq9gxz"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("glibmm" ,glibmm) ("atk" ,atk)))
+    (home-page "http://www.gtkmm.org")
+    (synopsis "C++ interface to the ATK accessibility library")
+    (description
+     "ATKmm provides a C++ programming interface to the ATK accessibility
+toolkit.")
+    (license license:lgpl2.1+)))
+
+(define-public gtkmm
+  (package
+    (name "gtkmm")
+    (version "3.9.16")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnome/sources/gtkmm/3.9/gtkmm-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0yf8wwv4w02p70nrxsbs0nhm0w4gkn2wggdjygd8vif062anf1rs"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("pangomm" ,pangomm)
+       ("cairomm" ,cairomm)
+       ("atkmm" ,atkmm)
+       ("gtk+" ,gtk+)
+       ("glibmm" ,glibmm)))
+    (home-page "http://gtkmm.org/")
+    (synopsis
+     "C++ interface to the GTK+ graphical user interface library")
+    (description
+     "gtkmm is the official C++ interface for the popular GUI library GTK+.
+Highlights include typesafe callbacks, and a comprehensive set of widgets that
+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+)))
@@ -0,0 +1,128 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 guile-wm)
+  #:use-module (guix licenses)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public guile-xcb
+  (package
+    (name "guile-xcb")
+    (version "1.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://www.markwitmer.com/dist/guile-xcb-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "009qrw46ay74z3mw8gz7jqvn90z9ilyhy00801w5vpyias02730y"))))
+    (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="
+                                          (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)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("guile" ,guile-2.0)
+              ("xcb" ,xcb-proto)))
+    (home-page "http://www.markwitmer.com/guile-xcb/guile-xcb.html")
+    (synopsis "XCB bindings for Guile")
+    (description
+     "Guile-XCB implements the XCB protocol and provides all the tools
+necessary to write X client code in Guile Scheme without any external
+dependencies.")
+    (license gpl3+)))
+
+(define-public guile-wm
+  (package
+    (name "guile-wm")
+    (version "0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.markwitmer.com/dist/guile-wm-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "0vv6avpkl6lgrhy2a16z470fqjhvzi4r93qwl87xw9v5dvldf08p"))))
+    (build-system gnu-build-system)
+    (arguments '(;; The '.scm' files go to $(datadir), so set that to the
+                 ;; standard value.
+                 #:configure-flags (list (string-append "--datadir="
+                                          (assoc-ref %outputs "out")
+                                          "/share/guile/site/2.0"))
+                 #:phases (alist-cons-before
+                           'configure 'set-go-directory
+                           (lambda* (#:key outputs #:allow-other-keys)
+                             ;; Install .go files to $out/share/guile/site/2.0.
+                             (let ((out (assoc-ref outputs "out")))
+                               (substitute* "module/Makefile.in"
+                                 (("^wmdir = .*$")
+                                  (string-append "wmdir = " out
+                                                 "/share/guile/site/2.0\n")))))
+                           (alist-cons-after
+                            'install 'set-load-path
+                            (lambda* (#:key inputs outputs #:allow-other-keys)
+                              ;; Put Guile-XCB's and Guile-WM's modules in the
+                              ;; search path of PROG.
+                              (let* ((out  (assoc-ref outputs "out"))
+                                     (prog (string-append out "/bin/guile-wm"))
+                                     (mods (string-append
+                                            out "/share/guile/site/2.0"))
+                                     (xcb  (string-append
+                                            (assoc-ref inputs "guile-xcb")
+                                            "/share/guile/site/2.0")))
+                                (wrap-program
+                                 prog
+                                 `("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb))
+                                 `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+                                   (,mods ,xcb)))))
+                            %standard-phases))))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("guile" ,guile-2.0)
+              ("guile-xcb" ,guile-xcb)))
+    (home-page "http://www.markwitmer.com/guile-xcb/guile-wm.html")
+    (synopsis "X11 window manager toolkit in Scheme")
+    (description
+     "Guile-WM is a simple window manager that's completely customizable—you
+have total control of what it does by choosing which modules to include.
+Included with it are a few modules that provide basic TinyWM-like window
+management, some window record-keeping, multi-monitor support, and emacs-like
+keymaps and minibuffer. At this point, it's just enough to get you started.")
+    (license gpl3+)))
@@ -53,10 +53,10 @@
                                ".tar.gz"))
            (sha256
             (base32
-              "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3"))))
+              "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3"))
+            (patches (list (search-patch "guile-1.8-cpp-4.5.patch")))))
   (build-system gnu-build-system)
   (arguments '(#:configure-flags '("--disable-error-on-warning")
-                #:patches (list (assoc-ref %build-inputs "patch/snarf"))

                ;; Insert a phase before `configure' to patch things up.
                #:phases (alist-cons-before
@@ -77,8 +77,7 @@
                             (substitute* "ice-9/popen.scm"
                               (("/bin/sh") (which "sh"))))
                           %standard-phases)))
-   (inputs `(("patch/snarf" ,(search-patch "guile-1.8-cpp-4.5.patch"))
-             ("gawk" ,gawk)
+   (inputs `(("gawk" ,gawk)
             ("readline" ,readline)))

   ;; Since `guile-1.8.pc' has "Libs: ... -lgmp -lltdl", these must be
@@ -96,9 +95,11 @@

   (synopsis "Scheme implementation intended especially for extensions")
   (description
-"GNU Guile 1.8 is an interpreter for the Scheme programming language,
-packaged as a library that can be embedded into programs to make them
-extensible.  It supports many SRFIs.")
+    "Guile is the GNU Ubiquitous Intelligent Language for Extensions, the
+official extension language of the GNU system.  It is an implementation of
+the Scheme language which can be easily embedded in other applications to
+provide a convenient means of extending the functionality of the application
+without requiring the source code to be rewritten.")
   (home-page "http://www.gnu.org/software/guile/")
   (license lgpl2.0+)))

@@ -165,12 +166,11 @@ extensible.  It supports many SRFIs.")

   (synopsis "Scheme implementation intended especially for extensions")
   (description
-"GNU Guile is an implementation of the Scheme programming language, with
-support for many SRFIs, packaged for use in a wide variety of environments.
-In addition to implementing the R5RS Scheme standard and a large subset of
-R6RS, Guile includes a module system, full access to POSIX system calls,
-networking support, multiple threads, dynamic linking, a foreign function
-call interface, and powerful string processing.")
+    "Guile is the GNU Ubiquitous Intelligent Language for Extensions, the
+official extension language of the GNU system.  It is an implementation of
+the Scheme language which can be easily embedded in other applications to
+provide a convenient means of extending the functionality of the application
+without requiring the source code to be rewritten.")
   (home-page "http://www.gnu.org/software/guile/")
   (license lgpl3+)))

@@ -250,7 +250,7 @@ many readers as needed).")
    (arguments
     '(#:configure-flags (list (string-append "--with-guilesitedir="
                                              (assoc-ref %outputs "out")
-                                              "/share/guile/site"))
+                                              "/share/guile/site/2.0"))
       #:phases (alist-cons-after
                 'install 'post-install
                 (lambda* (#:key outputs #:allow-other-keys)
@@ -265,10 +265,8 @@ many readers as needed).")
    (home-page "http://www.gnu.org/software/guile-ncurses/")
    (synopsis "Guile bindings to ncurses")
    (description
-     "GNU Guile-Ncurses is a library for the Guile Scheme interpreter that
-provides functions for creating text user interfaces.  The text user interface
-functionality is built on the ncurses libraries: curses, form, panel, and
-menu.")
+     "guile-ncurses provides Guile language bindings for the ncurses
+library.")
    (license lgpl3+)))

 (define-public mcron
@@ -281,21 +279,52 @@ menu.")
                                 version ".tar.gz"))
             (sha256
              (base32
-               "0yvrfzzdy2m7fbqkr61fw01wd9r2jpnbyabxhcsfivgxywknl0fy"))))
+               "0yvrfzzdy2m7fbqkr61fw01wd9r2jpnbyabxhcsfivgxywknl0fy"))
+             (patches (list (search-patch "mcron-install.patch")))))
    (build-system gnu-build-system)
-    (arguments
-     '(#:patches (list (assoc-ref %build-inputs "patch/install"))))
    (inputs
-     `(("ed" ,ed) ("which" ,which) ("guile" ,guile-1.8)
-       ("patch/install" ,(search-patch "mcron-install.patch"))))
+     `(("ed" ,ed) ("which" ,which) ("guile" ,guile-1.8)))
    (home-page "http://www.gnu.org/software/mcron/")
    (synopsis "Run jobs at scheduled times")
    (description
-     "The GNU package mcron (Mellor's cron) is a 100% compatible replacement
-for Vixie cron.  It is written in pure Guile, and allows configuration files
-to be written in scheme (as well as Vixie's original format) for infinite
-flexibility in specifying when jobs should be run.  Mcron was written by Dale
-Mellor.")
+     "GNU Mcron is a complete replacement for Vixie cron.  It is used to run
+tasks on a schedule, such as every hour or every Monday.  Mcron is written in
+Guile, so its configuration can be written in Scheme; the original cron
+format is also supported.")
+    (license gpl3+)))
+
+(define-public guile-lib
+  (package
+    (name "guile-lib")
+    (version "0.2.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://savannah/guile-lib/guile-lib-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-cons-before
+                 'configure 'patch-module-dir
+                 (lambda _
+                   (substitute* "src/Makefile.in"
+                     (("^moddir[[:blank:]]*=[[:blank:]]*([[:graph:]]+)" _ rhs)
+                      (string-append "moddir = " rhs "/2.0\n"))))
+                 %standard-phases)))
+    (inputs `(("guile" ,guile-2.0)))
+    (home-page "http://www.nongnu.org/guile-lib/")
+    (synopsis "Collection of useful Guile Scheme modules")
+    (description
+     "guile-lib is intended as an accumulation place for pure-scheme Guile
+modules, allowing for people to cooperate integrating their generic Guile
+modules into a coherent library.  Think \"a down-scaled, limited-scope CPAN
+for Guile\".")
+
+    ;; The whole is under GPLv3+, but some modules are under laxer
+    ;; distribution terms such as LGPL and public domain.  See `COPYING' for
+    ;; details.
    (license gpl3+)))

 ;;; guile.scm ends here
@@ -55,8 +55,8 @@
             ("zlib" ,zlib)))
   (synopsis "PostScript and PDF viewer using Ghostscript as a back-end")
   (description
-    "GNU gv allows to view and navigate through PostScript and PDF documents
-on an X display by providing a graphical user interface for the Ghostscript
-interpreter.")
+    "GNU GV is a graphical user interface to the Ghostscript interpreter.
+With it, one can view and navigate through PostScript and PDF documents in X
+Windows.")
   (license license:gpl3+)
   (home-page "http://www.gnu.org/software/gv/")))
@@ -47,6 +47,7 @@
    (home-page "http://www.gnu.org/software/help2man/")
    (synopsis "Automatically generate man pages from program --help")
    (description
-     "help2man produces simple manual pages from the ‘--help’ and
-‘--version’ output of other commands.")
+     "GNU help2man is a program that converts the output of standard
+\"--help\" and \"--version\" command-line arguments into a manual page
+automatically.")
    (license gpl3+)))
@@ -18,6 +18,7 @@

 (define-module (gnu packages icu4c)
  #:use-module (gnu packages)
+  #:use-module (gnu packages patchelf)
  #:use-module (gnu packages perl)
  #:use-module (guix licenses)
  #:use-module (guix packages)
@@ -38,9 +39,18 @@
            (sha256 (base32
                     "13yz0kk6zsgj94idnlr3vbg8iph5z4ly4b4xrd5wfja7q3ijdx56"))))
   (build-system gnu-build-system)
-   (inputs `(("perl" ,perl)))
+   (inputs
+    `(("patchelf" ,patchelf)
+      ("perl" ,perl)))
   (arguments
-    `(#:phases
+    `(#:modules ((guix build gnu-build-system)
+                 (guix build utils)
+                 (guix build rpath)
+                 (srfi srfi-26))
+      #:imported-modules ((guix build gnu-build-system)
+                          (guix build utils)
+                          (guix build rpath))
+      #:phases
      (alist-replace
       'unpack
       (lambda* (#:key source #:allow-other-keys)
@@ -56,7 +66,16 @@
             (("`/bin/sh")
             (string-append "`" (which "bash"))))
           (apply configure args)))
-       %standard-phases))))
+       (alist-cons-after
+        'strip 'add-lib-to-runpath
+        (lambda* (#:key outputs #:allow-other-keys)
+          (let* ((out (assoc-ref outputs "out"))
+                 (lib (string-append out "/lib")))
+            ;; Add LIB to the RUNPATH of all the libraries.
+            (with-directory-excursion out
+              (for-each (cut augment-rpath <> lib)
+                        (find-files "lib" ".*")))))
+        %standard-phases)))))
   (synopsis "ICU, International Components for Unicode")
   (description
    "ICU is a set of C/C++ and Java libraries providing Unicode and
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,39 +27,25 @@
  (package
    (name "idutils")
    (version "4.6")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/idutils/idutils-"
-                          version ".tar.xz"))
-      (sha256
-       (base32
-        "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"))))
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/idutils/idutils-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"))
+             (patches (list
+                       (search-patch "diffutils-gets-undeclared.patch")))))
    (build-system gnu-build-system)
    (inputs `(;; TODO: Add Emacs as an input for byte-compilation.
              ;; ("emacs" ,emacs)
-              ("patch/gets"
-               ,(search-patch "diffutils-gets-undeclared.patch"))))
-    (arguments `(#:patches (list (assoc-ref %build-inputs "patch/gets"))))
+              ))
    (home-page "http://www.gnu.org/software/idutils/")
    (synopsis "Identifier database utilities")
    (description
-     "An \"ID database\" is a binary file containing a list of file
-names, a list of tokens, and a sparse matrix indicating which
-tokens appear in which files.
-
-With this database and some tools to query it, many
-text-searching tasks become simpler and faster.  For example,
-you can list all files that reference a particular `\\#include'
-file throughout a huge source hierarchy, search for all the
-memos containing references to a project, or automatically
-invoke an editor on all files containing references to some
-function or variable.  Anyone with a large software project to
-maintain, or a large set of text files to organize, can benefit
-from the ID utilities.
-
-Although the name `ID' is short for `identifier', the ID
-utilities handle more than just identifiers; they also treat
-other kinds of tokens, most notably numeric constants, and the
-contents of certain character strings.")
+     "The GNU idutils package includes tools to create an index of textual
+tokens used in a list of file names and then to query that index.  Thus, it
+allows the user to, for example, find all the uses of a particular function
+in a large programming project.  In addition to handling textual tokens, it
+can also handle numeric constants and the contents of character strings.")
    (license gpl3+)))
@@ -37,14 +37,14 @@
 (define-public imagemagick
  (package
    (name "imagemagick")
-    (version "6.8.6-0")
+    (version "6.8.6-9")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://imagemagick/ImageMagick-"
                                 version ".tar.xz"))
             (sha256
              (base32
-               "1qmwpnq2mcxjnp0rjyb2g7v87lhmll19imx3iys6kplh8amrmqnv"))))
+               "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases (alist-cons-before
@@ -18,7 +18,8 @@

 (define-module (gnu packages indent)
  #:use-module (gnu packages)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'license:))
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu))
@@ -36,9 +37,10 @@
   (build-system gnu-build-system)
   (synopsis "Code reformatter")
   (description
-    "GNU Indent can be used to make code easier to read. It can also convert
-from one style of writing C to another. Indent understands a substantial
-amount about the syntax of C, but it also attempts to cope with incomplete
-and misformed syntax. The GNU style of indenting is the default.")
-   (license gpl3+)
+    "Indent is a program that makes source code easier to read by
+reformatting it in a consistent style.  It can change the style to one of
+several different styles such as GNU, BSD or K&R.  It has some flexibility to
+deal with incomplete or malformed syntax.  GNU indent offers several
+extensions over the standard utility.")
+   (license license:gpl3+)
   (home-page "http://www.gnu.org/software/indent/")))
@@ -0,0 +1,79 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 kde)
+  #:use-module ((guix licenses) #:select (bsd-2 lgpl2.1+))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system cmake)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages xorg))
+
+(define-public automoc4
+  (package
+    (name "automoc4")
+    (version "0.9.88")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://download.kde.org/stable/" name
+                                "/" version "/" name "-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93"))))
+    (build-system cmake-build-system)
+    (inputs
+     `(("qt" ,qt-4)))
+    (arguments
+     `(#:tests? #f)) ; no check target
+    (home-page "http://techbase.kde.org/Development/Tools/Automoc4")
+    (synopsis "build tool for KDE")
+    (description "KDE desktop environment")
+    (license bsd-2)))
+
+(define-public phonon
+  (package
+    (name "phonon")
+    (version "4.7.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://download.kde.org/stable/" name
+                                "/" version "/"
+                                name "-" version ".tar.xz"))
+             (sha256
+              (base32
+               "1sxrnwm16dxy32xmrqf26762wmbqing1zx8i4vlvzgzvd9xy39ac"))))
+    (build-system cmake-build-system)
+    ;; FIXME: Add interpreter ruby once available.
+    ;; Add optional input libqtzeitgeist.
+    (inputs
+     `(("automoc4" ,automoc4)
+       ("glib" ,glib)
+       ("libx11" ,libx11)
+       ("pkg-config" ,pkg-config)
+       ("pulseaudio" ,pulseaudio)
+       ("qt" ,qt-4)))
+    (arguments
+     `(#:tests? #f)) ; no test target
+    (home-page "http://phonon.kde.org/")
+    (synopsis "Qt 4 multimedia API")
+    (description "KDE desktop environment")
+    (license lgpl2.1+)))
@@ -40,10 +40,9 @@
    (home-page "https://www.gnu.org/software/less/")
    (synopsis "Paginator for terminals")
    (description
-     "GNU less is a program similar to more, but which allows backward
-movement in the file as well as forward movement. Also, less does not
-have to read the entire input file before starting, so with large input
-files it starts up faster than text editors like vi. Less uses
-termcap (or terminfo on some systems), so it can run on a variety of
-terminals. There is even limited support for hardcopy terminals.")
+     "GNU less is a pager, a program that allows you to view large amounts
+of text in page-sized chunks.  Unlike traditional pagers, it allows both
+backwards and forwards movement through the document.  It also does not have
+to read the entire input file before starting, so it starts faster than most
+text editors.")
    (license gpl3+))) ; some files are under GPLv2+
@@ -0,0 +1,60 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 libcanberra)
+  #:use-module ((guix licenses) #:select (lgpl2.1+))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages oggvorbis)
+  #:use-module (gnu packages pkg-config))
+
+(define-public libcanberra
+  (package
+    (name "libcanberra")
+    (version "0.30")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://0pointer.de/lennart/projects/libcanberra/libcanberra-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"))))
+    (build-system gnu-build-system)
+    (inputs
+     ;; FIXME: Add optional inputs udev and pulse.
+     `(("alsa-lib" ,alsa-lib)
+       ("gstreamer" ,gstreamer)
+       ("gtk+" ,gtk+)
+       ("libtool" ,libtool)
+       ("libvorbis" ,libvorbis)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://0pointer.de/lennart/projects/libcanberra/")
+    (synopsis
+     "Implementation of the XDG Sound Theme and Name Specifications")
+    (description
+     "Libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such as
+GNOME.  It comes with several backends (ALSA, PulseAudio, OSS, GStreamer,
+null) and is designed to be portable.")
+    (license lgpl2.1+)))
@@ -37,16 +37,13 @@
                   "-stable.tar.gz"))
             (sha256
              (base32
-               "1xblymln9vihdmf1aqkp8chwvnhpdch3786bh30bj75slnl31992"))))
+               "1xblymln9vihdmf1aqkp8chwvnhpdch3786bh30bj75slnl31992"))
+             (patches (list (search-patch "libevent-dns-tests.patch")))))
    (build-system gnu-build-system)
    (inputs
-     `(("patch/dns-tests" ,(search-patch "libevent-dns-tests.patch"))
-
-       ;; Dependencies used for the tests and for `event_rpcgen.py'.
+     `(;; Dependencies used for the tests and for `event_rpcgen.py'.
       ("which" ,which)
-       ("python" ,python)))
-    (arguments
-     '(#:patches (list (assoc-ref %build-inputs "patch/dns-tests"))))
+       ("python" ,python-wrapper)))
    (home-page "http://libevent.org/")
    (synopsis
     "libevent, an event notification library")
@@ -17,6 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages libffi)
+  #:use-module (gnu packages)
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
@@ -46,7 +47,8 @@
                             name "-" version ".tar.gz"))
             (sha256
              (base32
-               "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x"))))
+               "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x"))
+             (patches (list (search-patch "libffi-mips-n32-fix.patch")))))
    (build-system gnu-build-system)
    (arguments `(#:modules ((guix build utils) (guix build gnu-build-system)
                            (ice-9 ftw) (srfi srfi-26))
@@ -37,15 +37,8 @@
 ;; FIXME: No Java and C# libraries are currently built.
   (synopsis "Internationalized string processing library")
   (description
-    "GNU Libidn is a fully documented implementation of the Stringprep,
-Punycode and IDNA specifications. Libidn's purpose is to encode and decode
-internationalised domain names.
-
-The library contains a generic Stringprep implementation. Profiles for
-Nameprep, iSCSI, SASL, XMPP and Kerberos V5 are included. Punycode and
-ASCII Compatible Encoding (ACE) via IDNA are supported. A mechanism to
-define Top-Level Domain (TLD) specific validation tables, and to compare
-strings against those tables, is included.
-Default tables for some TLDs are also included.")
+    "libidn is a library implementing of the Stringprep, Punycode and IDNA
+specifications.  These are used to encode and decode internationalized domain
+names.  It includes native C, C# and Java libraries.")
   (license lgpl2.1+)
   (home-page "http://www.gnu.org/software/libidn/")))
@@ -52,10 +52,8 @@
                    %standard-phases))
        '()))
   (description
-"GNU libsigsegv is a library for handling page faults in user mode. A page
-fault occurs when a program tries to access to a region of memory that is
-currently not available. Catching and handling a page fault is a useful
-technique for implementing pageable virtual memory, memory-mapped access to
-persistent databases, generational garbage collectors, stack overflow
-handlers, distributed shared memory, and more.")
+    "GNU libsigsegv is a library to handle page faults, which occur when a
+program tries to access an unavailable region of memory, in user mode.  By
+catching and handling page faults, the program can implement pageable virtual
+memory, stack overflow handlers, and so on.")
   (license gpl2+)))
@@ -38,20 +38,8 @@
   (build-system gnu-build-system)
   (synopsis "C library for manipulating Unicode strings")
   (description
-    "This library provides functions for manipulating Unicode strings and for
-manipulating C strings according to the Unicode standard.
-
-GNU libunistring is for you if your application involves non-trivial text
-processing, such as upper/lower case conversions, line breaking, operations
-on words, or more advanced analysis of text.  Text provided by the user can,
-in general, contain characters of all kinds of scripts.  The text processing
-functions provided by this library handle all scripts and all languages.
-
-libunistring is for you if your application already uses the ISO C / POSIX
-<ctype.h>, <wctype.h> functions and the text it operates on is provided by
-the user and can be in any language.
-
-libunistring is also for you if your application uses Unicode strings as
-internal in-memory representation.")
+    "GNU libunistring is a library providing functions to manipulate
+Unicode strings and for manipulating C strings according to the Unicode
+standard.")
   (home-page "http://www.gnu.org/software/libunistring/")
   (license lgpl3+)))
@@ -0,0 +1,44 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 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 lightning)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix licenses))
+
+(define-public lightning
+  (package
+    (name "lightning")
+    (version "2.0.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/lightning/lightning-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "100ya7dx12403gimif7p2q7ahd8vxqrxpxqzqr1zqci825nb0b43"))))
+    (build-system gnu-build-system)
+    (synopsis "Library for generating assembly code at runtime")
+    (description
+     "GNU Lightning is a library that generates assembly language code at
+run-time.  Thus, it is useful in creating Just-In-Time compilers.  It
+abstracts over the target CPU by exposing a standardized RISC instruction set
+to the clients.")
+    (home-page "http://www.gnu.org/software/lightning/")
+    (license gpl3+)))
@@ -19,10 +19,14 @@
 (define-module (gnu packages linux-initrd)
  #:use-module (guix utils)
  #:use-module (guix licenses)
+  #:use-module (guix build-system)
+  #:use-module ((guix derivations)
+                #:select (imported-modules compiled-modules %guile-for-build))
  #:use-module (gnu packages)
  #:use-module (gnu packages cpio)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages linux)
+  #:use-module (gnu packages guile)
  #:use-module ((gnu packages make-bootstrap)
                #:select (%guile-static-stripped))
  #:use-module (guix packages)
@@ -38,6 +42,49 @@
 ;;; Code:


+(define-syntax-rule (raw-build-system (store system name inputs) body ...)
+  "Lift BODY to a package build system."
+  ;; TODO: Generalize.
+  (build-system
+   (name "raw")
+   (description "Raw build system")
+   (build (lambda* (store name source inputs #:key system #:allow-other-keys)
+            (parameterize ((%guile-for-build (package-derivation store
+                                                                 guile-2.0)))
+              body ...)))))
+
+(define (module-package modules)
+  "Return a package that contains all of MODULES, a list of Guile module
+names."
+  (package
+    (name "guile-modules")
+    (version "0")
+    (source #f)
+    (build-system (raw-build-system (store system name inputs)
+                    (imported-modules store modules
+                                      #:name name
+                                      #:system system)))
+    (synopsis "Set of Guile modules")
+    (description synopsis)
+    (license gpl3+)
+    (home-page "http://www.gnu.org/software/guix/")))
+
+(define (compiled-module-package modules)
+  "Return a package that contains the .go files corresponding to MODULES, a
+list of Guile module names."
+  (package
+    (name "guile-compiled-modules")
+    (version "0")
+    (source #f)
+    (build-system (raw-build-system (store system name inputs)
+                    (compiled-modules store modules
+                                      #:name name
+                                      #:system system)))
+    (synopsis "Set of compiled Guile modules")
+    (description synopsis)
+    (license gpl3+)
+    (home-page "http://www.gnu.org/software/guix/")))
+
 (define* (expression->initrd exp
                             #:key
                             (guile %guile-static-stripped)
@@ -45,12 +92,13 @@
                             (gzip gzip)
                             (name "guile-initrd")
                             (system (%current-system))
+                             (modules '())
                             (linux #f)
                             (linux-modules '()))
  "Return a package that contains a Linux initrd (a gzipped cpio archive)
 containing GUILE and that evaluates EXP upon booting.  LINUX-MODULES is a list
-of `.ko' file names to be copied from LINUX into the initrd."
-  ;; TODO: Add a `modules' parameter.
+of `.ko' file names to be copied from LINUX into the initrd.  MODULES is a
+list of Guile module names to be embedded in the initrd."

  ;; General Linux overview in `Documentation/early-userspace/README' and
  ;; `Documentation/filesystems/ramfs-rootfs-initramfs.txt'.
@@ -67,12 +115,22 @@ of `.ko' file names to be copied from LINUX into the initrd."
                    (rnrs bytevectors)
                    ((system foreign) #:select (sizeof)))

-       (let ((guile (assoc-ref %build-inputs "guile"))
-             (cpio  (string-append (assoc-ref %build-inputs "cpio")
-                                   "/bin/cpio"))
-             (gzip  (string-append (assoc-ref %build-inputs "gzip")
-                                   "/bin/gzip"))
-             (out   (assoc-ref %outputs "out")))
+       (let ((guile   (assoc-ref %build-inputs "guile"))
+             (cpio    (string-append (assoc-ref %build-inputs "cpio")
+                                     "/bin/cpio"))
+             (gzip    (string-append (assoc-ref %build-inputs "gzip")
+                                     "/bin/gzip"))
+             (modules (assoc-ref %build-inputs "modules"))
+             (gos     (assoc-ref %build-inputs "modules/compiled"))
+             (scm-dir (string-append "share/guile/" (effective-version)))
+             (go-dir  (format #f ".cache/guile/ccache/~a-~a-~a-~a"
+                              (effective-version)
+                              (if (eq? (native-endianness) (endianness little))
+                                  "LE"
+                                  "BE")
+                              (sizeof '*)
+                              (effective-version)))
+             (out     (assoc-ref %outputs "out")))
         (mkdir out)
         (mkdir "contents")
         (with-directory-excursion "contents"
@@ -84,19 +142,23 @@ of `.ko' file names to be copied from LINUX into the initrd."
           (chmod "init" #o555)
           (chmod "bin/guile" #o555)

-           ;; Compile `init'.
-           (let ((go-dir (format #f ".cache/guile/ccache/~a-~a-~a-~a"
-                                 (effective-version)
-                                 (if (eq? (native-endianness) (endianness little))
-                                     "LE"
-                                     "BE")
-                                 (sizeof '*)
-                                 (effective-version))))
-             (mkdir-p go-dir)
-             (compile-file "init"
-                           #:opts %auto-compilation-options
-                           #:output-file (string-append go-dir "/init.go")))
+           ;; Copy Guile modules.
+           (chmod scm-dir #o777)
+           (copy-recursively modules scm-dir
+                             #:follow-symlinks? #t)
+           (copy-recursively gos (string-append "lib/guile/"
+                                                (effective-version) "/ccache")
+                             #:follow-symlinks? #t)

+           ;; Compile `init'.
+           (mkdir-p go-dir)
+           (set! %load-path (cons modules %load-path))
+           (set! %load-compiled-path (cons gos %load-compiled-path))
+           (compile-file "init"
+                         #:opts %auto-compilation-options
+                         #:output-file (string-append go-dir "/init.go"))
+
+           ;; Copy Linux modules.
           (let* ((linux      (assoc-ref %build-inputs "linux"))
                  (module-dir (and linux
                                   (string-append linux "/lib/modules"))))
@@ -150,50 +212,43 @@ of `.ko' file names to be copied from LINUX into the initrd."
                    (and (zero? (system* gzip "--best" "initrd"))
                         (rename-file "initrd.gz" "initrd")))))))))

-  (let ((name* name))
-    (package
-      (name name*)
-      (version "0")
-      (source #f)
-      (build-system trivial-build-system)
-      (arguments `(#:modules ((guix build utils))
-                   #:builder ,builder))
-      (inputs `(("guile" ,guile)
-                ("cpio" ,cpio)
-                ("gzip" ,gzip)
-                ,@(if linux
-                      `(("linux" ,linux))
-                      '())))
-      (synopsis "An initial RAM disk (initrd) for the Linux kernel")
-      (description
-       "An initial RAM disk (initrd), really a gzipped cpio archive, for use by
+  (package
+    (name name)
+    (version "0")
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments `(#:modules ((guix build utils))
+                           #:builder ,builder))
+    (inputs `(("guile" ,guile)
+              ("cpio" ,cpio)
+              ("gzip" ,gzip)
+              ("modules" ,(module-package modules))
+              ("modules/compiled" ,(compiled-module-package modules))
+              ,@(if linux
+                    `(("linux" ,linux))
+                    '())))
+    (synopsis "An initial RAM disk (initrd) for the Linux kernel")
+    (description
+     "An initial RAM disk (initrd), really a gzipped cpio archive, for use by
 the Linux kernel.")
-      (license gpl3+)
-      (home-page "http://www.gnu.org/software/guix/"))))
+    (license gpl3+)
+    (home-page "http://www.gnu.org/software/guix/")))

 (define-public qemu-initrd
  (expression->initrd
   '(begin
-      (use-modules (rnrs io ports)
-                   (srfi srfi-1)
+      (use-modules (srfi srfi-1)
                   (srfi srfi-26)
                   (ice-9 match)
-                   ((system foreign) #:select (string->pointer))
-                   ((system base compile) #:select (compile-file)))
+                   ((system base compile) #:select (compile-file))
+                   (guix build utils)
+                   (guix build linux-initrd))

-      (display "Welcome, this is GNU/Guile!\n")
+      (display "Welcome, this is GNU's early boot Guile.\n")
      (display "Use '--repl' for an initrd REPL.\n\n")

-      (mkdir "/proc")
-      (mount "none" "/proc" "proc")
-
-      (mkdir "/sys")
-      (mount "none" "/sys" "sysfs")
-
-      (let* ((command (string-trim-both
-                       (call-with-input-file "/proc/cmdline"
-                         get-string-all)))
-             (args    (string-split command char-set:blank))
+      (mount-essential-file-systems)
+      (let* ((args    (linux-command-line))
             (option  (lambda (opt)
                        (let ((opt (string-append opt "=")))
                          (and=> (find (cut string-prefix? opt <>)
@@ -206,34 +261,16 @@ the Linux kernel.")
        (when (member "--repl" args)
          ((@ (system repl repl) start-repl)))

-        (let ((slurp (lambda (module)
-                       (call-with-input-file
-                           (string-append "/modules/" module)
-                         get-bytevector-all))))
-          (display "loading CIFS and companion modules...\n")
-          (for-each (compose load-linux-module slurp)
-                    (list "md4.ko" "ecb.ko" "cifs.ko")))
+        (display "loading CIFS and companion modules...\n")
+        (for-each (compose load-linux-module*
+                           (cut string-append "/modules/" <>))
+                  (list "md4.ko" "ecb.ko" "cifs.ko"))

-        ;; See net/slirp.c for default QEMU networking values.
-        (display "configuring network...\n")
-        (let* ((sock    (socket AF_INET SOCK_STREAM 0))
-               (address (make-socket-address AF_INET
-                                             (inet-pton AF_INET
-                                                        "10.0.2.10")
-                                             0))
-               (flags   (network-interface-flags sock "eth0")))
-          (set-network-interface-address sock "eth0" address)
-          (set-network-interface-flags sock "eth0"
-                                       (logior flags IFF_UP))
-          (if (logand (network-interface-flags sock "eth0") IFF_UP)
-              (display "network interface is up\n")
-              (display "network interface is DOWN\n"))
+        (unless (configure-qemu-networking)
+          (display "network interface is DOWN\n"))

-          (mkdir "/etc")
-          (call-with-output-file "/etc/resolv.conf"
-            (lambda (p)
-              (display "nameserver 10.0.2.3\n" p)))
-          (sleep 1))
+        ;; Make /dev nodes.
+        (make-essential-device-nodes)

        ;; Prepare the real root file system under /root.
        (unless (file-exists? "/root")
@@ -241,27 +278,31 @@ the Linux kernel.")
        (if root
            (mount root "/root" "ext3")
            (mount "none" "/root" "tmpfs"))
-        (mkdir "/root/proc")
-        (mount "none" "/root/proc" "proc")
-        (mkdir "/root/sys")
-        (mount "none" "/root/sys" "sysfs")
-        (mkdir "/root/xchg")
-        (mkdir "/root/nix")
-        (mkdir "/root/nix/store")
+        (mount-essential-file-systems #:root "/root")

-        (mkdir "/root/dev")
-        (let ((makedev (lambda (major minor)
-                         (+ (* major 256) minor))))
-          (mknod "/root/dev/null" 'char-special #o666 (makedev 1 3))
-          (mknod "/root/dev/zero" 'char-special #o666 (makedev 1 5)))
+        (mkdir "/root/xchg")
+        (mkdir-p "/root/nix/store")
+
+        (unless (file-exists? "/root/dev")
+          (mkdir "/root/dev")
+          (make-essential-device-nodes #:root "/root"))

        ;; Mount the host's store and exchange directory.
-        (display "mounting QEMU's SMB shares...\n")
-        (let ((server "10.0.2.4"))
-          (mount (string-append "//" server "/store") "/root/nix/store" "cifs" 0
-                 (string->pointer "guest,sec=none"))
-          (mount (string-append "//" server "/xchg") "/root/xchg" "cifs" 0
-                 (string->pointer "guest,sec=none")))
+        (mount-qemu-smb-share "/store" "/root/nix/store")
+        (mount-qemu-smb-share "/xchg" "/root/xchg")
+
+        ;; Copy the directories that contain .scm and .go files so that the
+        ;; child process in the chroot can load modules (we would bind-mount
+        ;; them but for some reason that fails with EINVAL -- XXX).
+        (mkdir "/root/share")
+        (mkdir "/root/lib")
+        (mount "none" "/root/share" "tmpfs")
+        (mount "none" "/root/lib" "tmpfs")
+        (copy-recursively "/share" "/root/share"
+                          #:log (%make-void-port "w"))
+        (copy-recursively "/lib" "/root/lib"
+                          #:log (%make-void-port "w"))
+

        (if to-load
            (begin
@@ -272,7 +313,10 @@ the Linux kernel.")
              (match (primitive-fork)
                (0
                 (chroot "/root")
-                 (load-compiled "/loader.go"))
+                 (load-compiled "/loader.go")
+
+                 ;; TODO: Remove /lib, /share, and /loader.go.
+                 )
                (pid
                 (format #t "boot file loaded under PID ~a~%" pid)
                 (let ((status (waitpid pid)))
@@ -282,7 +326,78 @@ the Linux kernel.")
              (display "entering a warm and cozy REPL\n")
              ((@ (system repl repl) start-repl))))))
   #:name "qemu-initrd"
+   #:modules '((guix build utils)
+               (guix build linux-initrd))
   #:linux linux-libre
   #:linux-modules '("cifs.ko" "md4.ko" "ecb.ko")))

+(define-public gnu-system-initrd
+  ;; Initrd for the GNU system itself, with nothing QEMU-specific.
+  (expression->initrd
+   '(begin
+      (use-modules (srfi srfi-1)
+                   (srfi srfi-26)
+                   (ice-9 match)
+                   (guix build utils)
+                   (guix build linux-initrd))
+
+      (display "Welcome, this is GNU's early boot Guile.\n")
+      (display "Use '--repl' for an initrd REPL.\n\n")
+
+      (mount-essential-file-systems)
+      (let* ((args    (linux-command-line))
+             (option  (lambda (opt)
+                        (let ((opt (string-append opt "=")))
+                          (and=> (find (cut string-prefix? opt <>)
+                                       args)
+                                 (lambda (arg)
+                                   (substring arg (+ 1 (string-index arg #\=))))))))
+             (to-load (option "--load"))
+             (root    (option "--root")))
+
+        (when (member "--repl" args)
+          ((@ (system repl repl) start-repl)))
+
+        ;; Make /dev nodes.
+        (make-essential-device-nodes)
+
+        ;; Prepare the real root file system under /root.
+        (mkdir-p "/root")
+        (if root
+            ;; Assume ROOT has a usable /dev tree.
+            (mount root "/root" "ext3")
+            (begin
+              (mount "none" "/root" "tmpfs")
+              (make-essential-device-nodes #:root "/root")))
+
+        (mount-essential-file-systems #:root "/root")
+
+        (mkdir-p "/root/tmp")
+        (mount "none" "/root/tmp" "tmpfs")
+
+        ;; XXX: We don't copy our fellow Guile modules to /root (see
+        ;; 'qemu-initrd'), so if TO-LOAD tries to load a module (which can
+        ;; happen if it throws, to display the exception!), then we're
+        ;; screwed.  Hopefully TO-LOAD is a simple expression that just does
+        ;; '(execlp ...)'.
+
+        (if to-load
+            (begin
+              (format #t "loading '~a'...\n" to-load)
+              (chroot "/root")
+              (primitive-load to-load)
+              (format (current-error-port)
+                      "boot program '~a' terminated, rebooting~%"
+                      to-load)
+              (sleep 2)
+              (reboot))
+            (begin
+              (display "no init file passed via '--exec'\n")
+              (display "entering a warm and cozy REPL\n")
+              ((@ (system repl repl) start-repl))))))
+   #:name "qemu-system-initrd"
+   #:modules '((guix build linux-initrd)
+               (guix build utils))
+   #:linux linux-libre))
+
 ;;; linux-initrd.scm ends here
--- a/Show More
+++ b/Show More