Merge branch 'staging'

diff --cc gnu/local.mk
Simple merge

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

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

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

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

diff --cc gnu/packages/kde-frameworks.scm
index 9ecbf75,70cf346..5482400
--- 1/gnu/packages/kde-frameworks.scm
--- 2/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@@ -1,6 -1,6 +1,6 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
- ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
 -;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
++;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2016-2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
  ;;; Copyright © 2016 David Craven <david@craven.ch>
  ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>

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

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

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

diff --cc gnu/packages/ssh.scm
index 90f32c1,0afd8ed..04c8c6c
--- 1/gnu/packages/ssh.scm
--- 2/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@@ -2,9 -2,9 +2,9 @@@
  ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
  ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
  ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
- ;;; Copyright © 2015, 2016, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name>
 -;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 +;;; Copyright © 2016, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
  ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
  ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
  ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>

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

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

diff --cc gnu/tests/monitoring.scm
index c21bb1e,8630f58..be69e1c
--- 1/gnu/tests/monitoring.scm
--- 2/gnu/tests/monitoring.scm
+++ b/gnu/tests/monitoring.scm
@@@ -309,12 -309,7 +309,12 @@@ zabbix||{
            (service dhcp-client-service-type)
            (service postgresql-service-type
                     (postgresql-configuration
-                     (postgresql postgresql-10)
 -                    (postgresql postgresql)))
++                    (postgresql postgresql)
 +                   ;; XXX: Remove when postgresql default socket directory is
 +                    ;; changed to /var/run/postgresql.
 +                    (config-file
 +                     (postgresql-config-file
 +                      (socket-directory #f)))))
            (service zabbix-front-end-service-type
                     (zabbix-front-end-configuration
                      (db-password "zabbix")))