Merge branch 'master' into core-updates

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/local.mk
index 41f4e4e,16b63bc..c6962ae
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -958,9 -948,9 +959,10 @@@ dist_patch_DATA =                                         
    %D%/packages/patches/id3lib-CVE-2007-4460.patch                     \
    %D%/packages/patches/idris-test-no-node.patch                       \
    %D%/packages/patches/ilmbase-fix-tests.patch                        \
 +  %D%/packages/patches/inkscape-poppler-0.76.patch            \
    %D%/packages/patches/intltool-perl-compatibility.patch      \
    %D%/packages/patches/irrlicht-use-system-libs.patch         \
+   %D%/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch      \
    %D%/packages/patches/isl-0.11.1-aarch64-support.patch       \
    %D%/packages/patches/jacal-fix-texinfo.patch                        \
    %D%/packages/patches/jamvm-arm.patch                                \
@@@ -1026,9 -1025,9 +1028,10 @@@
    %D%/packages/patches/libotr-test-auth-fix.patch             \
    %D%/packages/patches/libmad-armv7-thumb-pt1.patch           \
    %D%/packages/patches/libmad-armv7-thumb-pt2.patch           \
-   %D%/packages/patches/libmad-frame-length.patch              \
+   %D%/packages/patches/libmad-length-check.patch              \
+   %D%/packages/patches/libmad-md_size.patch                   \
    %D%/packages/patches/libmad-mips-newgcc.patch                       \
 +  %D%/packages/patches/libmp4v2-c++11.patch                   \
    %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch          \
    %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch  \
    %D%/packages/patches/libreoffice-boost.patch                        \

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/guile.scm
index df71965,b8a5382..b07a570
--- 1/gnu/packages/guile.scm
--- 2/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -259,31 -286,41 +259,29 @@@ without requiring the source code to b
                    (max-silent-time . 36000))))) ;10 hours (needed on ARM
                                                  ;  when heavily loaded)
  
 -(define-public guile-2.2.6
 -  (package
 -    (inherit guile-2.2)
 -    (version "2.2.6")
 -    (source (origin
 -              (inherit (package-source guile-2.2))
 -              (uri (string-append "mirror://gnu/guile/guile-" version
 -                                  ".tar.xz"))
 -              (sha256
 -               (base32
 -                "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk"))))))
 -
  (define-public guile-next
    ;; This is the upcoming Guile 3.0, with JIT support.
-   (let ((commit "6f3357b0df64c4be17e72079864c09a542f1c779")
-         (revision "1"))
-     (package
-       (inherit guile-2.2)
-       (name "guile-next")
-       (version "2.9.2")
-       (source (origin
-                 (inherit (package-source guile-2.2))
-                 (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-"
-                                     version ".tar.xz"))
-                 (sha256
-                  (base32
-                   "1w358df2wmcyzk2ziqrj2zhwqisaqraqfa3008ay23nf1a7bw0z4"))))
-       (native-search-paths
-        (list (search-path-specification
-               (variable "GUILE_LOAD_PATH")
-               (files '("share/guile/site/3.0")))
-              (search-path-specification
-               (variable "GUILE_LOAD_COMPILED_PATH")
-               (files '("lib/guile/3.0/site-ccache"
-                        "share/guile/site/3.0")))))
-       (properties '((ftp-server . "alpha.gnu.org")
-                     (upstream-name . "guile"))))))
+   (package
+     (inherit guile-2.2)
+     (name "guile-next")
+     (version "2.9.3")
+     (source (origin
+               (inherit (package-source guile-2.2))
+               (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-"
+                                   version ".tar.xz"))
+               (sha256
+                (base32
+                 "14990wcpysgw58kij03wbgiggmi5z94jmy7wdcqnn6ny7cimkkgr"))))
+     (native-search-paths
+      (list (search-path-specification
+             (variable "GUILE_LOAD_PATH")
+             (files '("share/guile/site/3.0")))
+            (search-path-specification
+             (variable "GUILE_LOAD_COMPILED_PATH")
+             (files '("lib/guile/3.0/site-ccache"
+                      "share/guile/site/3.0")))))
+     (properties '((ftp-server . "alpha.gnu.org")
+                   (upstream-name . "guile")))))
  
  (define (make-guile-readline guile)
    (package

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

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

diff --cc gnu/packages/libevent.scm
index 58c451a,4898f0a..ae87671
--- 1/gnu/packages/libevent.scm
--- 2/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@@ -41,21 -41,21 +41,21 @@@
  (define-public libevent
    (package
      (name "libevent")
-     (version "2.1.10")
+     (version "2.1.11")
      (source (origin
 -             (method url-fetch)
 -             (uri (string-append
 -                   "https://github.com/libevent/libevent/releases/download/release-"
 -                   version "-stable/libevent-" version "-stable.tar.gz"))
 -             (sha256
 -              (base32
 -               "0g988zqm45sj1hlhhz4il5z4dpi5dl74hzjwzl4md37a09iaqnx6"))))
 +              (method url-fetch)
 +              (uri (string-append
 +                    "https://github.com/libevent/libevent/releases/download/release-"
 +                    version "-stable/libevent-" version "-stable.tar.gz"))
 +              (sha256
 +               (base32
-                 "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78"))))
++                "0g988zqm45sj1hlhhz4il5z4dpi5dl74hzjwzl4md37a09iaqnx6"))))
      (build-system gnu-build-system)
      (arguments
 -      ;; This skips some of the tests which fail on armhf and aarch64.
 +     ;; This skips some of the tests which fail on armhf and aarch64.
       '(#:configure-flags '("--disable-libevent-regress")))
      (inputs
 -     `(("python" ,python-2)))           ; for 'event_rpcgen.py'
 +     `(("python" ,python-wrapper)))     ;for 'event_rpcgen.py'
      (native-inputs
       `(("which" ,which)))
      (home-page "https://libevent.org/")

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

diff --cc gnu/packages/machine-learning.scm
Simple merge

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

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

diff --cc gnu/packages/mpd.scm
index d65ac33,5468ba9..e807045
--- 1/gnu/packages/mpd.scm
--- 2/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@@ -99,10 -100,20 +99,10 @@@ interfacing MPD in the C, C++ & Objecti
                                "/mpd-" version ".tar.xz"))
                (sha256
                 (base32
-                 "1gbcg8icm0pp918jw1lx1j066m39zg9wyqjla328ic848j5zhbnk"))))
+                 "1sjyhmq50nlccwmd8xn7m0bk8xvyixvfyr24v9dy3g86hhk0pdwm"))))
      (build-system meson-build-system)
      (arguments
 -     `(#:configure-flags '("-Ddocumentation=true") ; the default is 'false'...
 -       #:phases
 -       (modify-phases %standard-phases
 -         (add-before 'configure 'expand-C++-include-path
 -           ;; Make <gcc>/include/c++/ext/string_conversions.h find <stdlib.h>.
 -           (lambda* (#:key inputs #:allow-other-keys)
 -             (let* ((path "CPLUS_INCLUDE_PATH")
 -                    (gcc  (assoc-ref inputs "gcc"))
 -                    (c++  (string-append gcc "/include/c++")))
 -               (setenv path (string-append c++ ":" (getenv path)))
 -               #t))))))
 +     `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'...
      (inputs `(("ao" ,ao)
                ("alsa-lib" ,alsa-lib)
                ("avahi" ,avahi)

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

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

diff --cc gnu/packages/package-management.scm
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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