Merge remote-tracking branch 'origin/master' into staging

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/local.mk
index 4d8813a,bc54b61..e4c5561
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1162,8 -1181,8 +1175,9 @@@ dist_patch_DATA =                                               
    %D%/packages/patches/soundconverter-remove-gconf-dependency.patch   \
    %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch  \
    %D%/packages/patches/soundtouch-CVE-2018-1000223.patch      \
-   %D%/packages/patches/sssd-curl-compat.patch                         \
++  %D%/packages/patches/sssd-curl-compat.patch                 \
    %D%/packages/patches/steghide-fixes.patch                   \
+   %D%/packages/patches/streamlink-update-test.patch           \
    %D%/packages/patches/superlu-dist-scotchmetis.patch         \
    %D%/packages/patches/swig-guile-gc.patch                    \
    %D%/packages/patches/swish-e-search.patch                   \

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

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

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

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

diff --cc gnu/packages/game-development.scm
Simple merge

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

diff --cc gnu/packages/gl.scm
index 2c64b0b,39b3c52..5fff383
--- 1/gnu/packages/gl.scm
--- 2/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@@ -50,10 -50,8 +50,9 @@@
    #:use-module (gnu packages xorg)
    #:use-module (guix download)
    #:use-module (guix git-download)
-   #:use-module (guix build utils)
    #:use-module (guix build-system gnu)
    #:use-module (guix build-system cmake)
 +  #:use-module (guix build-system meson)
    #:use-module ((guix licenses) #:prefix license:)
    #:use-module (guix packages)
    #:use-module (guix utils)

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

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

diff --cc gnu/packages/libreoffice.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/pdf.scm
Simple merge

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

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

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

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

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

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