[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'staging'
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'staging' |
|
Date: |
Mon, 1 Feb 2021 15:02:08 -0500 (EST) |
lfam pushed a commit to branch master
in repository guix.
commit 75b775e81b5a81a59656eeba8811b42f45d503da
Merge: 847c816 0981f87
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Mon Feb 1 14:18:38 2021 -0500
Merge branch 'staging'
gnu/local.mk | 9 +-
gnu/packages/admin.scm | 14 +-
gnu/packages/base.scm | 6 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/curl.scm | 63 +-----
gnu/packages/databases.scm | 89 ++++++---
gnu/packages/elf.scm | 17 +-
gnu/packages/fontutils.scm | 73 ++-----
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/gdb.scm | 36 ++--
gnu/packages/ghostscript.scm | 4 +-
gnu/packages/gl.scm | 10 +-
gnu/packages/glib.scm | 40 ++--
gnu/packages/gnome.scm | 43 +++--
gnu/packages/gnuzilla.scm | 4 +-
gnu/packages/gstreamer.scm | 45 ++---
gnu/packages/gtk.scm | 17 +-
gnu/packages/image.scm | 21 +-
gnu/packages/imagemagick.scm | 18 +-
gnu/packages/kde-frameworks.scm | 23 ++-
gnu/packages/kde.scm | 1 +
gnu/packages/libffi.scm | 4 +-
gnu/packages/linux.scm | 26 ++-
gnu/packages/node.scm | 22 +--
gnu/packages/nss.scm | 6 +-
gnu/packages/openldap.scm | 49 ++---
gnu/packages/package-management.scm | 2 +-
.../patches/ghostscript-CVE-2020-15900.patch | 36 ++++
.../patches/ghostscript-freetype-compat.patch | 35 ++++
.../patches/gst-plugins-good-fix-test.patch | 94 +++++++++
gnu/packages/patches/libssh2-CVE-2019-17498.patch | 126 ++++++++++++
.../patches/mesa-skip-disk-cache-test.patch | 19 --
gnu/packages/patches/mesa-skip-tests.patch | 49 +++++
gnu/packages/patches/python-CVE-2020-26116.patch | 47 +++++
.../patches/qtbase-fix-krita-deadlock.patch | 110 -----------
gnu/packages/patches/sbc-fix-build-non-x86.patch | 17 ++
gnu/packages/pulseaudio.scm | 6 +-
gnu/packages/python-crypto.scm | 23 ++-
gnu/packages/python-web.scm | 8 +-
gnu/packages/python-xyz.scm | 16 +-
gnu/packages/python.scm | 1 +
gnu/packages/qt.scm | 211 ++++++++++-----------
gnu/packages/rust.scm | 66 ++++++-
gnu/packages/sphinx.scm | 4 +-
gnu/packages/ssh.scm | 14 +-
gnu/packages/time.scm | 13 +-
gnu/packages/tls.scm | 76 ++------
gnu/packages/video.scm | 15 +-
gnu/packages/vpn.scm | 4 +-
gnu/packages/vulkan.scm | 26 +--
gnu/packages/web.scm | 32 +---
gnu/packages/xdisorg.scm | 8 +-
gnu/packages/xml.scm | 3 +
gnu/packages/xorg.scm | 83 +++-----
gnu/tests/monitoring.scm | 2 +-
55 files changed, 987 insertions(+), 807 deletions(-)
diff --cc gnu/packages/kde-frameworks.scm
index 9ecbf75,70cf346..5482400
--- a/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/ssh.scm
index 90f32c1,0afd8ed..04c8c6c
--- a/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/tests/monitoring.scm
index c21bb1e,8630f58..be69e1c
--- a/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")))