Merge remote-tracking branch 'master' into core-updates.

diff --cc gnu/local.mk
Simple merge

diff --cc gnu/packages/bash.scm
Simple merge

diff --cc gnu/packages/build-tools.scm
Simple merge

diff --cc gnu/packages/commencement.scm
Simple merge

diff --cc gnu/packages/compression.scm
Simple merge

diff --cc gnu/packages/emacs-xyz.scm
Simple merge

diff --cc gnu/packages/freedesktop.scm
Simple merge

diff --cc gnu/packages/games.scm
Simple merge

diff --cc gnu/packages/gcc.scm
Simple merge

diff --cc gnu/packages/gnome.scm
Simple merge

diff --cc gnu/packages/gnupg.scm
index abce1aa,b31280e..4e8869a
--- 1/gnu/packages/gnupg.scm
--- 2/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@@ -478,23 -465,9 +478,23 @@@ gpgpme starting with version 1.7."
                      (commit (string-append "v" version))))
                (sha256
                 (base32
-                 "1mhc5m4xygkfj7x18f8apiqpfdn9mrql0am5sk13cf5xn8x1r63z"))
+                 "0n232iyayc46f7hywmjw0jr7pbmmz5h4b04jskhkzz9gxz0ci99c"))
                (file-name (string-append name "-" version "-checkout"))))
      (build-system gnu-build-system)
 +    (arguments
 +     ;; When cross-compiling, the bash script libgcrypt-config provided by
 +     ;; libgcrypt must be accessible during configure phase.
 +     `(,@(if (%current-target-system)
 +             '(#:phases
 +               (modify-phases %standard-phases
 +                 (add-before 'configure 'add-libgrypt-config
 +                   (lambda _
 +                     (setenv "PATH" (string-append
 +                                     (assoc-ref %build-inputs "libgcrypt")
 +                                     "/bin:"
 +                                     (getenv "PATH")))
 +                     #t))))
 +             '())))
      (native-inputs
       `(("pkg-config" ,pkg-config)
         ("autoconf" ,autoconf)

diff --cc gnu/packages/guile.scm
Simple merge

diff --cc gnu/packages/image.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/llvm.scm
Simple merge

diff --cc gnu/packages/maths.scm
Simple merge

diff --cc gnu/packages/messaging.scm
Simple merge

diff --cc gnu/packages/music.scm
Simple merge

diff --cc gnu/packages/python-xyz.scm
Simple merge

diff --cc gnu/packages/qt.scm
Simple merge

diff --cc gnu/packages/ruby.scm
Simple merge

diff --cc gnu/packages/shells.scm
index ef7f911,1d2f754..0369a20
--- 1/gnu/packages/shells.scm
--- 2/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@@ -11,7 -11,7 +11,8 @@@
  ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
  ;;; Copyright © 2019 Meiyo Peng <meiyo.peng@gmail.com>
  ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
 +;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
+ ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

diff --cc gnu/packages/ssh.scm
Simple merge

diff --cc gnu/packages/telephony.scm
Simple merge

diff --cc gnu/packages/texinfo.scm
index c755790,44800b3..ae8ecc8
--- 1/gnu/packages/texinfo.scm
--- 2/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@@ -2,9 -2,8 +2,10 @@@
  ;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
  ;;; Copyright © 2014, 2016 Eric Bavier <bavier@member.fsf.org>
  ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
- ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
 +;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
 +;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -22,16 -21,19 +23,21 @@@
  ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
  
  (define-module (gnu packages texinfo)
 +  #:use-module (gnu packages autotools)
    #:use-module (guix licenses)
    #:use-module (guix packages)
+   #:use-module (guix utils)
    #:use-module (guix download)
 +  #:use-module (guix utils)
+   #:use-module (guix git-download)
    #:use-module (guix build-system gnu)
    #:use-module (gnu packages)
+   #:use-module (gnu packages autotools)
    #:use-module (gnu packages compression)
+   #:use-module (gnu packages gettext)
    #:use-module (gnu packages ncurses)
-   #:use-module (gnu packages perl))
+   #:use-module (gnu packages perl)
+   #:use-module (gnu packages readline))
  
  (define-public texinfo
    (package

diff --cc gnu/packages/tls.scm
Simple merge

diff --cc gnu/packages/version-control.scm
Simple merge

diff --cc gnu/packages/web.scm
Simple merge

diff --cc gnu/packages/xdisorg.scm
Simple merge

diff --cc gnu/packages/xml.scm
Simple merge

diff --cc guix/gexp.scm
Simple merge

diff --cc guix/profiles.scm
Simple merge