[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Wed, 3 Feb 2021 05:02:13 -0500 (EST) |
cbaines pushed a commit to branch core-updates
in repository guix.
commit e740cc614096e768813280c718f9e96343ba41b3
Merge: 1b91868 63cf277
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Wed Feb 3 09:14:43 2021 +0000
Merge branch 'master' into core-updates
Makefile.am | 50 +-
build-aux/build-self.scm | 3 +
build-aux/test-driver.scm | 184 +-
doc/contributing.texi | 12 +-
doc/guix-cookbook.texi | 217 +-
doc/guix.texi | 733 +-
etc/news.scm | 141 +-
gnu/bootloader/grub.scm | 26 +-
gnu/ci.scm | 7 +-
gnu/installer.scm | 2 +-
gnu/installer/newt/keymap.scm | 21 +-
gnu/installer/newt/services.scm | 7 +-
gnu/local.mk | 29 +-
gnu/packages/admin.scm | 127 +-
gnu/packages/algebra.scm | 23 +-
gnu/packages/animation.scm | 33 +
gnu/packages/aspell.scm | 4 +-
gnu/packages/assembly.scm | 35 +-
gnu/packages/astronomy.scm | 307 +-
gnu/packages/audio.scm | 71 +-
gnu/packages/autotools.scm | 9 +-
gnu/packages/backup.scm | 6 +-
gnu/packages/bioinformatics.scm | 684 +-
gnu/packages/bootloaders.scm | 125 +-
gnu/packages/browser-extensions.scm | 10 +-
gnu/packages/busybox.scm | 6 +-
gnu/packages/check.scm | 90 +-
gnu/packages/chemistry.scm | 300 +-
gnu/packages/chromium.scm | 44 +-
gnu/packages/ci.scm | 67 +-
gnu/packages/cmake.scm | 29 +
gnu/packages/compression.scm | 48 +-
gnu/packages/connman.scm | 8 +-
gnu/packages/cpp.scm | 97 +-
gnu/packages/cran.scm | 693 +-
gnu/packages/crates-graphics.scm | 766 +-
gnu/packages/crates-io.scm | 2039 +-
gnu/packages/cups.scm | 72 +-
gnu/packages/databases.scm | 125 +-
gnu/packages/diffoscope.scm | 4 +-
gnu/packages/disk.scm | 13 +-
gnu/packages/dlang.scm | 25 +-
gnu/packages/dns.scm | 33 +-
gnu/packages/education.scm | 18 +-
gnu/packages/efi.scm | 41 +-
gnu/packages/elf.scm | 4 +-
gnu/packages/elixir.scm | 5 +-
gnu/packages/emacs-xyz.scm | 509 +-
gnu/packages/emacs.scm | 22 +-
gnu/packages/emulators.scm | 6 +-
gnu/packages/engineering.scm | 39 +-
gnu/packages/enlightenment.scm | 13 +-
gnu/packages/erlang.scm | 15 +-
gnu/packages/fcitx.scm | 61 +-
gnu/packages/fcitx5.scm | 102 +-
gnu/packages/file-systems.scm | 37 +-
gnu/packages/fonts.scm | 63 +-
gnu/packages/fpga.scm | 87 +
gnu/packages/freedesktop.scm | 9 +-
gnu/packages/game-development.scm | 36 +-
gnu/packages/games.scm | 280 +-
gnu/packages/genimage.scm | 3 +-
gnu/packages/geo.scm | 27 +
gnu/packages/gettext.scm | 42 +-
gnu/packages/gl.scm | 7 +-
gnu/packages/gnome-xyz.scm | 51 +-
gnu/packages/gnome.scm | 38 +-
gnu/packages/gnupg.scm | 101 +-
gnu/packages/gnuzilla.scm | 20 +-
gnu/packages/gps.scm | 6 +-
gnu/packages/graphics.scm | 55 +-
gnu/packages/gstreamer.scm | 1 +
gnu/packages/guile-xyz.scm | 100 +-
gnu/packages/guile.scm | 4 +-
gnu/packages/hardware.scm | 74 +
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/idris.scm | 12 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 4 +-
gnu/packages/inkscape.scm | 4 +-
gnu/packages/java.scm | 5 +-
gnu/packages/julia-xyz.scm | 181 +-
gnu/packages/kde.scm | 70 +-
gnu/packages/language.scm | 279 +-
gnu/packages/libreoffice.scm | 6 +-
gnu/packages/libunwind.scm | 4 +-
gnu/packages/libusb.scm | 4 +-
gnu/packages/license.scm | 39 +-
gnu/packages/linux.scm | 121 +-
gnu/packages/lisp-xyz.scm | 1303 +-
gnu/packages/lisp.scm | 55 +-
gnu/packages/lua.scm | 30 +-
gnu/packages/machine-learning.scm | 32 +-
gnu/packages/mail.scm | 8 +-
gnu/packages/markup.scm | 23 +
gnu/packages/mastodon.scm | 75 +-
gnu/packages/maths.scm | 30 +-
gnu/packages/matrix.scm | 6 +-
gnu/packages/messaging.scm | 23 +-
gnu/packages/mono.scm | 4 +-
gnu/packages/mp3.scm | 8 +
gnu/packages/mpd.scm | 76 +-
gnu/packages/music.scm | 130 +-
gnu/packages/musl.scm | 4 +-
gnu/packages/nano.scm | 6 +-
gnu/packages/networking.scm | 39 +-
gnu/packages/node.scm | 4 +-
gnu/packages/ocaml.scm | 135 +
gnu/packages/onc-rpc.scm | 4 +-
gnu/packages/openstack.scm | 25 -
gnu/packages/package-management.scm | 53 +-
gnu/packages/parallel.scm | 19 +-
gnu/packages/password-utils.scm | 8 +-
gnu/packages/patches/avogadro-boost148.patch | 69 -
gnu/packages/patches/avogadro-eigen3-update.patch | 603 -
.../patches/avogadro-python-eigen-lib.patch | 161 -
.../patches/c++-gsl-find-system-gtest.patch | 96 +
gnu/packages/patches/freebayes-devendor-deps.patch | 152 +
.../patches/gst-plugins-good-fix-test.patch | 94 +
gnu/packages/patches/icecat-makeicecat.patch | 4 +-
gnu/packages/patches/idris-disable-test.patch | 19 +
.../patches/ipxe-reproducible-geniso.patch | 77 +
.../patches/mesa-skip-disk-cache-test.patch | 19 -
gnu/packages/patches/mesa-skip-tests.patch | 49 +
gnu/packages/patches/obs-modules-location.patch | 33 +
gnu/packages/patches/pinentry-efl.patch | 798 -
gnu/packages/patches/podofo-cmake-3.12.patch | 19 -
.../patches/python-mediafile-wavpack.patch | 57 +
...v.patch => r-httpuv-1.5.5-unvendor-libuv.patch} | 0
.../patches/tipp10-disable-downloader.patch | 165 +
gnu/packages/patches/tipp10-qt5.patch | 69 +
.../patches/vcflib-use-shared-libraries.patch | 135 -
gnu/packages/patches/vlc-qt-5.15.patch | 56 -
gnu/packages/pdf.scm | 101 +-
gnu/packages/perl.scm | 29 +-
gnu/packages/printers.scm | 72 -
gnu/packages/python-check.scm | 19 +
gnu/packages/python-web.scm | 26 -
gnu/packages/python-xyz.scm | 455 +-
gnu/packages/qt.scm | 257 +-
gnu/packages/radio.scm | 81 +-
gnu/packages/rdf.scm | 10 +-
gnu/packages/ruby.scm | 12 +-
gnu/packages/rust-apps.scm | 159 +-
gnu/packages/samba.scm | 87 +-
gnu/packages/scribus.scm | 26 +-
gnu/packages/search.scm | 65 +-
gnu/packages/sequoia.scm | 2 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/skarnet.scm | 38 +-
gnu/packages/sphinx.scm | 26 +-
gnu/packages/ssh.scm | 22 +-
gnu/packages/statistics.scm | 155 +-
gnu/packages/stenography.scm | 28 +-
gnu/packages/syncthing.scm | 115 +-
gnu/packages/syndication.scm | 16 +-
gnu/packages/telegram.scm | 557 +
gnu/packages/terminals.scm | 204 +-
gnu/packages/text-editors.scm | 6 +-
gnu/packages/tor.scm | 6 +-
gnu/packages/version-control.scm | 17 +-
gnu/packages/video.scm | 101 +-
gnu/packages/virtualization.scm | 37 +-
gnu/packages/vulkan.scm | 6 +-
gnu/packages/web.scm | 58 +-
gnu/packages/wine.scm | 13 +-
gnu/packages/wm.scm | 6 +-
gnu/packages/xdisorg.scm | 71 +-
gnu/packages/xfce.scm | 150 +-
gnu/packages/xml.scm | 5 +-
gnu/packages/xorg.scm | 9 +-
gnu/services/base.scm | 32 +-
gnu/services/cuirass.scm | 325 +-
gnu/services/cups.scm | 12 +-
gnu/services/databases.scm | 240 +-
gnu/services/networking.scm | 65 +-
gnu/services/shepherd.scm | 67 +-
gnu/services/syncthing.scm | 89 +
gnu/services/virtualization.scm | 8 +-
gnu/services/web.scm | 27 +-
gnu/system.scm | 16 +-
gnu/system/examples/bare-hurd.tmpl | 2 +-
gnu/system/image.scm | 18 +-
gnu/system/images/novena.scm | 2 +-
gnu/system/images/pine64.scm | 2 +-
gnu/system/images/pinebook-pro.scm | 6 +-
gnu/system/install.scm | 6 +-
gnu/system/linux-container.scm | 7 +-
gnu/system/mapped-devices.scm | 5 +-
gnu/system/shadow.scm | 46 +-
gnu/tests/cuirass.scm | 276 +
gnu/tests/databases.scm | 72 +-
gnu/tests/guix.scm | 5 +-
gnu/tests/install.scm | 74 +-
gnu/tests/monitoring.scm | 7 +-
gnu/tests/web.scm | 7 +-
guix/build-system/julia.scm | 6 +-
guix/build/julia-build-system.scm | 58 +-
guix/build/profiles.scm | 6 +-
guix/cache.scm | 9 +-
guix/channels.scm | 134 +-
guix/ci.scm | 42 +-
guix/describe.scm | 34 +-
guix/git.scm | 44 +-
guix/gnu-maintenance.scm | 5 +-
guix/import/cpan.scm | 3 +-
guix/import/cran.scm | 8 +-
guix/import/gem.scm | 5 +-
guix/import/gnu.scm | 31 +-
guix/import/texlive.scm | 28 +-
guix/inferior.scm | 105 +-
guix/licenses.scm | 17 +-
guix/modules.scm | 4 +-
guix/narinfo.scm | 327 +
guix/profiles.scm | 86 +-
guix/repl.scm | 8 +-
guix/scripts/archive.scm | 4 +-
guix/scripts/challenge.scm | 1 +
guix/scripts/describe.scm | 52 +-
guix/scripts/environment.scm | 2 +-
guix/scripts/import/json.scm | 10 +-
guix/scripts/package.scm | 118 +-
guix/scripts/publish.scm | 31 +-
guix/scripts/pull.scm | 103 +-
guix/scripts/substitute.scm | 298 +-
guix/scripts/system.scm | 26 +-
guix/scripts/system/reconfigure.scm | 9 +-
guix/scripts/weather.scm | 1 +
guix/self.scm | 6 +-
guix/serialization.scm | 16 +-
guix/store.scm | 17 +-
guix/store/database.scm | 45 +-
guix/swh.scm | 3 +-
guix/transformations.scm | 49 +-
guix/ui.scm | 32 +-
guix/upstream.scm | 28 +-
guix/utils.scm | 48 +-
po/doc/guix-manual.fr.po | 22877 ++++++++++---------
po/guix/POTFILES.in | 1 +
po/guix/fr.po | 3371 ++-
po/packages/fr.po | 16523 ++++----------
tests/challenge.scm | 2 +-
tests/crate.scm | 2 +-
tests/guix-environment.sh | 8 +-
tests/guix-package.sh | 10 +-
tests/guix-system.sh | 13 +-
tests/inferior.scm | 34 +-
tests/networking.scm | 3 +-
tests/packages.scm | 36 +-
tests/profiles.scm | 30 +-
tests/publish.scm | 16 +
tests/store-database.scm | 19 +-
tests/store.scm | 13 +-
tests/substitute.scm | 1 +
tests/swh.scm | 37 +-
tests/transformations.scm | 19 +-
tests/utils.scm | 55 +-
257 files changed, 34444 insertions(+), 29665 deletions(-)
diff --cc gnu/local.mk
index cbb8abd,b9b4b66..ac7c7c0
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -17,9 -17,9 +17,9 @@@
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
# Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
- # Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com>
+ # Copyright © 2018, 2019, 2020, 2021 Oleg Pykhalov <go.wigust@gmail.com>
# Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
-# Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+# Copyright © 2018, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
# Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
# Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
# Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
@@@ -823,12 -824,9 +826,9 @@@ dist_patch_DATA =
%D%/packages/patches/audiofile-function-signature.patch \
%D%/packages/patches/automake-skip-amhello-tests.patch \
%D%/packages/patches/avahi-localstatedir.patch \
- %D%/packages/patches/avogadro-boost148.patch \
- %D%/packages/patches/avogadro-eigen3-update.patch \
- %D%/packages/patches/avogadro-python-eigen-lib.patch \
%D%/packages/patches/avidemux-install-to-lib.patch \
%D%/packages/patches/awesome-reproducible-png.patch \
- %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \
+ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \
%D%/packages/patches/aws-checksums-cmake-prefix.patch \
%D%/packages/patches/azr3.patch \
%D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \
@@@ -1178,8 -1179,11 +1181,9 @@@
%D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \
%D%/packages/patches/icecat-use-system-media-libs.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/idris-disable-test.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \
@@@ -1348,8 -1355,9 +1353,8 @@@
%D%/packages/patches/libmemcached-build-with-gcc7.patch \
%D%/packages/patches/libmhash-hmac-fix-uaf.patch \
%D%/packages/patches/mediastreamer2-srtp2.patch \
- %D%/packages/patches/mesa-skip-disk-cache-test.patch \
+ %D%/packages/patches/mesa-skip-tests.patch \
%D%/packages/patches/mescc-tools-boot.patch \
- %D%/packages/patches/meson-for-build-rpath.patch \
%D%/packages/patches/metabat-fix-compilation.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \
%D%/packages/patches/mingw-w64-6.0.0-gcc.patch \
@@@ -1529,10 -1541,9 +1533,11 @@@
%D%/packages/patches/python-keras-integration-test.patch \
%D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
+ %D%/packages/patches/python-pyflakes-fix-tests.patch \
%D%/packages/patches/python-flint-includes.patch \
+ %D%/packages/patches/python-libxml2-python39-compat.patch \
%D%/packages/patches/python-libxml2-utf8.patch \
+ %D%/packages/patches/python-mediafile-wavpack.patch \
%D%/packages/patches/python-memcached-syntax-warnings.patch \
%D%/packages/patches/python-mox3-python3.6-compat.patch \
%D%/packages/patches/python-testtools.patch \
diff --cc gnu/packages/admin.scm
index 2933c6a,b24d560..759f12d
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -1499,10 -1496,15 +1518,12 @@@ system administrator."
;; the chroot's /etc/passwd doesn't have it. Turn off the tests.
#:tests? #f))
(native-inputs
- ;; XXX TODO: Remove on next rebuild cycle.
- (if (hurd-target?)
- '()
- `(("groff" ,groff))))
+ `(("groff" ,groff)))
(inputs
`(("coreutils" ,coreutils)
- ("linux-pam" ,linux-pam)
+ ,@(if (hurd-target?)
+ '()
+ `(("linux-pam" ,linux-pam)))
("zlib" ,zlib)))
(home-page "https://www.sudo.ws/";)
(synopsis "Run commands as root")
diff --cc gnu/packages/bioinformatics.scm
index 86270ec,39611d2..77af190
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@@ -11,8 -11,8 +11,8 @@@
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
- ;;; Copyright © 2018, 2019, 2020 Mădălin Ionel Patrașcu
<madalinionel.patrascu@mdc-berlin.de>
+ ;;; Copyright © 2018, 2019, 2020, 2021 Mădălin Ionel Patrașcu
<madalinionel.patrascu@mdc-berlin.de>
-;;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
diff --cc gnu/packages/cups.scm
index 86ce31a,51efee5..8393fe5
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@@ -5,9 -5,8 +5,9 @@@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
- ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+ ;;; Copyright © 2017–2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/python-check.scm
index 0573a1e,c237418..9849b16
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@@ -1093,61 -1096,25 +1093,80 @@@ any Python VM with basically no runtim
;; mypyc/lib-rt/getargs.c
(license (list license:expat license:psfl))))
+;;; This variant exists to break a cycle between python-pylama and
python-isort.
+(define-public python-mypy-minimal
+ (hidden-package
+ (package
+ (inherit python-mypy)
+ (name "python-mypy-minimal")
+ (arguments
+ `(#:tests? #f
+ #:phases (modify-phases %standard-phases
+ ;; XXX: Fails with: "In procedure utime: No such file or
+ ;; directory".
+ (delete 'ensure-no-mtimes-pre-1980))))
+ (native-inputs '()))))
+
+(define-public python-pylama
+ (package
+ (name "python-pylama")
+ (version "7.7.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pylama" version))
+ (sha256
+ (base32
+ "13vx7daqz2918y9s8q3v2i3xaq3ah43a9p58srqi6hqskkpm7blv"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ ;; Fails with: "ImportError: cannot import name
+ ;; 'commented_out_code_line_numbers' from 'eradicate'".
+ (delete-file "pylama/lint/pylama_eradicate.py")
+ ;; Requires python-astroid, which fails to build on
+ ;; Python 3.9+ (see:
+ ;; https://github.com/PyCQA/astroid/issues/881).
+ (delete-file "pylama/lint/pylama_pylint.py"))))))
+ (native-inputs
+ `(("python-py" ,python-py)
+ ("python-pytest" ,python-pytest)
+ ("python-radon" ,python-radon)))
+ (propagated-inputs
+ `(("python-mccabe" ,python-mccabe)
+ ("python-mypy", python-mypy-minimal)
+ ("python-pycodestyle" ,python-pycodestyle)
+ ("python-pydocstyle" ,python-pydocstyle)
+ ("python-pyflakes" ,python-pyflakes)))
+ (home-page "https://github.com/klen/pylama";)
+ (synopsis "Code audit tool for python")
+ (description "Pylama is a code audit tool for Python and JavaScript to
check
+for style, syntax and other code health metrics. It is essentially a
+convenient wrapper above tools such as Pyflakes, pydocstyle, pycodestyle and
+McCabe, among others.")
+ (license license:lgpl3+)))
+
+ (define-public python-eradicate
+ (package
+ (name "python-eradicate")
+ (version "2.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "eradicate" version))
+ (sha256
+ (base32
+ "1j30g9jfmbfki383qxwrfds8b23yiwywj40lng4lqcf5yab4ahr7"))))
+ (build-system python-build-system)
+ (home-page "https://github.com/myint/eradicate";)
+ (synopsis "Remove commented-out code from Python sources")
+ (description "The @command{eradicate} command removes commented-out code
+ from Python files. It does this by detecting block comments that contain
+ valid Python syntax that are likely to be commented out code.")
+ (license license:expat)))
+
(define-public python-robber
(package
(name "python-robber")
diff --cc gnu/packages/python-xyz.scm
index 0c1f2b0,e296e3c..219624c
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -3152,19 -3214,8 +3171,39 @@@ e.g. filters, callbacks and errbacks ca
(synopsis "Virtual Python environment builder")
(description
"Virtualenv is a tool to create isolated Python environments.")
- (properties `((python2-variant . ,(delay python2-virtualenv))))
(license license:expat)))
+(define-public python2-virtualenv
+ (let ((base (package-with-python2 (strip-python2-variant
python-virtualenv))))
+ (package
+ (inherit base)
+ (arguments
- `(#:python ,python-2))
++ `(#:python ,python-2
++ #:phases
++ (modify-phases %standard-phases
++ (add-after 'set-paths 'adjust-PYTHONPATH
++ (lambda* (#:key inputs #:allow-other-keys)
++ (let* ((python (assoc-ref inputs "python"))
++ (python-sitedir (string-append python "/lib/python2.7"
++ "/site-packages")))
++ ;; XXX: 'python2' always comes first on PYTHONPATH
++ ;; and shadows the 'setuptools' input. Move python2
++ ;; last: this should be fixed in python-build-system
++ ;; in a future rebuild cycle.
++ (setenv "PYTHONPATH"
++ (string-append (string-join (delete python-sitedir
++ (string-split
++ (getenv
"PYTHONPATH")
++ #\:))
++ ":")
++ ":" python-sitedir))
++ (format #t "environment variable `PYTHONPATH' changed to
`~a'~%"
++ (getenv "PYTHONPATH"))
++ #t))))))
+ (propagated-inputs
+ `(("python-contextlib2" ,python2-contextlib2)
+ ,@(package-propagated-inputs base))))))
+
(define-public python-markupsafe
(package
(name "python-markupsafe")
diff --cc gnu/packages/web.scm
index 44405d4,879eb16..9504356
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -45,9 -45,8 +45,9 @@@
;;; Copyright © 2018, 2019, 2020 Björn Höfling
<bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020, 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
- ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+ ;;; Copyright © 2020, 2021 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc guix/utils.scm
index 678954d,a85e2f4..edc3503
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@@ -227,20 -229,10 +233,22 @@@ a symbol such as 'xz.
('gzip (filtered-port `(,%gzip "-dc") input))
('lzip (values (lzip-port 'make-lzip-input-port input)
'()))
+ ('zstd (values (zstd-port 'make-zstd-input-port input)
+ '()))
(_ (error "unsupported compression scheme" compression))))
+(define (compressed-port compression input)
+ "Return an input port where INPUT is compressed according to COMPRESSION,
+a symbol such as 'xz."
+ (match compression
+ ((or #f 'none) (values input '()))
+ ('bzip2 (filtered-port `(,%bzip2 "-c") input))
+ ('xz (filtered-port `(,%xz "-c" ,@(%xz-parallel-args)) input))
+ ('gzip (filtered-port `(,%gzip "-c") input))
+ ('lzip (values (lzip-port 'make-lzip-input-port/compressed input)
+ '()))
+ (_ (error "unsupported compression scheme" compression))))
+
(define (call-with-decompressed-port compression port proc)
"Call PROC with a wrapper around PORT, a file port, that decompresses data
read from PORT according to COMPRESSION, a symbol such as 'xz."
diff --cc tests/packages.scm
index b3ccd98,2a290bc..ff756c6
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@@ -1,7 -1,6 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
- ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic
Courtès <ludo@gnu.org>
+ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;