[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/33: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
02/33: Merge branch 'master' into core-updates |
|
Date: |
Sun, 9 May 2021 17:50:05 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit f03426420497cd9839f5fb3cb547dbecd8d6053b
Merge: 3cf1afb 069399e
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun May 9 21:29:46 2021 +0200
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/django.scm
gnu/packages/gtk.scm
gnu/packages/llvm.scm
gnu/packages/python-web.scm
gnu/packages/python.scm
gnu/packages/tex.scm
guix/build-system/asdf.scm
guix/build/emacs-build-system.scm
guix/profiles.scm
.gitignore | 2 +-
.guix-authorizations | 2 -
.mailmap | 2 +-
Makefile.am | 100 +-
build-aux/build-self.scm | 1 +
build-aux/test-env.in | 7 +-
configure.ac | 17 -
doc/build.scm | 6 +-
doc/contributing.texi | 270 +-
doc/guix.texi | 189 +-
doc/htmlxref.cnf | 10 +-
doc/local.mk | 30 +-
etc/committer.scm.in | 52 +-
etc/completion/fish/guix.fish | 2 -
etc/guix-install.sh | 45 +-
gnu/build/file-systems.scm | 44 +-
gnu/ci.scm | 92 +-
gnu/installer/newt/partition.scm | 17 +-
gnu/installer/parted.scm | 45 +-
gnu/installer/tests.scm | 37 +-
gnu/local.mk | 22 +-
gnu/packages/admin.scm | 63 +-
gnu/packages/algebra.scm | 8 +-
gnu/packages/aspell.scm | 13 +-
gnu/packages/assembly.scm | 2 +-
gnu/packages/astronomy.scm | 73 +-
gnu/packages/audio.scm | 40 +-
gnu/packages/authentication.scm | 35 +-
gnu/packages/aux-files/linux-libre/5.10-arm.conf | 4 +-
gnu/packages/aux-files/linux-libre/5.10-arm64.conf | 4 +-
gnu/packages/aux-files/linux-libre/5.11-arm.conf | 4 +-
gnu/packages/aux-files/linux-libre/5.11-arm64.conf | 39 +-
.../linux-libre/{5.11-arm.conf => 5.12-arm.conf} | 122 +-
.../{5.11-arm64.conf => 5.12-arm64.conf} | 189 +-
.../{5.11-arm64.conf => 5.12-i686.conf} | 8017 +--
.../{5.11-arm64.conf => 5.12-x86_64.conf} | 7889 +--
gnu/packages/backup.scm | 19 +-
gnu/packages/benchmark.scm | 4 +-
gnu/packages/bioconductor.scm | 163 +-
gnu/packages/bioinformatics.scm | 543 +-
gnu/packages/bootloaders.scm | 43 +-
gnu/packages/browser-extensions.scm | 8 +-
gnu/packages/busybox.scm | 5 +-
gnu/packages/calendar.scm | 48 +-
gnu/packages/cdrom.scm | 24 +-
gnu/packages/check.scm | 23 +
gnu/packages/chromium.scm | 77 +-
gnu/packages/ci.scm | 26 +-
gnu/packages/cobol.scm | 25 +-
gnu/packages/code.scm | 20 +-
gnu/packages/commencement.scm | 3 +
gnu/packages/conky.scm | 15 +-
gnu/packages/cpp.scm | 8 +-
gnu/packages/cran.scm | 749 +-
gnu/packages/crates-graphics.scm | 2 +-
gnu/packages/crates-io.scm | 14 +-
gnu/packages/crypto.scm | 16 +-
gnu/packages/cups.scm | 10 +-
gnu/packages/cyrus-sasl.scm | 21 +-
gnu/packages/databases.scm | 87 +-
gnu/packages/debian.scm | 4 +-
gnu/packages/dico.scm | 9 +-
gnu/packages/dictionaries.scm | 23 +-
gnu/packages/diffoscope.scm | 6 +-
gnu/packages/disk.scm | 43 +-
gnu/packages/django.scm | 90 +-
gnu/packages/dns.scm | 8 +-
gnu/packages/ebook.scm | 4 +-
gnu/packages/education.scm | 9 +-
gnu/packages/electronics.scm | 10 +-
gnu/packages/emacs-xyz.scm | 896 +-
gnu/packages/emacs.scm | 50 +-
gnu/packages/emulators.scm | 119 +-
gnu/packages/engineering.scm | 23 +-
gnu/packages/enlightenment.scm | 6 +-
gnu/packages/fcitx.scm | 4 +-
gnu/packages/file-systems.scm | 13 +-
gnu/packages/finance.scm | 15 +-
gnu/packages/fonts.scm | 29 +-
gnu/packages/fontutils.scm | 6 +-
gnu/packages/fpga.scm | 4 +-
gnu/packages/freedesktop.scm | 10 +-
gnu/packages/ftp.scm | 10 +-
gnu/packages/game-development.scm | 4 +-
gnu/packages/games.scm | 123 +-
gnu/packages/gcc.scm | 19 +
gnu/packages/gdb.scm | 6 +-
gnu/packages/gimp.scm | 9 +-
gnu/packages/gl.scm | 6 +-
gnu/packages/glib.scm | 1 +
gnu/packages/gnome.scm | 66 +-
gnu/packages/gnunet.scm | 12 +-
gnu/packages/gnupg.scm | 3 +-
gnu/packages/gnuzilla.scm | 14 +-
gnu/packages/golang.scm | 4 +-
gnu/packages/gpodder.scm | 49 +-
gnu/packages/graph.scm | 22 +
gnu/packages/graphics.scm | 9 +-
gnu/packages/gstreamer.scm | 8 +-
gnu/packages/gtk.scm | 69 +-
gnu/packages/guile-xyz.scm | 10 +-
gnu/packages/guile.scm | 25 +-
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/image-viewers.scm | 9 +-
gnu/packages/image.scm | 18 +-
gnu/packages/irc.scm | 37 +-
gnu/packages/java.scm | 488 +-
gnu/packages/javascript.scm | 6 +-
gnu/packages/julia-xyz.scm | 92 +-
gnu/packages/kde.scm | 80 +
gnu/packages/less.scm | 6 +-
gnu/packages/linux.scm | 190 +-
gnu/packages/lisp-xyz.scm | 753 +-
gnu/packages/lisp.scm | 10 +-
gnu/packages/llvm.scm | 134 +-
gnu/packages/lua.scm | 16 +-
gnu/packages/machine-learning.scm | 8 +-
gnu/packages/mail.scm | 125 +-
gnu/packages/mate.scm | 5 +-
gnu/packages/maths.scm | 77 +-
gnu/packages/messaging.scm | 34 +-
gnu/packages/mpi.scm | 6 +-
gnu/packages/mtools.scm | 6 +-
gnu/packages/music.scm | 6 +-
gnu/packages/nano.scm | 6 +-
gnu/packages/networking.scm | 59 +-
gnu/packages/nim.scm | 7 +-
gnu/packages/node-xyz.scm | 32 +
gnu/packages/ocaml.scm | 9 +-
gnu/packages/openstack.scm | 6 +-
gnu/packages/orange.scm | 209 +
gnu/packages/package-management.scm | 97 +-
gnu/packages/parallel.scm | 11 +-
gnu/packages/password-utils.scm | 21 +-
gnu/packages/patches/busybox-CVE-2021-28831.patch | 57 -
.../patches/clang-12-tools-extra-directory.patch | 16 +
...s-geiser-autoload-activate-implementation.patch | 26 +
.../patches/emacs-geiser-guile-auto-activate.patch | 34 +
.../gimp-make-gegl-introspect-optional.patch | 43 -
.../gst-libav-64channels-stack-corruption.patch | 31 +
.../patches/gst-plugins-bad-fix-overflow.patch | 263 +
.../gst-plugins-base-fix-id3v2-invalid-read.patch | 40 +
.../patches/gst-plugins-good-CVE-2021-3497.patch | 174 +
.../patches/gst-plugins-good-CVE-2021-3498.patch | 22 +
.../gst-plugins-ugly-fix-out-of-bound-reads.patch | 119 +
.../patches/kmscon-runtime-keymap-switch.patch | 49 +-
.../linux-libre-arm64-generic-pinebook-lcd.patch | 40 +
.../perl-image-exiftool-CVE-2021-22204.patch | 38 +
.../patches/racket-store-checksum-override.patch | 42 -
gnu/packages/patches/tla2tools-build-xml.patch | 109 +
.../patches/u-boot-rockchip-inno-usb.patch | 238 +
.../patches/ungoogled-chromium-system-nspr.patch | 120 -
.../patches/ungoogled-chromium-system-opus.patch | 27 -
gnu/packages/pdf.scm | 4 +-
gnu/packages/perl.scm | 75 +-
gnu/packages/photo.scm | 11 +-
gnu/packages/php.scm | 8 +-
gnu/packages/python-build.scm | 4 +-
gnu/packages/python-check.scm | 97 +-
gnu/packages/python-crypto.scm | 4 +-
gnu/packages/python-web.scm | 89 +-
gnu/packages/python-xyz.scm | 1123 +-
gnu/packages/python.scm | 11 +-
gnu/packages/qt.scm | 11 +-
gnu/packages/racket.scm | 245 +
gnu/packages/radio.scm | 320 +-
gnu/packages/ruby.scm | 18 +
gnu/packages/samba.scm | 4 +-
gnu/packages/scheme.scm | 210 +-
gnu/packages/scribus.scm | 44 +-
gnu/packages/search.scm | 8 +-
gnu/packages/sequoia.scm | 21 +-
gnu/packages/serialization.scm | 35 +
gnu/packages/shells.scm | 58 +-
gnu/packages/shellutils.scm | 10 +
gnu/packages/skarnet.scm | 36 +-
gnu/packages/sml.scm | 6 +-
gnu/packages/spice.scm | 14 +-
gnu/packages/ssh.scm | 10 +-
gnu/packages/statistics.scm | 143 +-
gnu/packages/syncthing.scm | 34 +-
gnu/packages/telegram.scm | 52 +
gnu/packages/terminals.scm | 26 +-
gnu/packages/tex.scm | 515 +-
gnu/packages/text-editors.scm | 16 +-
gnu/packages/textutils.scm | 56 +-
gnu/packages/tls.scm | 43 +-
gnu/packages/tmux.scm | 4 +-
gnu/packages/toys.scm | 2 +-
gnu/packages/upnp.scm | 8 +-
gnu/packages/version-control.scm | 66 +-
gnu/packages/video.scm | 8 +-
gnu/packages/vim.scm | 8 +-
gnu/packages/virtualization.scm | 4 +-
gnu/packages/vpn.scm | 13 +-
gnu/packages/web-browsers.scm | 32 +-
gnu/packages/web.scm | 99 +-
gnu/packages/webkit.scm | 3 +
gnu/packages/wine.scm | 17 +-
gnu/packages/wm.scm | 10 +-
gnu/packages/xdisorg.scm | 36 +-
gnu/packages/xfce.scm | 63 +-
gnu/packages/xml.scm | 18 +-
gnu/packages/xorg.scm | 30 +-
gnu/services/configuration.scm | 159 +-
gnu/services/databases.scm | 7 +-
gnu/services/docker.scm | 10 +-
gnu/services/guix.scm | 30 +-
gnu/services/linux.scm | 49 +
gnu/services/mail.scm | 31 +-
gnu/services/nix.scm | 6 +-
gnu/services/vpn.scm | 13 +-
gnu/tests/install.scm | 108 +-
gnu/tests/ldap.scm | 4 +-
gnu/tests/web.scm | 61 +-
guix/android-repo-download.scm | 5 +-
guix/build-system/asdf.scm | 18 +-
guix/build/asdf-build-system.scm | 15 +-
guix/build/download.scm | 84 +-
guix/build/emacs-build-system.scm | 79 +-
guix/ci.scm | 4 +-
guix/cve.scm | 31 +-
guix/cvs-download.scm | 12 +-
guix/diagnostics.scm | 6 +-
guix/download.scm | 19 +-
guix/git-download.scm | 2 +
guix/hg-download.scm | 9 +-
guix/http-client.scm | 28 +-
guix/import/go.scm | 13 +-
guix/import/pypi.scm | 4 +-
guix/import/snix.scm | 467 -
guix/lint.scm | 24 +-
guix/packages.scm | 3 +-
guix/profiles.scm | 43 +-
guix/scripts/import.scm | 4 +-
guix/scripts/import/nix.scm | 90 -
guix/scripts/perform-download.scm | 7 +-
guix/scripts/substitute.scm | 11 +-
guix/scripts/weather.scm | 29 +-
guix/self.scm | 3 +-
guix/ssh.scm | 30 +-
guix/status.scm | 18 +-
guix/store.scm | 72 +-
guix/swh.scm | 85 +-
guix/ui.scm | 17 +-
po/doc/guix-cookbook.de.po | 1700 +-
po/doc/guix-cookbook.fa.po | 4435 ++
.../{guix-cookbook.de.po => guix-cookbook.fr.po} | 3008 +-
po/doc/guix-cookbook.ko.po | 4695 ++
po/doc/guix-cookbook.zh_Hans.po | 4435 ++
po/doc/guix-manual.de.po | 26470 +++++----
po/doc/guix-manual.es.po | 27217 +++++----
po/doc/{guix-manual.ru.po => guix-manual.fa.po} | 36402 ++++++------
po/doc/guix-manual.fr.po | 25128 ++++----
po/doc/{guix-manual.ru.po => guix-manual.it.po} | 36586 ++++++------
po/doc/{guix-manual.ru.po => guix-manual.ko.po} | 36571 ++++++------
po/doc/{guix-manual.ru.po => guix-manual.pt_BR.po} | 36459 ++++++------
po/doc/guix-manual.ru.po | 27691 +++++----
po/doc/{guix-manual.ru.po => guix-manual.sk.po} | 36403 ++++++------
po/doc/guix-manual.zh_CN.po | 58268 ++++++++++++-------
po/doc/local.mk | 11 +-
po/guix/LINGUAS | 4 +
po/guix/POTFILES.in | 1 -
po/guix/cs.po | 7177 ++-
po/guix/da.po | 4913 +-
po/guix/de.po | 3688 +-
po/guix/eo.po | 3862 +-
po/guix/es.po | 3875 +-
po/guix/fr.po | 1510 +-
po/guix/hu.po | 8311 ++-
po/guix/{sk.po => it.po} | 3195 +-
po/guix/{sk.po => ko.po} | 3082 +-
po/guix/{sk.po => nl.po} | 3410 +-
po/guix/pl.po | 7303 ++-
po/guix/pt_BR.po | 4299 +-
po/guix/{sk.po => ru.po} | 3251 +-
po/guix/sk.po | 756 +-
po/guix/sr.po | 8120 ++-
po/guix/sv.po | 3829 +-
po/guix/ta.po | 3583 +-
po/guix/vi.po | 8330 ++-
po/guix/zh_CN.po | 7397 ++-
po/packages/LINGUAS | 4 +-
po/packages/da.po | 21779 +++----
po/packages/de.po | 15425 ++---
po/packages/eo.po | 17592 ++----
po/packages/es.po | 19604 +++----
po/packages/{fr.po => fa.po} | 9017 +--
po/packages/fr.po | 5166 +-
po/packages/hu.po | 20353 ++++---
po/packages/{fr.po => ko.po} | 9040 +--
po/packages/pl.po | 21826 +++++--
po/packages/pt_BR.po | 21176 ++++++-
po/packages/{fr.po => sk.po} | 9030 +--
po/packages/sr.po | 21397 ++++++-
po/packages/vi.po | 322 -
po/packages/zh_CN.po | 19666 ++++---
tests/go.scm | 8 +-
tests/guix-package.sh | 2 +-
tests/guix-system.sh | 8 +-
tests/inferior.scm | 6 +-
tests/lint.scm | 7 +
tests/records.scm | 18 +-
tests/services/configuration.scm | 83 +
tests/snix.scm | 73 -
305 files changed, 419739 insertions(+), 278082 deletions(-)
diff --cc gnu/local.mk
index 39b2b72,c4bd887..5603c4a
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -876,9 -876,7 +878,8 @@@ dist_patch_DATA =
%D%/packages/patches/blender-2.79-oiio2.patch \
%D%/packages/patches/blender-2.79-python-3.7-fix.patch \
%D%/packages/patches/blender-2.79-python-3.8-fix.patch \
+ %D%/packages/patches/boost-fix-transitive-linking.patch \
%D%/packages/patches/bpftrace-disable-bfd-disasm.patch \
- %D%/packages/patches/busybox-CVE-2021-28831.patch \
%D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/cairo-CVE-2018-19876.patch \
%D%/packages/patches/cairo-CVE-2020-35492.patch \
@@@ -1083,9 -1088,28 +1087,8 @@@
%D%/packages/patches/ghostscript-no-header-id.patch \
%D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
- %D%/packages/patches/gimp-make-gegl-introspect-optional.patch \
%D%/packages/patches/glib-appinfo-watch.patch \
- %D%/packages/patches/glib-tests-timer.patch \
- %D%/packages/patches/glib-CVE-2021-27218.patch \
- %D%/packages/patches/glib-CVE-2021-27219-01.patch \
- %D%/packages/patches/glib-CVE-2021-27219-02.patch \
- %D%/packages/patches/glib-CVE-2021-27219-03.patch \
- %D%/packages/patches/glib-CVE-2021-27219-04.patch \
- %D%/packages/patches/glib-CVE-2021-27219-05.patch \
- %D%/packages/patches/glib-CVE-2021-27219-06.patch \
- %D%/packages/patches/glib-CVE-2021-27219-07.patch \
- %D%/packages/patches/glib-CVE-2021-27219-08.patch \
- %D%/packages/patches/glib-CVE-2021-27219-09.patch \
- %D%/packages/patches/glib-CVE-2021-27219-10.patch \
- %D%/packages/patches/glib-CVE-2021-27219-11.patch \
- %D%/packages/patches/glib-CVE-2021-27219-12.patch \
- %D%/packages/patches/glib-CVE-2021-27219-13.patch \
- %D%/packages/patches/glib-CVE-2021-27219-14.patch \
- %D%/packages/patches/glib-CVE-2021-27219-15.patch \
- %D%/packages/patches/glib-CVE-2021-27219-16.patch \
- %D%/packages/patches/glib-CVE-2021-27219-17.patch \
- %D%/packages/patches/glib-CVE-2021-27219-18.patch \
- %D%/packages/patches/glib-CVE-2021-28153.patch \
+ %D%/packages/patches/glib-skip-failing-test.patch \
%D%/packages/patches/glibc-CVE-2018-11236.patch \
%D%/packages/patches/glibc-CVE-2018-11237.patch \
%D%/packages/patches/glibc-CVE-2019-7309.patch \
@@@ -1486,7 -1523,10 +1496,8 @@@
%D%/packages/patches/patch-hurd-path-max.patch \
%D%/packages/patches/perl-autosplit-default-time.patch \
%D%/packages/patches/perl-cross.patch \
- %D%/packages/patches/perl-deterministic-ordering.patch \
%D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
+ %D%/packages/patches/perl-image-exiftool-CVE-2021-22204.patch \
- %D%/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \
%D%/packages/patches/perl-net-amazon-s3-moose-warning.patch \
%D%/packages/patches/perl-net-dns-resolver-programmable-fix.patch \
%D%/packages/patches/perl-no-sys-dirs.patch \
diff --cc gnu/packages/bioinformatics.scm
index 313c707,9c0e185..0d09a98
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@@ -803,10 -855,12 +839,10 @@@ intended to behave exactly the same as
(uri (pypi-uri "pybedtools" version))
(sha256
(base32
- "14w5i40gi25clrr7h4wa2pcpnyipya8hrqi7nq77553zc5wf0df0"))))
+ "0wc7z8g8prgdx7n5chjva2fdq03wiwhqisjjxzkjg1j5k5ha7151"))))
(build-system python-build-system)
(arguments
- `(#:modules ((ice-9 ftw)
- (srfi srfi-1)
- (srfi srfi-26)
+ `(#:modules ((srfi srfi-26)
(guix build utils)
(guix build python-build-system))
;; See https://github.com/daler/pybedtools/issues/192
diff --cc gnu/packages/django.scm
index 2817160,debdd22..94480c5
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@@ -6,8 -6,7 +6,8 @@@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com>
;;; Copyright © 2019 Sam <smbaines8@gmail.com>
- ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+ ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -75,15 -74,36 +75,23 @@@
(substitute* "tests/settings_tests/tests.py"
((".*def test_incorrect_timezone.*" all)
(string-append " @unittest.skipIf(True, 'Disabled by
Guix')\n"
- all)))
-
- ;; Preserve the PYTHONPATH created by Guix when running the
tests.
- (substitute* "tests/admin_scripts/tests.py"
- (("python_path = \\[")
- (string-append "python_path = ['"
- (string-join
- (string-split (getenv "PYTHONPATH") #\:)
- "','")
- "', ")))
-
- #t))
+ all)))))
(replace 'check
- (lambda _
- (with-directory-excursion "tests"
- (invoke "python" "runtests.py"
- ;; By default tests run in parallel, which may cause
- ;; various race conditions. Run sequentially for
- ;; consistent results.
- "--parallel=1")))))))
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (with-directory-excursion "tests"
- (setenv "PYTHONPATH"
- (string-append "..:" (getenv "PYTHONPATH")))
+ (invoke "python" "runtests.py"
+ ;; By default tests run in parallel, which may
cause
+ ;; various race conditions. Run sequentially for
+ ;; consistent results.
+ "--parallel=1"))
+ (format #t "test suite not run~%"))))
+ ;; XXX: The 'wrap' phase adds native inputs as runtime dependencies,
+ ;; see <https://bugs.gnu.org/25235>. The django-admin script
typically
+ ;; runs in an environment that has Django and its dependencies on
+ ;; PYTHONPATH, so just disable the wrapper to reduce the size from
+ ;; ~710 MiB to ~203 MiB.
+ (delete 'wrap))))
;; TODO: Install extras/django_bash_completion.
(native-inputs
`(("tzdata" ,tzdata-for-tests)
diff --cc gnu/packages/engineering.scm
index cbe9d79,b053d0e..47ad3cc
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@@ -2741,10 -2744,12 +2744,10 @@@ GUI."
".tar.gz"))
(sha256
(base32
- "1mkaq19a8d951n9l6d3f8rwq45a7gkr05snb285idd21qxixys6d"))))
+ "0qnz7lc681nxa16rw9n9q4spy9fas6m2adrpb49imh34bgdgh77n"))))
(build-system gnu-build-system)
;; The GUI, which we elide, requires tcl and tk.
- (native-inputs `(;; Requires bison 3.6+ but we currently only have 3.5.
- ;; Bison 3.6 will be available in the next core update.
- ("bison-3.6" ,bison-3.6)
+ (native-inputs `(("bison" ,bison)
("clisp" ,clisp)
("dejagnu" ,dejagnu)
("flex" ,flex)
diff --cc gnu/packages/gcc.scm
index 9dff1a1,8c8968a..8362c9f
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -582,9 -594,23 +582,23 @@@ It also includes runtime support librar
(patches (search-patches "gcc-9-strmov-store-file-names.patch"
"gcc-5.0-libvtv-runpath.patch"))))))
+ (define-public gcc-11
+ (package
+ (inherit gcc-8)
+ (version "11.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/gcc/gcc-"
+ version "/gcc-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1pwxrjhsymv90xzh0x42cxfnmhjinf2lnrrf3hj5jq1rm2w6yjjc"))
+ (patches (search-patches "gcc-9-strmov-store-file-names.patch"
+ "gcc-5.0-libvtv-runpath.patch"))))))
+
;; Note: When changing the default gcc version, update
;; the gcc-toolchain-* definitions.
-(define-public gcc gcc-7)
+(define-public gcc gcc-8)
(define-public (make-libstdc++ gcc)
"Return a libstdc++ package based on GCC. The primary use case is when
diff --cc gnu/packages/gnome.scm
index 8351f75,265477a..8e659ed
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -4879,11 -4912,13 +4867,12 @@@ libxml to ease remote use of the RESTfu
("vala" ,vala)
("php" ,php)
("curl" ,curl)
- ("gnutls" ,gnutls) ;for 'certtool'
("httpd" ,httpd)))
(propagated-inputs
- ;; libsoup-2.4.pc refers to all these.
+ ;; libsoup-2.4.pc refers to all of these (except where otherwise noted)
`(("brotli" ,google-brotli)
("glib" ,glib)
+ ("glib-networking" ,glib-networking) ; for GIO runtime modules
("libpsl" ,libpsl)
("libxml2" ,libxml2)
("sqlite" ,sqlite)
diff --cc gnu/packages/gnuzilla.scm
index e7c9b90,094811d..00c8cc6
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -1598,9 -1598,9 +1598,9 @@@ standards of the IceCat project."
(file-name (string-append "thunderbird-" version "-checkout"))
(sha256
(base32
- "0qgz9qj8gbn2ccmhvk3259ahs9p435ipvkzsysn3xj8a6klbz02w")))))
+ "18658r4b1f5p8jcz68l31z29ny73lic0br7gc827m72nfc85wqz3")))))
("autoconf" ,autoconf-2.13)
- ("cargo" ,rust-1.41 "cargo")
+ ("cargo" ,rust "cargo")
("clang" ,clang)
("llvm" ,llvm)
("nasm" ,nasm)
diff --cc gnu/packages/gtk.scm
index 1991a8b,e64dc69..ea5d8f3
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -24,8 -24,9 +24,9 @@@
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
+ ;;; Copyright © 2021 Simon Streit <simon@netpanic.org>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/lisp.scm
index 983e9fa,24babaf..84f513e
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@@ -5,9 -5,9 +5,9 @@@
;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
-;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
- ;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+ ;;; Copyright © 2017, 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018, 2019, 2020 Pierre Neidhardt <mail@ambrevar.xyz>
diff --cc gnu/packages/llvm.scm
index b710318,b510f31..0a65d4a
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@@ -538,6 -538,45 +538,41 @@@ languages is in development. The compi
of programming tools as well as libraries with equivalent functionality.")
(license license:asl2.0))) ;with LLVM exceptions, see LICENSE.txt
+ (define-public clang-runtime-12
+ (clang-runtime-from-llvm
+ llvm-12
+ "0d444qihq9jhqnfv003cr704v363va72zl6qaw2algj1c85cva45"))
+
+ (define-public clang-12
+ (clang-from-llvm llvm-12 clang-runtime-12
+ "1vd9rhhrd8ghdg111lac7w8by71y9l14yh5zxfijsm6lj4p4avp2"
+ #:patches '("clang-11.0-libc-search-path.patch")
+ #:tools-extra
+ (origin
+ (method url-fetch)
+ (uri (llvm-uri "clang-tools-extra"
+ (package-version llvm-12)))
+ (patches
+ (search-patches "clang-12-tools-extra-directory.patch"))
+ (sha256
+ (base32
+
"0p3dzr0qa7mar83y66xa5m5apynf6ia0lsdsq6axwnm64ysy0hdd")))))
+
+ (define-public clang-toolchain-12
+ (make-clang-toolchain clang-12))
+
+ (define-public llvm-11
+ (package
+ (inherit llvm-12)
+ (version "11.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (llvm-uri "llvm" version))
+ (sha256
+ (base32
- "0s94lwil98w7zb7cjrbnxli0z7gklb312pkw74xs1d6zk346hgwi"))))
- (native-inputs
- `(;; TODO: Switch to Python 3 in the next rebuild cycle.
- ("python" ,python-2)
- ("perl" ,perl)))))
++ "0s94lwil98w7zb7cjrbnxli0z7gklb312pkw74xs1d6zk346hgwi"))))))
+
(define-public clang-runtime-11
(clang-runtime-from-llvm
llvm-11
diff --cc gnu/packages/python-web.scm
index 535aff4,f6ce09a..27c08d2
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@@ -4679,10 -4748,20 +4721,17 @@@ event loop. It is implemented in Cytho
(lambda _
(invoke "make" "-C" "docs" "PAPER=a4" "html" "info")
(delete-file "docs/build/texinfo/Makefile")
- (delete-file "docs/build/texinfo/Gunicorn.texi")
- #t))
+ (delete-file "docs/build/texinfo/Gunicorn.texi")))
(replace 'check
- (lambda _
- (invoke "pytest")))
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (begin
- (setenv "PYTHONPATH"
- (string-append ".:" (getenv "PYTHONPATH")))
+ (invoke "pytest" "-vv"
+ ;; Disable the geventlet tests because eventlet
uses
+ ;; dnspython, which does not work in the build
+ ;; container due to lack of /etc/resolv.conf, etc.
+ "--ignore=tests/workers/test_geventlet.py"))
+ (format #t "test suite not run~%"))))
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((doc (string-append (assoc-ref outputs "doc")
diff --cc gnu/packages/python.scm
index 7e13932,ce424bd..1c5cda5
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -135,46 -107,47 +135,47 @@@
(define-public python-2.7
(package
(name "python2")
- (version "2.7.17")
+ (version "2.7.18")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://www.python.org/ftp/python/";
- version "/Python-" version ".tar.xz"))
- (sha256
- (base32
- "0hds28cg226m8j8sr394nm9yc4gxhvlv109w0avsf2mxrlrz0hsd"))
- (patches (search-patches "python-2.7-search-paths.patch"
- "python-2-deterministic-build-info.patch"
- "python-2.7-site-prefixes.patch"
- "python-2.7-source-date-epoch.patch"
- "python-2.7-adjust-tests.patch"
- "python-cross-compile.patch"
- "python-2.7-CVE-2021-3177.patch"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Ensure the bundled copies of these libraries are not used.
- (for-each delete-file-recursively
- '("Modules/_ctypes/libffi" "Modules/expat"
"Modules/zlib"))
+ (method url-fetch)
+ (uri (string-append "https://www.python.org/ftp/python/";
+ version "/Python-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0hzgxl94hnflis0d6m4szjx0b52gah7wpmcg5g00q7am6xwhwb5n"))
+ (patches (search-patches "python-2.7-search-paths.patch"
+ "python-2-deterministic-build-info.patch"
+ "python-2.7-site-prefixes.patch"
+ "python-2.7-source-date-epoch.patch"
+ "python-2.7-adjust-tests.patch"
- "python-cross-compile.patch"))
++ "python-cross-compile.patch"
++ "python-2.7-CVE-2021-3177.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Ensure the bundled copies of these libraries are not used.
+ (for-each delete-file-recursively
+ '("Modules/_ctypes/libffi" "Modules/expat"
"Modules/zlib"))
- (substitute* "Modules/Setup.dist"
- ;; Link Expat instead of embedding the bundled one.
- (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n"))
+ (substitute* "Modules/Setup.dist"
+ ;; Link Expat instead of embedding the bundled one.
+ (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n"))
- ;; Suboptimal to delete failing tests here, but if we delete them in
- ;; the arguments then we need to make sure to strip out that phase
- ;; when it gets inherited by python and python-minimal.
- (for-each delete-file
- '("Lib/test/test_compileall.py"
- "Lib/test/test_ctypes.py" ; fails on mips64el
- "Lib/test/test_distutils.py"
- "Lib/test/test_import.py"
- "Lib/test/test_shutil.py"
- "Lib/test/test_socket.py"
- "Lib/test/test_subprocess.py"))
- #t))))
+ ;; Suboptimal to delete failing tests here, but if we delete them
in
+ ;; the arguments then we need to make sure to strip out that phase
+ ;; when it gets inherited by python and python-minimal.
+ (for-each delete-file
+ '("Lib/test/test_compileall.py"
+ "Lib/test/test_ctypes.py" ; fails on mips64el
+ "Lib/test/test_distutils.py"
+ "Lib/test/test_import.py"
+ "Lib/test/test_shutil.py"
+ "Lib/test/test_socket.py"
+ "Lib/test/test_subprocess.py"))
+ #t))))
(outputs '("out"
- "tk")) ;tkinter; adds 50 MiB to the closure
+ "tk")) ;tkinter; adds 50 MiB to the closure
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
diff --cc gnu/packages/tex.scm
index cdb0218,b9eeb0e..dbc9def
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -3778,43 -3648,89 +3953,55 @@@ It includes little more than the requir
'()
default-packages)))))
+ (define-public texlive-default-updmap.cfg
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://tug.org/svn/texlive/tags/";
+ %texlive-tag "/Master/texmf-dist/web2c/updmap.cfg"
+ "?revision=" (number->string %texlive-revision)))
+ (file-name (string-append "updmap.cfg-"
+ (number->string %texlive-revision)))
+ (sha256
+ (base32
+ "0faqknqxs80qp9ywk0by5k85s0yalg97c4lja4q56lsyblrr4j7i"))))
+
-;; For use in package definitions only
-(define-public texlive-union
+;;; TODO: Add a TeX Live profile hook computing fonts maps (and others?)
+;;; configuration from the packages in the profile, similar to what's done
+;;; below.
+(define-public texlive-updmap.cfg
(lambda* (#:optional (packages '()))
- "Return 'texlive-union' package which is a union of PACKAGES and the
-standard LaTeX packages."
+ "Return a 'texlive-updmap.cfg' package which contains the fonts map
+configuration of a base set of packages plus PACKAGES."
(let ((default-packages (match (package-propagated-inputs texlive-base)
(((labels packages) ...) packages))))
- (package (inherit texlive-base)
- (name "texlive-union")
- (build-system trivial-build-system)
+ (package
+ (version (number->string %texlive-revision))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://tug.org/svn/texlive/tags/";
+ %texlive-tag
+ "/Master/texmf-dist/web2c/updmap.cfg"
+ "?revision=" version))
+ (file-name "updmap.cfg")
+ (sha256
+ (base32
+ "0faqknqxs80qp9ywk0by5k85s0yalg97c4lja4q56lsyblrr4j7i"))))
+ (name "texlive-updmap.cfg")
+ (build-system copy-build-system)
(arguments
- '(#:modules ((guix build union)
+ '(#:modules ((guix build copy-build-system)
(guix build utils)
- (guix build texlive-build-system)
- (guix build gnu-build-system)
- (guix build gremlin)
- (guix elf))
- #:builder
- (begin
- (use-modules (ice-9 match)
- (ice-9 popen)
- (srfi srfi-26)
- (guix build union)
- (guix build utils)
- (guix build texlive-build-system))
- (let* ((out (assoc-ref %outputs "out"))
- (texmf.cnf (string-append out
"/share/texmf-dist/web2c/texmf.cnf")))
- ;; Build a modifiable union of all inputs (but exclude bash and
- ;; the updmap.cfg file)
- (match (filter (match-lambda
- ((name . _)
- (not (member name '("bash"
- "coreutils"
- "sed"
- "updmap.cfg")))))
- %build-inputs)
- (((names . directories) ...)
- (union-build (assoc-ref %outputs "out")
- directories
- #:create-all-directories? #t
- #:log-port (%make-void-port "w"))))
-
- ;; The configuration file "texmf.cnf" is provided by the
- ;; "texlive-bin" package. We take it and override only the
- ;; setting for TEXMFROOT and TEXMF. This file won't be
consulted
- ;; by default, though, so we still need to set TEXMFCNF.
- (substitute* texmf.cnf
- (("^TEXMFROOT = .*")
- (string-append "TEXMFROOT = " out "/share\n"))
- (("^TEXMF = .*")
- "TEXMF = $TEXMFROOT/share/texmf-dist\n"))
- (setenv "PATH" (string-append
- (assoc-ref %build-inputs "bash") "/bin:"
- (assoc-ref %build-inputs "coreutils") "/bin:"
- (assoc-ref %build-inputs "sed") "/bin:"
- (string-append out "/bin")))
- (for-each
- (cut wrap-program <>
- `("TEXMFCNF" ":" suffix (,(dirname texmf.cnf)))
- `("TEXMF" ":" suffix (,(string-append out
"/share/texmf-dist"))))
- (find-files (string-append out "/bin") ".*"))
-
- ;; Remove invalid maps from config file.
- (let ((web2c (string-append out "/share/texmf-config/web2c/"))
- (maproot (string-append out
"/share/texmf-dist/fonts/map/")))
- (mkdir-p web2c)
- (copy-file
- (assoc-ref %build-inputs "updmap.cfg")
- (string-append web2c "updmap.cfg"))
- (make-file-writable (string-append web2c "updmap.cfg"))
+ (ice-9 popen)
+ (ice-9 textual-ports))
+ #:install-plan '(("updmap.cfg" "share/texmf-config/web2c/")
+ ("map" "share/texmf-dist/fonts/map"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'install 'regenerate-updmap.cfg
+ (lambda _
+ (make-file-writable "updmap.cfg")
+ ;; Disable unavailable map files.
(let* ((port (open-pipe* OPEN_WRITE "updmap-sys"
"--syncwithtrees"
"--nohash"
diff --cc guix/build-system/asdf.scm
index 7bf2f97,b4e40ee..79de2ee
--- a/guix/build-system/asdf.scm
+++ b/guix/build-system/asdf.scm
@@@ -1,7 -1,6 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
- ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
+ ;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -266,29 -277,30 +266,29 @@@ set up using CL source package conventi
(arguments (strip-keyword-arguments private-keywords
arguments))))))
(define (asdf-build lisp-type)
- (lambda* (store name inputs
- #:key source outputs
- (tests? #t)
- (asd-files ''())
- (asd-systems ''())
- (test-asd-file #f)
- (phases '(@ (guix build asdf-build-system)
- %standard-phases))
- (search-paths '())
- (system (%current-system))
- (guile #f)
- (imported-modules %asdf-build-system-modules)
- (modules %asdf-build-modules))
+ (lambda* (name inputs
+ #:key source outputs
+ (tests? #t)
+ (asd-files ''())
+ (asd-systems ''())
+ (test-asd-file #f)
+ (phases '%standard-phases)
+ (search-paths '())
+ (system (%current-system))
+ (guile #f)
+ (imported-modules %asdf-build-system-modules)
+ (modules %asdf-build-modules))
- ;; FIXME: The definition of 'systems' is pretty hacky.
- ;; Is there a more elegant way to do it?
(define systems
(if (null? (cadr asd-systems))
- `(quote
- ,(list
- (string-drop
- ;; NAME is the value returned from `package-full-name'.
- (hyphen-separated-name->name+version name)
- (1+ (string-length lisp-type))))) ; drop the "<lisp>-" prefix.
+ ;; FIXME: Find a more reliable way to get the main system name.
+ (let* ((lisp-prefix (string-append lisp-type "-"))
+ (package-name (hyphen-separated-name->name+version
+ (if (string-prefix? lisp-prefix name)
+ (string-drop name
+ (string-length lisp-prefix))
+ name))))
+ `(quote ,(list package-name)))
asd-systems))
(define builder
diff --cc guix/build/emacs-build-system.scm
index 79a1a42,e41e9a6..ba2c1b4
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@@ -105,9 -121,24 +121,10 @@@ environment variable\n" source-director
"Substitute the absolute \"/bin/\" directory with the right location in the
store in '.el' files."
- (define (file-contains-nul-char? file)
- (call-with-input-file file
- (lambda (in)
- (let loop ((line (read-line in 'concat)))
- (cond
- ((eof-object? line) #f)
- ((string-index line #\nul) #t)
- (else (loop (read-line in 'concat))))))
- #:binary #t))
-
(let* ((out (assoc-ref outputs "out"))
- (site-lisp (string-append out %install-dir))
+ (elpa-name-ver (store-directory->elpa-name-version out))
+ (el-dir (string-append out %install-dir "/" elpa-name-ver))
- ;; (ice-9 regex) uses libc's regexp routines, which cannot deal with
- ;; strings containing NULs. Filter out such files. TODO: Remove
- ;; this workaround when <https://bugs.gnu.org/30116> is fixed.
- (el-files (remove file-contains-nul-char?
- (find-files (getcwd) "\\.el$"))))
+ (el-files (find-files (getcwd) "\\.el$")))
(define (substitute-program-names)
(substitute* el-files
(("\"/bin/([^.]\\S*)\"" _ cmd-name)
- branch core-updates updated (a605ef3 -> 23666a9), guix-commits, 2021/05/09
- 01/33: gnu: cross-kernel-headers: Fix build., guix-commits, 2021/05/09
- 04/33: gnu: cURL: Update to 7.76.1., guix-commits, 2021/05/09
- 02/33: Merge branch 'master' into core-updates,
guix-commits <=
- 03/33: gnu: Remove obsolete patches., guix-commits, 2021/05/09
- 07/33: gnu: MariaDB: Incorporate grafted changes., guix-commits, 2021/05/09
- 10/33: gnu: python-urllib3: Remove replacement package., guix-commits, 2021/05/09
- 11/33: gnu: glib: Disable SELinux support., guix-commits, 2021/05/09
- 14/33: gnu: elfutils: Omit static libraries., guix-commits, 2021/05/09
- 12/33: gnu: Python: Update to 3.9.5., guix-commits, 2021/05/09
- 13/33: gnu: elfutils: Update to 0.183., guix-commits, 2021/05/09
- 05/33: gnu: c-ares: Remove replacement package., guix-commits, 2021/05/09
- 06/33: gnu: unzip: Incorporate grafted changes., guix-commits, 2021/05/09
- 08/33: gnu: OpenLDAP: Remove replacement package., guix-commits, 2021/05/09