Merge branch 'master' into core-updates

diff --cc Makefile.am
Simple merge

diff --cc gnu/ci.scm
index 33c2e84,e024c09..70e86b9
--- 1/gnu/ci.scm
--- 2/gnu/ci.scm
+++ b/gnu/ci.scm
@@@ -139,6 -136,49 +140,49 @@@ SYSTEM.
      "i686-w64-mingw32"
      "x86_64-w64-mingw32"))
  
 -                     %packages-to-cross-build))
+ (define (cross-jobs store system)
+   "Return a list of cross-compilation jobs for SYSTEM."
+   (define (from-32-to-64? target)
+     ;; Return true if SYSTEM is 32-bit and TARGET is 64-bit.  This hack
+     ;; prevents known-to-fail cross-builds from i686-linux or armhf-linux to
+     ;; mips64el-linux-gnuabi64.
+     (and (or (string-prefix? "i686-" system)
+              (string-prefix? "i586-" system)
+              (string-prefix? "armhf-" system))
+          (string-contains target "64")))    ;x86_64, mips64el, aarch64, etc.
+ 
+   (define (same? target)
+     ;; Return true if SYSTEM and TARGET are the same thing.  This is so we
+     ;; don't try to cross-compile to 'mips64el-linux-gnu' from
+     ;; 'mips64el-linux'.
+     (or (string-contains target system)
+         (and (string-prefix? "armhf" system)    ;armhf-linux
+              (string-prefix? "arm" target))))   ;arm-linux-gnueabihf
+ 
+   (define (pointless? target)
+     ;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM.
+     (match system
+       ((or "x86_64-linux" "i686-linux")
+        (if (string-contains target "mingw")
+            (not (string=? "x86_64-linux" system))
+            #f))
+       (_
+        ;; Don't try to cross-compile from non-Intel platforms: this isn't
+        ;; very useful and these are often brittle configurations.
+        #t)))
+ 
+   (define (either proc1 proc2 proc3)
+     (lambda (x)
+       (or (proc1 x) (proc2 x) (proc3 x))))
+ 
+   (append-map (lambda (target)
+                 (map (lambda (package)
+                        (package-cross-job store (job-name package)
+                                           package target system))
++                     (packages-to-cross-build target)))
+               (remove (either from-32-to-64? same? pointless?)
+                       %cross-targets)))
+ 
  (define %guixsd-supported-systems
    '("x86_64-linux" "i686-linux" "armhf-linux"))
  

diff --cc gnu/installer.scm
Simple merge

diff --cc gnu/local.mk
index 7c3e264,99badde..cc219b4
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -801,15 -798,11 +803,14 @@@ dist_patch_DATA =                                               
    %D%/packages/patches/cpufrequtils-fix-aclocal.patch         \
    %D%/packages/patches/crawl-upgrade-saves.patch              \
    %D%/packages/patches/crda-optional-gcrypt.patch             \
-   %D%/packages/patches/csvkit-fix-tests.patch                 \
    %D%/packages/patches/clucene-contribs-lib.patch               \
    %D%/packages/patches/cube-nocheck.patch                     \
 +  %D%/packages/patches/curl-use-ssl-cert-env.patch            \
    %D%/packages/patches/cursynth-wave-rand.patch                       \
    %D%/packages/patches/cvs-CVE-2017-12836.patch               \
 +  %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch                \
    %D%/packages/patches/darkice-workaround-fpermissive-error.patch     \
 +  %D%/packages/patches/datefudge-gettimeofday.patch           \
    %D%/packages/patches/dbus-helper-search-path.patch          \
    %D%/packages/patches/dbus-c++-gcc-compat.patch              \
    %D%/packages/patches/dbus-c++-threading-mutex.patch         \
@@@ -988,9 -977,9 +989,10 @@@
    %D%/packages/patches/guile-1.8-cpp-4.5.patch                        \
    %D%/packages/patches/guile-2.2-default-utf8.patch           \
    %D%/packages/patches/guile-2.2-skip-oom-test.patch            \
+   %D%/packages/patches/guile-3.0-crash.patch                  \
    %D%/packages/patches/guile-default-utf8.patch                       \
    %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
 +  %D%/packages/patches/guile-finalization-crash.patch         \
    %D%/packages/patches/guile-linux-syscalls.patch             \
    %D%/packages/patches/guile-present-coding.patch             \
    %D%/packages/patches/guile-relocatable.patch                        \

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

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/fontutils.scm
index 71d7a19,3daa518..ea2f509
--- 1/gnu/packages/fontutils.scm
--- 2/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -9,8 -9,9 +9,9 @@@
  ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
  ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
  ;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 -;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
 +;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
  ;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
+ ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/terminals.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/web-browsers.scm
Simple merge

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

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

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

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

diff --cc gnu/services/base.scm
Simple merge

diff --cc gnu/system.scm
Simple merge