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

[Marius Bakke]

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

commit 4b7e5c1131430f10e6211879836cf17447ef5bbc
Merge: adb984d 608e42e
Author: Marius Bakke <address@hidden>
Date:   Wed Mar 15 17:52:26 2017 +0100

    Merge branch 'master' into core-updates

 HACKING                          |  10 +-
 Makefile.am                      |   3 +-
 build-aux/compile-all.scm        |  33 ++++++-
 configure.ac                     |   8 +-
 doc/guix.texi                    |  42 +++++++-
 gnu/build/install.scm            |  30 +++---
 gnu/packages/bioinformatics.scm  |   6 +-
 gnu/packages/bittorrent.scm      |   4 +-
 gnu/packages/certs.scm           |   4 +-
 gnu/packages/conky.scm           |   4 +-
 gnu/packages/databases.scm       |   4 +-
 gnu/packages/debug.scm           |  12 +--
 gnu/packages/documentation.scm   |  22 ++++-
 gnu/packages/games.scm           |   6 +-
 gnu/packages/gnustep.scm         |  65 +++++++------
 gnu/packages/gnuzilla.scm        |  95 +++++++++---------
 gnu/packages/gtk.scm             |  78 ++++++++-------
 gnu/packages/guile.scm           |   3 +
 gnu/packages/linux.scm           |   8 +-
 gnu/packages/mail.scm            | 101 +++++++++++++++++++-
 gnu/packages/messaging.scm       |   4 +-
 gnu/packages/ocaml.scm           | 202 +++++++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm          |  18 ++--
 gnu/packages/shellutils.scm      |   4 +-
 gnu/packages/version-control.scm |  11 ---
 gnu/packages/video.scm           |   8 +-
 gnu/packages/w3m.scm             |   4 +-
 guix/build/download.scm          |   3 +-
 guix/build/syscalls.scm          |  45 ++++++++-
 guix/scripts/pack.scm            | 151 ++++++++++++++++++++++-------
 guix/upstream.scm                |   4 +-
 guix/zlib.scm                    |  29 ++----
 po/guix/POTFILES.in              |   1 +
 tests/guix-system.sh             |   9 +-
 tests/pack.scm                   |  79 +++++++++++++++
 tests/store.scm                  |   4 +-
 tests/zlib.scm                   |  11 ++-
 37 files changed, 869 insertions(+), 256 deletions(-)

diff --cc gnu/packages/documentation.scm
index cd42bc0,94e979c..792e70e
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@@ -3,7 -3,7 +3,8 @@@
  ;;; Copyright © 2014, 2016 Andreas Enge <address@hidden>
  ;;; Copyright © 2016 Eric Bavier <address@hidden>
  ;;; Copyright © 2016 Roel Janssen <address@hidden>
 +;;; Copyright © 2016 Thomas Danckaert <address@hidden>
+ ;;; Copyright © 2017 Kei Kebreau <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;