01/02: Merge branch 'master' into core-updates

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit 2abf678682c42842c16e026c51d96b1fa86be88f
Merge: 9ae1e92 c362a40
Author: Mark H Weaver <address@hidden>
Date:   Thu Jun 18 01:32:37 2015 -0400

    Merge branch 'master' into core-updates

 Makefile.am                         |    6 +-
 build-aux/hydra/demo-os.scm         |   16 +-
 build-aux/list-packages.scm         |  450 -----------------------------------
 doc.am                              |   10 +-
 doc/contributing.texi               |   28 ++-
 doc/guix.texi                       |  109 ++++++++-
 gnu/build/install.scm               |   20 +-
 gnu/packages.scm                    |   36 +++-
 gnu/packages/bioinformatics.scm     |   58 +++++-
 gnu/packages/ebook.scm              |    4 +-
 gnu/packages/freedesktop.scm        |   37 +++-
 gnu/packages/image.scm              |   23 ++
 gnu/packages/ocaml.scm              |    7 +-
 gnu/packages/package-management.scm |    4 +-
 gnu/packages/qt.scm                 |   14 +-
 gnu/packages/samba.scm              |    6 +-
 gnu/system.scm                      |   15 +-
 gnu/system/install.scm              |    6 +-
 guix/gnu-maintenance.scm            |   25 ++-
 guix/scripts/archive.scm            |    4 +-
 guix/scripts/edit.scm               |   79 ++++++
 guix/scripts/offload.scm            |    4 +-
 guix/scripts/package.scm            |   36 +---
 guix/scripts/size.scm               |  247 +++++++++++++++++++
 po/guix/POTFILES.in                 |    2 +
 tests/size.scm                      |   87 +++++++
 26 files changed, 777 insertions(+), 556 deletions(-)