Merge branch 'staging' into core-updates

diff --cc gnu/local.mk
index 88ce141,125118b..1040e4d
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1248,7 -1256,12 +1255,13 @@@ dist_patch_DATA =                                             
    %D%/packages/patches/p7zip-CVE-2017-17969.patch             \
    %D%/packages/patches/p7zip-remove-unused-code.patch         \
    %D%/packages/patches/pam-mount-luks2-support.patch          \
 +  %D%/packages/patches/pango-skip-libthai-test.patch          \
+   %D%/packages/patches/sdl-pango-api_additions.patch          \
+   %D%/packages/patches/sdl-pango-blit_overflow.patch          \
+   %D%/packages/patches/sdl-pango-fillrect_crash.patch         \
+   %D%/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapToSurface.patch    \
+   %D%/packages/patches/sdl-pango-matrix_declarations.patch    \
+   %D%/packages/patches/sdl-pango-sans-serif.patch             \
    %D%/packages/patches/patchutils-test-perms.patch            \
    %D%/packages/patches/patch-hurd-path-max.patch              \
    %D%/packages/patches/perl-autosplit-default-time.patch      \
@@@ -1391,9 -1408,9 +1407,8 @@@
    %D%/packages/patches/spice-fix-test-armhf.patch             \
    %D%/packages/patches/steghide-fixes.patch                   \
    %D%/packages/patches/superlu-dist-awpm-grid.patch           \
-   %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch        \
    %D%/packages/patches/superlu-dist-scotchmetis.patch         \
    %D%/packages/patches/supertux-unbundle-squirrel.patch               \
 -  %D%/packages/patches/swig-guile-gc.patch                    \
    %D%/packages/patches/swish-e-search.patch                   \
    %D%/packages/patches/swish-e-format-security.patch          \
    %D%/packages/patches/symmetrica-bruch.patch                 \

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

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/file-systems.scm
index 50afe29,3e7314b..a86ae0e
--- 1/gnu/packages/file-systems.scm
--- 2/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@@ -52,8 -53,66 +53,66 @@@
    #:use-module (gnu packages readline)
    #:use-module (gnu packages sqlite)
    #:use-module (gnu packages tls)
+   #:use-module (gnu packages valgrind)
    #:use-module (gnu packages xml))
  
 -         ("util-linux" ,util-linux)     ; lib{blkid,uuid}
+ (define-public bcachefs-tools
+   (let ((commit "ab2f1ec24f5307b0cf1e3c4ad19bf350d9f54d9f")
+         (revision "0"))
+     (package
+       (name "bcachefs-tools")
+       (version (git-version "0.1" revision commit))
+       (source
+        (origin
+          (method git-fetch)
+          (uri (git-reference
+                (url "https://evilpiepirate.org/git/bcachefs-tools.git")
+                (commit commit)))
+          (file-name (git-file-name name version))
+          (sha256
+           (base32 "10pafvaxg1lvwnqjv3a4rsi96bghbpcsgh3vhqilndi334k3b0hd"))))
+       (build-system gnu-build-system)
+       (arguments
+        `(#:make-flags
+          (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+                "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
+                "CC=gcc"
+                "PYTEST=pytest")
+          #:phases
+          (modify-phases %standard-phases
+            (delete 'configure))         ; no configure script
+          #:tests? #f))                  ; XXX 6 valgrind tests fail
+       (native-inputs
+        `(("pkg-config" ,pkg-config)
+ 
+          ;; For tests.
+          ("python-pytest" ,python-pytest)
+          ("valgrind" ,valgrind)))
+       (inputs
+        `(("keyutils" ,keyutils)
+          ("libaio" ,libaio)
+          ("libscrypt" ,libscrypt)
+          ("libsodium" ,libsodium)
+          ("liburcu" ,liburcu)
++         ("util-linux" ,util-linux "lib") ; lib{blkid,uuid}
+          ("lz4" ,lz4)
+          ("zlib" ,zlib)
+          ("zstd:lib" ,zstd "lib")))
+       (home-page "https://bcachefs.org/")
+       (synopsis "Tools to create and manage bcachefs file systems")
+       (description
+        "The bcachefs-tools are command-line utilities for creating, checking,
+ and otherwise managing bcachefs file systems.
+ 
+ Bcachefs is a @acronym{CoW, copy-on-write} file system supporting native
+ encryption, compression, snapshots, and (meta)data checksums.  It can use
+ multiple block devices for replication and/or performance, similar to RAID.
+ 
+ In addition, bcachefs provides all the functionality of bcache, a block-layer
+ caching system, and lets you assign different roles to each device based on its
+ performance and other characteristics.")
+       (license license:gpl2+))))
+ 
  (define-public httpfs2
    (package
      (name "httpfs2")

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

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

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

diff --cc gnu/packages/gimp.scm
index d9d3f14,0f2eba3..af2b06a
--- 1/gnu/packages/gimp.scm
--- 2/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@@ -174,7 -174,8 +174,8 @@@ buffers."
         ("glib" ,glib)
         ("glib-networking" ,glib-networking)
         ("libtiff" ,libtiff)
 -       ("libjpeg" ,libjpeg)
+        ("libwebp" ,libwebp)
 +       ("libjpeg" ,libjpeg-turbo)
         ("atk" ,atk)
         ("gexiv2" ,gexiv2)
         ("gtk+" ,gtk+-2)

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

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

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

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

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

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

diff --cc gnu/packages/machine-learning.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/openldap.scm
index 334affc,de8239b..107b923
--- 1/gnu/packages/openldap.scm
--- 2/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@@ -4,7 -4,7 +4,8 @@@
  ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
  ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
  ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 +;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
+ ;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -49,9 -49,8 +50,9 @@@
    #:use-module (gnu packages tls)
    #:use-module (gnu packages web)
    #:use-module (gnu packages)
-   #:use-module ((guix licenses) #:select (openldap2.8 lgpl2.1+ gpl3+ psfl))
+   #:use-module ((guix licenses) #:select (openldap2.8 lgpl2.1+ gpl3+ psfl expat))
    #:use-module (guix packages)
 +  #:use-module (guix utils)
    #:use-module (guix download)
    #:use-module (guix build-system gnu)
    #:use-module (guix build-system python))

diff --cc gnu/packages/password-utils.scm
Simple merge

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

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

diff --cc gnu/packages/python-xyz.scm
index 6358db8,31aeffa..b884b4e
--- 1/gnu/packages/python-xyz.scm
--- 2/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -68,7 -68,7 +68,8 @@@
  ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
  ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
  ;;; Copyright © 2019 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
 +;;; Copyright © 2020 Riku Viitanen <riku.viitanen@protonmail.com>
+ ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

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

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/web.scm
index 00387ed,15b5ded..2336555
--- 1/gnu/packages/web.scm
--- 2/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -35,9 -35,8 +35,10 @@@
  ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
  ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
  ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
 +;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 +;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
  ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
+ ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

diff --cc gnu/packages/webkit.scm
index 3d367aa,8ceee90..b3a87e7
--- 1/gnu/packages/webkit.scm
--- 2/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -126,10 -126,9 +126,10 @@@ engine that uses Wayland for graphics o
                (method url-fetch)
                (uri (string-append "https://www.webkitgtk.org/releases/"
                                    "webkitgtk-" version ".tar.xz"))
 +              (patches (search-patches "webkitgtk-icu-65.patch"))
                (sha256
                 (base32
-                 "04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b"))))
+                 "04g6y0sv04d20bw401myq3k828ikysjhx383ly81vh9wji9i3mdd"))))
      (build-system cmake-build-system)
      (outputs '("out" "doc"))
      (arguments

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

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

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

diff --cc guix/derivations.scm
Simple merge