Merge remote-tracking branch 'origin/master' into core-updates

diff --cc Makefile.am
Simple merge

diff --cc doc/guix.texi
Simple merge

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

diff --cc gnu/local.mk
index 4924c93,8f9ed31..e059135
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1146,8 -1166,9 +1167,7 @@@ dist_patch_DATA =                                               
    %D%/packages/patches/icecat-use-older-reveal-hidden-html.patch      \
    %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch     \
    %D%/packages/patches/icecat-use-system-media-libs.patch     \
-   %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch  \
-   %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch  \
+   %D%/packages/patches/icedtea-6-extend-hotspot-aarch64-support.patch \
 -  %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch      \
 -  %D%/packages/patches/icu4c-CVE-2020-10531.patch             \
    %D%/packages/patches/id3lib-CVE-2007-4460.patch                     \
    %D%/packages/patches/id3lib-UTF16-writing-bug.patch                 \
    %D%/packages/patches/ilmbase-fix-tests.patch                        \
@@@ -1182,9 -1203,10 +1202,10 @@@
    %D%/packages/patches/java-xerces-xjavac_taskdef.patch       \
    %D%/packages/patches/jfsutils-add-sysmacros.patch           \
    %D%/packages/patches/jfsutils-include-systypes.patch                \
 -  %D%/packages/patches/jsoncpp-fix-inverted-case.patch                \
    %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch    \
    %D%/packages/patches/kdbusaddons-kinit-file-name.patch      \
 +  %D%/packages/patches/libffi-float128-powerpc64le.patch      \
+   %D%/packages/patches/libffi-3.3-powerpc-fixes.patch         \
    %D%/packages/patches/libvirt-create-machine-cgroup.patch    \
    %D%/packages/patches/libziparchive-add-includes.patch               \
    %D%/packages/patches/localed-xorg-keyboard.patch            \
@@@ -1483,9 -1509,7 +1507,8 @@@
    %D%/packages/patches/python-3-search-paths.patch            \
    %D%/packages/patches/python-3-fix-tests.patch                       \
    %D%/packages/patches/python-3.8-fix-tests.patch             \
 +  %D%/packages/patches/python-3-hurd-configure.patch          \
    %D%/packages/patches/python-CVE-2018-14647.patch            \
-   %D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch     \
    %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch     \
    %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
    %D%/packages/patches/python-axolotl-AES-fix.patch           \
@@@ -1707,7 -1731,9 +1731,8 @@@
    %D%/packages/patches/xsane-fix-pdf-floats.patch             \
    %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \
    %D%/packages/patches/xsane-support-ipv6.patch                       \
-   %D%/packages/patches/xsane-tighten-default-umask.patch
+   %D%/packages/patches/xsane-tighten-default-umask.patch      \
 -  %D%/packages/patches/yggdrasil-extra-config.patch   \
 -  %D%/packages/patches/zziplib-CVE-2018-16548.patch
++  %D%/packages/patches/yggdrasil-extra-config.patch
  
  MISC_DISTRO_FILES =                           \
    %D%/packages/ld-wrapper.in

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

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

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

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

diff --cc gnu/packages/cmake.scm
index 7e679db,2f8d504..7316a3b
--- 1/gnu/packages/cmake.scm
--- 2/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@@ -72,7 -72,7 +72,6 @@@
                "Source/cmGlobalXCodeGenerator.cxx"
                "Source/cmLocalUnixMakefileGenerator3.cxx"
                "Source/cmExecProgramCommand.cxx"
--              "Utilities/Release/release_cmake.cmake"
                "Tests/CMakeLists.txt"
                "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
            (("/bin/sh") (which "sh")))
@@@ -85,7 -85,7 +84,11 @@@
      ;; This test requires network access.
      "CTestTestUpload"
      ;; This test requires 'ldconfig' which is not available in Guix.
--    "RunCMake.install"))
++    "RunCMake.install"
++    ;; This test fails for unknown reason.
++    "RunCMake.file-GET_RUNTIME_DEPENDENCIES"
++    ;; This test requires the bundled libuv.
++    "BootstrapTest"))
  
  (define %preserved-third-party-files
    '(;; 'Source/cm_getdate.c' includes archive_getdate.c wholesale, so it must

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

diff --cc gnu/packages/compression.scm
index c51b8c6,1d643cd..19b24ea
--- 1/gnu/packages/compression.scm
--- 2/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@@ -1429,13 -1427,13 +1434,13 @@@ or junctions, and always follows hard l
  
                 #t))))
         #:make-flags
-        (list "CC=gcc"
 -       ;; TODO: Integrate in next rebuild cycle.
 -       (list ,(if (%current-target-system)
 -                (string-append "CC=" (cc-for-target))
 -                "CC=gcc")
 -             (string-append "PREFIX=" (assoc-ref %outputs "out"))
 -             (string-append "LIBDIR=" (assoc-ref %outputs "lib") "/lib")
 -             (string-append "INCLUDEDIR=" (assoc-ref %outputs "lib") "/include")
++       (list ,(string-append "CC=" (cc-for-target))
 +             (string-append "prefix=" (assoc-ref %outputs "out"))
 +             (string-append "libdir=" (assoc-ref %outputs "lib") "/lib")
 +             (string-append "includedir=" (assoc-ref %outputs "lib") "/include")
 +             ;; Auto-detection is over-engineered and buggy.
 +             "PCLIBDIR=lib"
 +             "PCINCDIR=include"
               ;; Skip auto-detection of, and creating a dependency on, the build
               ;; environment's ‘xz’ for what amounts to a dubious feature anyway.
               "HAVE_LZMA=0"

diff --cc gnu/packages/cross-base.scm
Simple merge

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

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

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

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

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

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

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

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

diff --cc gnu/packages/glib.scm
index 40b0574,43523e5..6efc392
--- 1/gnu/packages/glib.scm
--- 2/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@@ -13,8 -13,7 +13,9 @@@
  ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
  ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
  ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
 +;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
 +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ ;;; Copyright © 2020 Arthur Margerit <ruhtra.mar@gmail.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

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

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

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

diff --cc gnu/packages/image.scm
index 03bcf1a,f379ad8..ebebd79
--- 1/gnu/packages/image.scm
--- 2/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -26,7 -26,7 +26,8 @@@
  ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
  ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
  ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

diff --cc gnu/packages/libffi.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/package-management.scm
Simple merge

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

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

diff --cc gnu/packages/ruby.scm
index 42d4faa,8fc228f..06a90dd
--- 1/gnu/packages/ruby.scm
--- 2/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -146,8 -146,8 +146,8 @@@ a focus on simplicity and productivity.
  
  (define-public ruby-2.7
    (package
 -    (inherit ruby)
 +    (inherit ruby-2.6)
-     (version "2.7.1")
+     (version "2.7.2")
      (source
       (origin
         (method url-fetch)

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

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

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

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

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

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

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

diff --cc gnu/system/vm.scm
Simple merge

diff --cc guix/gexp.scm
Simple merge

diff --cc guix/packages.scm
Simple merge

diff --cc guix/scripts/pack.scm
index ea2a96d,ba9a6dc..6e0a16f
--- 1/guix/scripts/pack.scm
--- 2/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@@ -5,7 -5,7 +5,8 @@@
  ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
  ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright © 2020 Eric Bavier <bavier@posteo.net>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

diff --cc guix/utils.scm
Simple merge

diff --cc tests/packages.scm
Simple merge