Merge branch 'master' into staging

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/local.mk
index 8b09cb3,5a79c79..91b7c3a
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1360,8 -1363,10 +1361,9 @@@ dist_patch_DATA =                                              
    %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch    \
    %D%/packages/patches/ngircd-handle-zombies.patch            \
    %D%/packages/patches/network-manager-plugin-path.patch      \
+   %D%/packages/patches/nginx-socket-cloexec.patch             \
    %D%/packages/patches/nsis-env-passthru.patch                        \
    %D%/packages/patches/nss-increase-test-timeout.patch                \
 -  %D%/packages/patches/nss-pkgconfig.patch                    \
    %D%/packages/patches/nss-3.56-pkgconfig.patch                       \
    %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch            \
    %D%/packages/patches/nvi-assume-preserve-path.patch         \

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

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

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

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

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

diff --cc gnu/packages/golang.scm
index 9fe3184,bf99fd2..0c9b269
--- 1/gnu/packages/golang.scm
--- 2/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@@ -20,7 -20,7 +20,8 @@@
  ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
  ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.com>
  ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 +;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+ ;;; Copyright © 2020 raingloom <raingloom@riseup.net>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

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

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

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

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

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

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

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

diff --cc gnu/packages/python-xyz.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/xorg.scm
Simple merge