[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'version-1.4.0'
|
From: |
guix-commits |
|
Subject: |
01/02: Merge branch 'version-1.4.0' |
|
Date: |
Mon, 17 Jan 2022 12:03:11 -0500 (EST) |
apteryx pushed a commit to branch master
in repository guix.
commit 276f40fdc349d2ad62582b23ea55e061b689cfc0
Merge: b2f6b6f6b9 6ba510d76d
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Jan 17 10:07:35 2022 -0500
Merge branch 'version-1.4.0'
With resolved conflicts in:
gnu/packages/gnome.scm
gnu/packages/openstack.scm
gnu/packages/python-xyz.scm
gnu/local.mk | 7 +-
gnu/packages/admin.scm | 57 +-
gnu/packages/autotools.scm | 69 +-
gnu/packages/aux-files/python/sanity-check.py | 2 +-
gnu/packages/aux-files/python/sitecustomize.py | 22 +-
gnu/packages/avahi.scm | 63 +-
gnu/packages/base.scm | 33 +-
gnu/packages/bioinformatics.scm | 178 ++---
gnu/packages/build-tools.scm | 48 +-
gnu/packages/check.scm | 103 +--
gnu/packages/cmake.scm | 4 +-
gnu/packages/compression.scm | 26 +
gnu/packages/crates-graphics.scm | 30 +-
gnu/packages/crates-io.scm | 202 ++++--
gnu/packages/cups.scm | 9 -
gnu/packages/emacs-xyz.scm | 2 +-
gnu/packages/emacs.scm | 11 +-
gnu/packages/freedesktop.scm | 13 +-
gnu/packages/games.scm | 1 -
gnu/packages/geo.scm | 3 +-
gnu/packages/gettext.scm | 7 -
gnu/packages/gl.scm | 12 +-
gnu/packages/glib.scm | 61 +-
gnu/packages/gnome.scm | 169 ++---
gnu/packages/gnupg.scm | 45 +-
gnu/packages/gnuzilla.scm | 10 +-
gnu/packages/golang.scm | 35 +-
gnu/packages/graph.scm | 135 ++--
gnu/packages/gtk.scm | 36 +-
gnu/packages/ipfs.scm | 11 +-
gnu/packages/kerberos.scm | 55 +-
gnu/packages/linux.scm | 106 ++-
gnu/packages/llvm.scm | 5 +-
gnu/packages/machine-learning.scm | 9 +-
gnu/packages/man.scm | 4 +-
gnu/packages/music.scm | 27 +-
gnu/packages/networking.scm | 14 +-
gnu/packages/nss.scm | 4 +-
gnu/packages/openstack.scm | 4 +-
gnu/packages/package-management.scm | 3 +-
gnu/packages/patches/binutils-CVE-2021-45078.patch | 257 +++++++
gnu/packages/patches/gtk-introspection-test.patch | 22 +
gnu/packages/patches/libtool-skip-tests2.patch | 8 +-
gnu/packages/patches/shadow-hurd-pctrl.patch | 16 -
gnu/packages/pciutils.scm | 7 +-
gnu/packages/pdf.scm | 3 +-
gnu/packages/phabricator.scm | 8 +-
gnu/packages/photo.scm | 1 -
gnu/packages/python-build.scm | 90 ++-
gnu/packages/python-compression.scm | 33 +
gnu/packages/python-science.scm | 29 +-
gnu/packages/python-web.scm | 40 +-
gnu/packages/python-xyz.scm | 742 +++++++++++----------
gnu/packages/python.scm | 4 +-
gnu/packages/rust.scm | 48 +-
gnu/packages/samba.scm | 141 ++--
gnu/packages/shells.scm | 1 -
gnu/packages/syncthing.scm | 9 -
gnu/packages/syndication.scm | 2 +-
gnu/packages/tbb.scm | 10 +-
gnu/packages/tex.scm | 299 ++++-----
gnu/packages/version-control.scm | 9 +-
gnu/packages/video.scm | 35 +-
gnu/packages/virtualization.scm | 2 -
gnu/packages/webkit.scm | 15 +-
gnu/packages/xdisorg.scm | 2 +-
gnu/packages/xorg.scm | 22 +-
guix/build/gnu-build-system.scm | 2 +
guix/build/utils.scm | 8 +-
guix/lint.scm | 4 +-
tests/build-utils.scm | 57 +-
71 files changed, 1940 insertions(+), 1621 deletions(-)
diff --cc gnu/local.mk
index 8163176950,2e46fac7f7..7e044d4a2b
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -910,9 -908,9 +910,10 @@@ dist_patch_DATA =
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/binutils-mingw-w64-timestamp.patch \
%D%/packages/patches/binutils-mingw-w64-deterministic.patch \
+ %D%/packages/patches/binutils-CVE-2021-45078.patch \
%D%/packages/patches/bpftrace-disable-bfd-disasm.patch \
%D%/packages/patches/byobu-writable-status.patch \
+ %D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \
%D%/packages/patches/cabal-install-base16-bytestring1.0.patch
\
%D%/packages/patches/cabal-install-ghc8.10.patch \
%D%/packages/patches/cairo-CVE-2018-19876.patch \
diff --cc gnu/packages/gnome.scm
index d8d34c89ed,6c63b8bc59..591356f72f
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -6433,13 -6415,10 +6421,12 @@@ supports playlists, song ratings, and a
name "-" version ".tar.xz"))
(sha256
(base32
- "0ddjwcd77nw0rxb5x5bz5hd671m8gya9827p8rsnb58x103kpai8"))))
+ "0ddjwcd77nw0rxb5x5bz5hd671m8gya9827p8rsnb58x103kpai8"))
+ ;; XXX: Remove when upgrading to 42.0
+ (patches (search-patches "eog-update-libportal-usage.patch"))))
(build-system meson-build-system)
(arguments
- `(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
- #:configure-flags
+ `(#:configure-flags
;; Otherwise, the RUNPATH will lack the final 'eog' path component.
(list (string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib/eog"))
diff --cc gnu/packages/openstack.scm
index e1ffc0ff23,fbf8f42334..1b0f278605
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@@ -269,9 -268,9 +269,9 @@@ to docs.openstack.org and developer.ope
;; when building the package. Skip the tests for now.
`(#:tests? #f))
(propagated-inputs
- (list python-stestr))
- (list python-babel python-subunit python-testrepository
python-testtools))
++ (list python-babel python-stestr python-testrepository python-testtools))
(native-inputs
- (list python-pbr python-testtools python-babel python-testrepository))
+ (list python-pbr))
(home-page "https://www.openstack.org/";)
(synopsis "Testr wrapper to provide functionality for OpenStack projects")
(description
diff --cc gnu/packages/package-management.scm
index ba5736f851,265763cc74..8891690daa
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@@ -1836,8 -1836,8 +1836,7 @@@ cp -r /tmp/locale/*/en_US.*"))
("python-pyparsing" ,python-pyparsing)
("socat" ,socat)
("which" ,which)))
-- (propagated-inputs (list glib-networking gnupg-2.2.32
-- gsettings-desktop-schemas))
++ (propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas))
(inputs
`(("appstream-glib" ,appstream-glib)
("bubblewrap" ,bubblewrap)
diff --cc gnu/packages/python-science.scm
index 1ecd4fbc7a,aa4d5736a7..1cfc8e5869
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@@ -4,9 -4,9 +4,9 @@@
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke
<mbakke@fastmail.com>
+;;; Copyright © 2016-2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
- ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright © 2019, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
diff --cc gnu/packages/python-xyz.scm
index 80ce58400a,cfd2d68219..42670f34c3
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -27957,16 -27590,24 +28021,24 @@@ compatible with a wide range of version
(method url-fetch)
(uri (pypi-uri "platformdirs" version))
(sha256
- (base32 "1whycrymqpsl7nsaknmcybzyh4fg4kqk6vd7zwl28kfhnf05wyin"))))
+ (base32 "1njz0h4iky8iglrb85cd07hpa3lp1a2dfr934dj65hxwzvfk61j4"))))
(build-system python-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests? (invoke "pytest" "-vv")))))))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pretend-version
+ ;; The version string is usually derived via setuptools-scm, but
+ ;; without the git metadata available, the version string is set to
+ ;; '0.0.0'.
+ (lambda _
+ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" ,version)))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest")))))))
(native-inputs
- (list python-appdirs python-pytest python-pytest-mock
- python-setuptools-scm))
+ (list python-appdirs python-pytest python-pytest-cov
+ python-pytest-mock python-setuptools-scm))
(home-page "https://github.com/platformdirs/platformdirs";)
(synopsis "Determine the appropriate platform-specific directories")
(description "When writing applications, finding the right location to
diff --cc gnu/packages/syndication.scm
index 6d4a61efbd,ae1f9bdb02..c3c5c243eb
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@@ -247,8 -247,9 +247,8 @@@ cards."
#:install-source? #f
#:cargo-inputs
(("rust-backtrace" ,rust-backtrace-0.3)
- ("rust-bitflags" ,rust-bitflags-1.3)
+ ("rust-bitflags" ,rust-bitflags-1)
("rust-chrono" ,rust-chrono-0.4)
- ("rust-clap" ,rust-clap-2)
("rust-curl-sys" ,rust-curl-sys-0.4)
("rust-cxx" ,rust-cxx-1)
("rust-fastrand" ,rust-fastrand-1)