[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge core-updates into wip-ppc64le.
|
From: |
guix-commits |
|
Subject: |
01/03: Merge core-updates into wip-ppc64le. |
|
Date: |
Wed, 24 Feb 2021 04:42:20 -0500 (EST) |
marusich pushed a commit to branch wip-ppc64le
in repository guix.
commit 38283f5bdb598db16e9556552a9e97d27ccf4fa6
Merge: d873ade 4f4b749
Author: Chris Marusich <cmmarusich@gmail.com>
AuthorDate: Tue Feb 23 17:42:10 2021 -0800
Merge core-updates into wip-ppc64le.
I have resolved the following conflicting files manually:
* gnu/local.mk
* gnu/packages/base.scm
* gnu/packages/bootstrap.scm
* gnu/packages/commencement.scm
* gnu/packages/compression.scm
* gnu/packages/dbm.scm
* gnu/packages/tex.scm
* gnu/packages/tls.scm
* guix/packages.scm
* guix/utils.scm
Additionally, I have deleted
gnu/packages/patches/gnutls-fix-status-request-revoked.patch and removed all
references to it, since that fix is no longer required after merging.
Makefile.am | 9 +-
build-aux/build-self.scm | 14 +-
build-aux/test-driver.scm | 184 +-
configure.ac | 1 +
doc/build.scm | 2 +-
doc/guix.texi | 195 +-
etc/guix-publish.service.in | 3 +
etc/news.scm | 113 +
gnu/bootloader/u-boot.scm | 9 +-
gnu/build/activation.scm | 4 +-
gnu/build/image.scm | 2 +-
gnu/build/vm.scm | 4 +-
gnu/local.mk | 61 +-
gnu/packages/admin.scm | 58 +-
gnu/packages/adns.scm | 4 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/android.scm | 9 +-
gnu/packages/antivirus.scm | 6 +-
gnu/packages/assembly.scm | 17 +-
gnu/packages/astronomy.scm | 34 +
gnu/packages/audio.scm | 18 +-
gnu/packages/autotools.scm | 28 +-
gnu/packages/aux-files/guile-launcher.c | 8 +-
gnu/packages/aux-files/linux-libre/5.10-arm.conf | 6 +-
gnu/packages/aux-files/linux-libre/5.10-arm64.conf | 14 +-
gnu/packages/aux-files/linux-libre/5.10-i686.conf | 13 +-
.../aux-files/linux-libre/5.10-x86_64.conf | 35 +-
gnu/packages/aux-files/linux-libre/5.9-arm.conf | 9791 -----------------
gnu/packages/aux-files/linux-libre/5.9-arm64.conf | 9895 -----------------
gnu/packages/aux-files/linux-libre/5.9-i686.conf | 10645 -------------------
gnu/packages/aux-files/linux-libre/5.9-x86_64.conf | 10638 ------------------
gnu/packages/aux-files/python/sanity-check.py | 92 +
gnu/packages/aux-files/python/sitecustomize.py | 41 +
gnu/packages/backup.scm | 8 +-
gnu/packages/base.scm | 157 +-
gnu/packages/benchmark.scm | 2 +-
gnu/packages/bioinformatics.scm | 170 +-
gnu/packages/bison.scm | 17 +-
gnu/packages/boost.scm | 39 +-
gnu/packages/bootloaders.scm | 46 +-
gnu/packages/bootstrap.scm | 6 +-
gnu/packages/browser-extensions.scm | 8 +-
gnu/packages/build-tools.scm | 19 +-
gnu/packages/cdrom.scm | 6 +-
gnu/packages/certs.scm | 136 +-
gnu/packages/check.scm | 277 +-
gnu/packages/chemistry.scm | 27 +-
gnu/packages/chez.scm | 18 +-
gnu/packages/chromium.scm | 9 +-
gnu/packages/ci.scm | 6 +-
gnu/packages/cmake.scm | 105 +-
gnu/packages/commencement.scm | 331 +-
gnu/packages/compression.scm | 68 +-
gnu/packages/connman.scm | 6 +-
gnu/packages/cpio.scm | 10 +-
gnu/packages/cran.scm | 1509 ++-
gnu/packages/crates-graphics.scm | 24 +-
gnu/packages/crates-io.scm | 1202 ++-
gnu/packages/cross-base.scm | 21 +-
gnu/packages/crypto.scm | 2 +-
gnu/packages/cups.scm | 43 +-
gnu/packages/curl.scm | 79 +-
gnu/packages/databases.scm | 104 +-
gnu/packages/dbm.scm | 14 +-
gnu/packages/debian.scm | 4 +-
gnu/packages/debug.scm | 4 +-
gnu/packages/dictionaries.scm | 6 +-
gnu/packages/diffoscope.scm | 8 +-
gnu/packages/disk.scm | 6 +-
gnu/packages/display-managers.scm | 2 +-
gnu/packages/django.scm | 79 +-
gnu/packages/docbook.scm | 102 +-
gnu/packages/docker.scm | 7 +-
gnu/packages/documentation.scm | 76 +-
gnu/packages/ebook.scm | 4 +-
gnu/packages/ed.scm | 4 +-
gnu/packages/education.scm | 2 +-
gnu/packages/elf.scm | 17 +-
gnu/packages/emacs-xyz.scm | 906 +-
gnu/packages/emacs.scm | 6 +-
gnu/packages/embedded.scm | 27 +
gnu/packages/emulators.scm | 35 +-
gnu/packages/engineering.scm | 24 +-
gnu/packages/file-systems.scm | 24 +-
gnu/packages/file.scm | 5 +-
gnu/packages/finance.scm | 6 +-
gnu/packages/firmware.scm | 78 +-
gnu/packages/fonts.scm | 98 +-
gnu/packages/fontutils.scm | 215 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/game-development.scm | 29 +-
gnu/packages/games.scm | 103 +-
gnu/packages/gawk.scm | 4 +-
gnu/packages/gcc.scm | 77 +-
gnu/packages/gdb.scm | 49 +-
gnu/packages/geo.scm | 143 +-
gnu/packages/gettext.scm | 65 +-
gnu/packages/ghostscript.scm | 10 +-
gnu/packages/gimp.scm | 4 +-
gnu/packages/gl.scm | 17 +-
gnu/packages/glib.scm | 95 +-
gnu/packages/gnome-xyz.scm | 43 +-
gnu/packages/gnome.scm | 275 +-
gnu/packages/gnupg.scm | 22 +-
gnu/packages/gnuzilla.scm | 20 +-
gnu/packages/gpodder.scm | 3 -
gnu/packages/gps.scm | 2 +-
gnu/packages/gstreamer.scm | 45 +-
gnu/packages/gtk.scm | 61 +-
gnu/packages/guile-xyz.scm | 26 +-
gnu/packages/guile.scm | 34 +-
gnu/packages/ibus.scm | 13 +-
gnu/packages/icu4c.scm | 8 +-
gnu/packages/image.scm | 51 +-
gnu/packages/imagemagick.scm | 18 +-
gnu/packages/inkscape.scm | 4 +-
gnu/packages/irc.scm | 7 +-
gnu/packages/jemalloc.scm | 4 +-
gnu/packages/kde-frameworks.scm | 28 +-
gnu/packages/kde.scm | 1 +
gnu/packages/kerberos.scm | 7 +-
gnu/packages/ld-wrapper.in | 3 +-
gnu/packages/libevent.scm | 15 +-
gnu/packages/libffi.scm | 27 +-
gnu/packages/libidn.scm | 5 +-
gnu/packages/libsigsegv.scm | 4 +-
gnu/packages/linux.scm | 96 +-
gnu/packages/lisp-xyz.scm | 775 +-
gnu/packages/lisp.scm | 20 +-
gnu/packages/llvm.scm | 12 +-
gnu/packages/machine-learning.scm | 47 +-
gnu/packages/mail.scm | 8 +-
gnu/packages/make-bootstrap.scm | 4 -
gnu/packages/man.scm | 27 +-
gnu/packages/markup.scm | 23 +
gnu/packages/mastodon.scm | 75 +-
gnu/packages/mate.scm | 5 +-
gnu/packages/maths.scm | 104 +-
gnu/packages/mc.scm | 6 +-
gnu/packages/messaging.scm | 29 +-
gnu/packages/mingw.scm | 113 +-
gnu/packages/monitoring.scm | 78 +
gnu/packages/mpd.scm | 10 +-
gnu/packages/multiprecision.scm | 89 +-
gnu/packages/music.scm | 359 +-
gnu/packages/nettle.scm | 6 +-
gnu/packages/networking.scm | 19 +-
gnu/packages/nim.scm | 4 +-
gnu/packages/node.scm | 22 +-
gnu/packages/nss.scm | 221 +-
gnu/packages/onc-rpc.scm | 19 +-
gnu/packages/openldap.scm | 91 +-
gnu/packages/package-management.scm | 58 +-
gnu/packages/password-utils.scm | 10 +-
.../patches/bdb-5.3-atomics-on-gcc-9.patch | 22 +
.../patches/boost-fix-transitive-linking.patch | 16 +
gnu/packages/patches/clementine-fix-sqlite.patch | 23 -
.../clementine-remove-crypto++-dependency.patch | 19 -
gnu/packages/patches/clementine-use-openssl.patch | 67 -
gnu/packages/patches/dbus-CVE-2020-12049.patch | 58 -
.../docbook-xsl-nonrecursive-string-subst.patch | 11 +-
.../patches/docbook-xsl-support-old-url.patch | 17 +
gnu/packages/patches/emacs-undohist-ignored.patch | 27 -
.../patches/findutils-test-rwlock-threads.patch | 38 -
.../patches/fontconfig-hurd-path-max.patch | 17 -
gnu/packages/patches/freebayes-devendor-deps.patch | 2 +-
.../patches/ganeti-preserve-PYTHONPATH.patch | 21 -
.../patches/ghostscript-freetype-compat.patch | 35 +
gnu/packages/patches/glibc-bootstrap-system.patch | 38 +-
gnu/packages/patches/glibc-dl-cache.patch | 140 +
.../gnutls-fix-status-request-revoked.patch | 48 -
.../patches/gst-plugins-good-fix-test.patch | 94 +
.../patches/guile-ssh-fix-test-suite.patch | 217 +
.../patches/hdf5-1.8-mpi-deprecations.patch | 169 -
gnu/packages/patches/icu4c-CVE-2020-10531.patch | 127 -
gnu/packages/patches/inetutils-hurd.patch | 583 -
.../patches/jsoncpp-fix-inverted-case.patch | 22 -
gnu/packages/patches/libssh2-CVE-2019-17498.patch | 126 +
gnu/packages/patches/libtirpc-hurd-client.patch | 50 -
.../patches/mesa-skip-disk-cache-test.patch | 19 -
gnu/packages/patches/mesa-skip-tests.patch | 49 +
gnu/packages/patches/meson-for-build-rpath.patch | 24 -
gnu/packages/patches/nss-3.56-pkgconfig.patch | 187 +-
.../patches/nss-increase-test-timeout.patch | 4 +-
gnu/packages/patches/obs-modules-location.patch | 33 +
.../patches/owncloud-disable-updatecheck.patch | 8 +-
.../patches/perl-deterministic-ordering.patch | 29 -
.../perl-io-socket-ssl-openssl-1.0.2f-fix.patch | 33 -
gnu/packages/patches/perl-no-sys-dirs.patch | 99 +-
gnu/packages/patches/python-3-fix-tests.patch | 194 +-
gnu/packages/patches/python-3-hurd-configure.patch | 27 +
gnu/packages/patches/python-3.8-fix-tests.patch | 42 -
gnu/packages/patches/python-CVE-2020-26116.patch | 47 +
.../python-babel-fix-parse-future-test.patch | 68 +
.../patches/python-libxml2-python39-compat.patch | 94 +
.../patches/python-mediafile-wavpack.patch | 57 +
.../patches/python-pyflakes-fix-tests.patch | 40 +
.../patches/python-typing-inspect-fix.patch | 38 +
gnu/packages/patches/qpdfview-qt515-compat.patch | 17 +
.../patches/qtbase-fix-krita-deadlock.patch | 110 -
.../patches/renpy-use-system-fribidi.patch | 23 +-
gnu/packages/patches/rust-1.19-mrustc.patch | 28 -
.../rust-1.25-accept-more-detailed-gdb-lines.patch | 111 -
gnu/packages/patches/rust-1.30-gdb-llvm.patch | 89 -
gnu/packages/patches/rust-1.45-linker-locale.patch | 14 -
gnu/packages/patches/rust-1.48-linker-locale.patch | 14 -
.../patches/rust-bootstrap-stage0-test.patch | 55 -
gnu/packages/patches/sbc-fix-build-non-x86.patch | 17 +
gnu/packages/patches/tcsh-fix-autotest.patch | 11 -
.../vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch | 83 -
.../patches/vorbis-tools-CVE-2014-9640.patch | 29 -
.../patches/vorbis-tools-CVE-2015-6749.patch | 44 -
gnu/packages/patches/zziplib-CVE-2018-16548.patch | 49 -
gnu/packages/patchutils.scm | 2 +-
gnu/packages/pdf.scm | 45 +-
gnu/packages/perl-check.scm | 36 +-
gnu/packages/perl.scm | 72 +-
gnu/packages/photo.scm | 8 +-
gnu/packages/php.scm | 12 +-
gnu/packages/plotutils.scm | 72 +-
gnu/packages/presentation.scm | 4 +-
gnu/packages/protobuf.scm | 17 +-
gnu/packages/pulseaudio.scm | 14 +-
gnu/packages/python-build.scm | 14 +-
gnu/packages/python-check.scm | 60 +-
gnu/packages/python-crypto.scm | 45 +-
gnu/packages/python-science.scm | 13 +-
gnu/packages/python-web.scm | 63 +-
gnu/packages/python-xyz.scm | 1087 +-
gnu/packages/python.scm | 487 +-
gnu/packages/qt.scm | 211 +-
gnu/packages/radio.scm | 46 +-
gnu/packages/readline.scm | 19 +-
gnu/packages/ruby.scm | 312 +-
gnu/packages/rust-apps.scm | 5 +-
gnu/packages/rust.scm | 1707 +--
gnu/packages/samba.scm | 8 +-
gnu/packages/scheme.scm | 6 +-
gnu/packages/screen.scm | 2 +-
gnu/packages/security-token.scm | 4 +-
gnu/packages/sequoia.scm | 2 +-
gnu/packages/serialization.scm | 6 +-
gnu/packages/shells.scm | 23 +-
gnu/packages/simulation.scm | 36 +-
gnu/packages/skarnet.scm | 16 +-
gnu/packages/solidity.scm | 92 +
gnu/packages/sphinx.scm | 77 +-
gnu/packages/spice.scm | 4 +-
gnu/packages/sqlite.scm | 26 +-
gnu/packages/ssh.scm | 42 +-
gnu/packages/statistics.scm | 110 +-
gnu/packages/stenography.scm | 28 +-
gnu/packages/storage.scm | 7 +-
gnu/packages/sync.scm | 29 +-
gnu/packages/syndication.scm | 6 +-
gnu/packages/task-management.scm | 18 +-
gnu/packages/telegram.scm | 225 +-
gnu/packages/terminals.scm | 10 +-
gnu/packages/tex.scm | 2019 ++--
gnu/packages/texinfo.scm | 27 +-
gnu/packages/text-editors.scm | 57 +-
gnu/packages/time.scm | 20 +-
gnu/packages/tls.scm | 127 +-
gnu/packages/tmux.scm | 4 -
gnu/packages/tor.scm | 13 +-
gnu/packages/tryton.scm | 640 +-
gnu/packages/version-control.scm | 22 +-
gnu/packages/video.scm | 102 +-
gnu/packages/vim.scm | 2 +
gnu/packages/virtualization.scm | 84 +-
gnu/packages/visidata.scm | 4 +-
gnu/packages/vpn.scm | 4 +-
gnu/packages/vulkan.scm | 26 +-
gnu/packages/w3m.scm | 13 +-
gnu/packages/web-browsers.scm | 31 +-
gnu/packages/web.scm | 117 +-
gnu/packages/wicd.scm | 5 +-
gnu/packages/xdisorg.scm | 100 +-
gnu/packages/xfce.scm | 18 +-
gnu/packages/xiph.scm | 8 +-
gnu/packages/xml.scm | 61 +-
gnu/packages/xorg.scm | 122 +-
gnu/services/cuirass.scm | 8 +
gnu/services/databases.scm | 6 +-
gnu/services/dns.scm | 14 +-
gnu/services/linux.scm | 3 +-
gnu/services/nfs.scm | 4 +-
gnu/services/xorg.scm | 37 +
gnu/system/locale.scm | 3 +-
gnu/system/shadow.scm | 8 +-
gnu/system/vm.scm | 6 +-
gnu/tests/monitoring.scm | 2 +-
guix/build-system/cargo.scm | 2 +-
guix/build-system/gnu.scm | 25 +-
guix/build-system/meson.scm | 2 +-
guix/build-system/python.scm | 8 +
guix/build-system/renpy.scm | 131 +
guix/build-system/texlive.scm | 10 +-
guix/build/copy-build-system.scm | 2 +-
guix/build/emacs-build-system.scm | 16 +-
guix/build/gnu-build-system.scm | 224 +-
guix/build/gremlin.scm | 117 +-
guix/build/lisp-utils.scm | 2 +-
guix/build/maven/pom.scm | 2 +-
guix/build/meson-build-system.scm | 2 +-
guix/build/minify-build-system.scm | 11 +-
guix/build/profiles.scm | 6 +-
guix/build/python-build-system.scm | 133 +-
guix/build/renpy-build-system.scm | 99 +
guix/build/rpath.scm | 59 -
guix/build/ruby-build-system.scm | 25 +-
guix/build/texlive-build-system.scm | 42 +-
guix/build/utils.scm | 187 +-
guix/channels.scm | 178 +-
guix/config.scm.in | 25 +-
guix/describe.scm | 60 +-
guix/docker.scm | 11 +-
guix/gexp.scm | 29 +-
guix/git-authenticate.scm | 9 +-
guix/import/gnu.scm | 27 +-
guix/narinfo.scm | 1 +
guix/packages.scm | 218 +-
guix/profiles.scm | 134 +-
guix/scripts.scm | 15 +-
guix/scripts/describe.scm | 108 +-
guix/scripts/environment.scm | 22 +-
guix/scripts/pack.scm | 27 +-
guix/scripts/package.scm | 118 +-
guix/self.scm | 25 +-
guix/store.scm | 10 +-
guix/store/roots.scm | 2 +-
guix/tests.scm | 43 +-
guix/ui.scm | 18 +-
guix/utils.scm | 125 +-
m4/guix.m4 | 30 +-
tests/build-utils.scm | 24 +-
tests/builders.scm | 121 +-
tests/gremlin.scm | 66 +-
tests/guix-package.sh | 10 +-
tests/packages.scm | 121 +-
tests/profiles.scm | 30 +-
tests/utils.scm | 26 +-
342 files changed, 15278 insertions(+), 51905 deletions(-)
diff --cc gnu/local.mk
index a32fdb4,202677f..765d6a8
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -40,7 -40,7 +40,8 @@@
# Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes@gmail.com>
# Copyright © 2020 Vinicius Monego <monego@posteo.net>
# Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
+# Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
+ # Copyright © 2021 Greg Hogan <code@greghogan.com>
#
# This file is part of GNU Guix.
#
diff --cc gnu/packages/base.scm
index 0f74380,5c65abe..3268331
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@@ -707,19 -676,9 +677,10 @@@ the store."
(uri (string-append "mirror://gnu/glibc/glibc-" version
".tar.xz"))
(sha256
(base32
- "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj"))
- (snippet
- ;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is
- ;; required on LFS distros to avoid loading the distro's libc.so
- ;; instead of ours.
- '(begin
- (substitute* "sysdeps/unix/sysv/linux/configure"
- (("use_ldconfig=yes")
- "use_ldconfig=no"))
- #t))
- (modules '((guix build utils)))
+ "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"))
(patches (search-patches "glibc-ldd-x86_64.patch"
+ "glibc-ldd-powerpc.patch"
+ "glibc-dl-cache.patch"
"glibc-hidden-visibility-ldconfig.patch"
"glibc-versioned-locpath.patch"
"glibc-allow-kernel-2.6.32.patch"
diff --cc gnu/packages/bootstrap.scm
index 8db73aa,fee2ae1..c50e94e
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@@ -5,7 -5,7 +5,8 @@@
;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019 Carl Dong <contact@carldong.me>
;;; Copyright © 2019 Léo Le Bouter <lle-bout@zaclys.net>
+ ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/commencement.scm
index a5940a5,890d579..f5efe2f
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@@ -9,7 -9,7 +9,8 @@@
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
+;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
+ ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/compression.scm
index 9e21e43,972b227..b5d20bd
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@@ -29,7 -29,8 +29,8 @@@
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2020 Léo Le Bouter <lle-bout@zaclys.net>
+;;; Copyright © 2020, 2021 Léo Le Bouter <lle-bout@zaclys.net>
+ ;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/dbm.scm
index 2dd51ef,d307914..daefc44
--- a/gnu/packages/dbm.scm
+++ b/gnu/packages/dbm.scm
@@@ -4,7 -4,7 +4,8 @@@
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
+ ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/elf.scm
index 49b19fb,2e21cab..aab9126
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@@ -5,10 -5,9 +5,10 @@@
;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
- ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
+ ;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Mark Wielaard <mark@klomp.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/tex.scm
index dc87d05,1038703..e38dfc8
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -343,111 -350,184 +351,192 @@@ files from LOCATIONS with expected chec
"--with-system-teckit"
"--with-system-xpdf"
"--with-system-zlib"
- "--with-system-zziplib")
-
- ;; Disable tests on mips64/aarch64 to cope with a failure of
luajiterr.test.
- ;; XXX FIXME fix luajit properly on mips64 and aarch64.
+ "--with-system-zziplib"
+ ;; LuaJIT is not ported to powerpc64le* yet.
+ ,@(if (string-prefix? "powerpc64le" (or (%current-target-system)
+ (%current-system)))
+ '("--disable-luajittex"
+ "--disable-mfluajit")
+ '()))
+
- ;; Disable tests on mips64/aarch64/powerpc64le to cope with a failure of
- ;; luajiterr.test.
- ;; XXX FIXME fix luajit properly on mips64, aarch64 and powerpc64le.
- #:tests? ,(let ((s (or (%current-target-system)
- (%current-system))))
- (not (or (string-prefix? "aarch64" s)
- (string-prefix? "mips64" s)
- (string-prefix? "powerpc64le" s))))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'configure-ghostscript-executable
- ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows,
- ;; and the "gs" ghostscript executable on Unix. It detects Unix by
- ;; checking for the existence of the /usr/bin directory. Since
- ;; Guix System does not have /usr/bin, it is also detected as
Windows.
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl"
- (("gswin32c") "gs"))
- (substitute* "texk/texlive/linked_scripts/epstopdf/epstopdf.pl"
- (("\"gs\"")
- (string-append "\"" (assoc-ref inputs "ghostscript")
"/bin/gs\"")))
- #t))
- (add-after 'unpack 'use-code-for-new-poppler
- (lambda _
- (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc"
- "texk/web2c/pdftexdir/pdftoepdf.cc")
- (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc"
- "texk/web2c/pdftexdir/pdftosrc.cc")
- #t))
- (add-after 'unpack 'patch-dvisvgm-build-files
- (lambda _
- ;; XXX: Ghostscript is detected, but HAVE_LIBGS is never set, so
- ;; the appropriate linker flags are not added.
- (substitute* "texk/dvisvgm/configure"
- (("^have_libgs=yes" all)
- (string-append all "\nHAVE_LIBGS=1")))
- #t))
- (add-after 'unpack 'disable-failing-test
- (lambda _
- ;; FIXME: This test fails on 32-bit architectures since Glibc
2.28:
- ;; <https://bugzilla.redhat.com/show_bug.cgi?id=1631847>.
- (substitute* "texk/web2c/omegafonts/check.test"
- (("^\\./omfonts -ofm2opl \\$srcdir/tests/check tests/xcheck
\\|\\| exit 1")
- "./omfonts -ofm2opl $srcdir/tests/check tests/xcheck || exit
77"))
- #t))
- (add-after 'install 'postint
- (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
- (let* ((out (assoc-ref outputs "out"))
- (share (string-append out "/share"))
- (texlive-extra (assoc-ref inputs "texlive-extra-src"))
- (unpack (assoc-ref %standard-phases 'unpack))
- (patch-source-shebangs
- (assoc-ref %standard-phases 'patch-source-shebangs)))
- (substitute* (string-append share "/texmf-dist/web2c/texmf.cnf")
- ;; Don't truncate lines.
- (("^error_line = .*$") "error_line = 254\n")
- (("^half_error_line = .*$") "half_error_line = 238\n")
- (("^max_print_line = .*$") "max_print_line = 1000\n"))
- ;; Create symbolic links for the latex variants and their
- ;; man pages.
- (with-directory-excursion (string-append out "/bin/")
- (for-each symlink
- '("pdftex" "pdftex" "xetex" "luatex")
- '("latex" "pdflatex" "xelatex" "lualatex")))
- (with-directory-excursion (string-append share "/man/man1/")
- (symlink "luatex.1" "lualatex.1"))
- ;; Unpack texlive-extra and install tlpkg.
- (mkdir "texlive-extra")
- (with-directory-excursion "texlive-extra"
- (apply unpack (list #:source texlive-extra))
- (apply patch-source-shebangs (list #:source texlive-extra))
- (invoke "mv" "tlpkg" share))
- (let ((scripts (string-append share
"/texmf-dist/scripts/texlive/")))
- (mkdir-p scripts)
- (copy-recursively (assoc-ref inputs "texlive-scripts")
scripts)
- ;; Make sure that fmtutil can find its Perl modules.
- (substitute* (string-append scripts "fmtutil.pl")
- (("\\$TEXMFROOT/") (string-append share "/"))))
-
- ;; texlua shebangs are not patched by the patch-source-shebangs
- ;; phase because the texlua executable does not exist at that
- ;; time.
- (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))
- (with-directory-excursion out
- (patch-source-shebangs))))))))
- (native-search-paths
- (list (search-path-specification
- (variable "TEXMF")
- (files '("share/texmf-dist"))
- (separator #f))
- (search-path-specification
- (variable "TEXMFCNF")
- (files '("share/texmf-dist/web2c"))
- (separator #f))))
- (synopsis "TeX Live, a package of the TeX typesetting system")
- (description
- "TeX Live provides a comprehensive TeX document production system.
++ ;; Disable tests on mips64/aarch64/powerpc64le to cope with a failure
of
++ ;; luajiterr.test.
++ ;; XXX FIXME fix luajit properly on these architectures.
+ #:tests? ,(let ((s (or (%current-target-system)
+ (%current-system))))
+ (not (or (string-prefix? "aarch64" s)
- (string-prefix? "mips64" s))))
++ (string-prefix? "mips64" s)
++ (string-prefix? "powerpc64le" s))))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'configure-ghostscript-executable
+ ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows,
+ ;; and the "gs" ghostscript executable on Unix. It detects Unix by
+ ;; checking for the existence of the /usr/bin directory. Since
+ ;; Guix System does not have /usr/bin, it is also detected as
Windows.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl"
+ (("gswin32c") "gs"))
+ (substitute* "texk/texlive/linked_scripts/epstopdf/epstopdf.pl"
+ (("\"gs\"")
+ (string-append "\"" (assoc-ref inputs "ghostscript")
"/bin/gs\"")))
+ #t))
+ (add-after 'unpack 'use-code-for-new-poppler
+ (lambda _
+ (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc"
+ "texk/web2c/pdftexdir/pdftoepdf.cc")
+ (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc"
+ "texk/web2c/pdftexdir/pdftosrc.cc")
+ #t))
+ (add-after 'unpack 'patch-dvisvgm-build-files
+ (lambda _
+ ;; XXX: Ghostscript is detected, but HAVE_LIBGS is never set, so
+ ;; the appropriate linker flags are not added.
+ (substitute* "texk/dvisvgm/configure"
+ (("^have_libgs=yes" all)
+ (string-append all "\nHAVE_LIBGS=1")))
+ #t))
+ (add-after 'unpack 'disable-failing-test
+ (lambda _
+ ;; FIXME: This test fails on 32-bit architectures since Glibc
2.28:
+ ;; <https://bugzilla.redhat.com/show_bug.cgi?id=1631847>.
+ (substitute* "texk/web2c/omegafonts/check.test"
+ (("^\\./omfonts -ofm2opl \\$srcdir/tests/check tests/xcheck
\\|\\| exit 1")
+ "./omfonts -ofm2opl $srcdir/tests/check tests/xcheck || exit
77"))
+ #t))
+ (add-after 'unpack 'unpack-texlive-extra
+ (lambda* (#:key inputs #:allow-other-keys)
+ (mkdir "texlive-extra")
+ (with-directory-excursion "texlive-extra"
+ (apply (assoc-ref %standard-phases 'unpack)
+ (list #:source (assoc-ref inputs
"texlive-extra-src"))))))
+ (add-after 'unpack-texlive-extra 'unpack-texlive-scripts
+ (lambda* (#:key inputs #:allow-other-keys)
+ (mkdir "texlive-scripts")
+ (with-directory-excursion "texlive-scripts"
+ (apply (assoc-ref %standard-phases 'unpack)
+ (list #:source (assoc-ref inputs "texlive-scripts"))))))
+ (add-after 'unpack-texlive-scripts 'patch-scripts
+ (lambda _
+ (let* ((scripts (append (find-files "texk/kpathsea" "^mktex")
+ (find-files "texlive-scripts" "\\.sh$")))
+ (commands '("awk" "basename" "cat" "grep" "mkdir" "rm"
+ "sed" "sort" "uname"))
+ (command-regexp (format #f "\\b(~a)\\b"
+ (string-join commands "|")))
+ (iso-8859-1-encoded-scripts
+ '("texlive-scripts/source/rubibtex.sh"
+ "texlive-scripts/source/rumakeindex.sh")))
+
+ (define (substitute-commands scripts)
+ (substitute* scripts
+ ((command-regexp dummy command)
+ (which command))))
+
+ (substitute-commands (lset-difference string= scripts
+
iso-8859-1-encoded-scripts))
+
+ (with-fluids ((%default-port-encoding "ISO-8859-1"))
+ (substitute-commands iso-8859-1-encoded-scripts))
+
+ #t)))
+ (add-after 'check 'customize-texmf.cnf
+ ;; The default texmf.cnf is provided by this package, texlive-bin.
+ ;; Every variable of interest is set relatively to the GUIX_TEXMF
+ ;; environment variable defined via a search path specification
+ ;; further below. The configuration file is patched after the test
+ ;; suite has run, as it relies on the default configuration to find
+ ;; its paths (and the GUIX_TEXMF variable isn't set yet).
+ (lambda _
+ ;; The current directory is build/ because of the out-of-tree
+ ;; build.
+ (let* ((source (first (scandir ".." (cut string-suffix?
+ "source" <>))))
+ (texmf.cnf (string-append "../" source
+ "/texk/kpathsea/texmf.cnf")))
+ (substitute* texmf.cnf
+ (("^TEXMFROOT = .*")
+ "TEXMFROOT = {$GUIX_TEXMF}/..\n")
+ (("^TEXMF = .*")
+ "TEXMF = {$GUIX_TEXMF}\n")
+ (("^%TEXMFCNF = .*")
+ "TEXMFCNF = {$GUIX_TEXMF}/web2c\n")
+ ;; Don't truncate lines.
+ (("^error_line = .*$") "error_line = 254\n")
+ (("^half_error_line = .*$") "half_error_line = 238\n")
+ (("^max_print_line = .*$") "max_print_line = 1000\n")))
+ #t))
+ (add-after 'install 'postint
+ (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
+ (let* ((out (assoc-ref outputs "out"))
+ (patch-source-shebangs (assoc-ref %standard-phases
+ 'patch-source-shebangs))
+ (share (string-append out "/share"))
+ (scripts (string-append share
+ "/texmf-dist/scripts/texlive"))
+ (source (string-append
+ "../" (first (scandir ".." (cut string-suffix?
+ "source" <>)))))
+ (tl-extra-root (string-append source "/texlive-extra"))
+ (tl-extra-dir (first
+ (scandir tl-extra-root
+ (negate
+ (cut member <> '("." ".."))))))
+ (tlpkg-src (string-append tl-extra-root "/" tl-extra-dir
+ "/tlpkg"))
+ (config.guess (string-append (assoc-ref inputs "config")
+ "/bin/config.guess")))
+
+ ;; Create symbolic links for the latex variants and their
+ ;; man pages.
+ (with-directory-excursion (string-append out "/bin/")
+ (for-each symlink
+ '("pdftex" "pdftex" "xetex" "luatex")
+ '("latex" "pdflatex" "xelatex" "lualatex")))
+ (with-directory-excursion (string-append share "/man/man1/")
+ (symlink "luatex.1" "lualatex.1"))
+
+ ;; Install tlpkg.
+ (copy-recursively tlpkg-src (string-append share "/tlpkg"))
+
+ ;; Install texlive-scripts.
+ (copy-recursively (string-append
+ source "/texlive-scripts/source/")
+ scripts)
+
+ ;; Make sure that fmtutil can find its Perl modules.
+ (substitute* (string-append scripts "/fmtutil.pl")
+ (("\\$TEXMFROOT/")
+ (string-append share "/")))
+
+ ;; Likewise for updmap.pl.
+ (substitute* (string-append scripts "/updmap.pl")
+ (("\\$TEXMFROOT/tlpkg")
+ (string-append share "/tlpkg")))
+
+ ;; Likewise for the tlmgr.
+ (substitute* (string-append scripts "/tlmgr.pl")
+ ((".*\\$::installerdir = \\$Master.*" all)
+ (format #f " $Master = ~s;~%~a" share all)))
+
+ ;; Install the config.guess script, required by tlmgr.
+ (with-directory-excursion share
+ (mkdir-p "tlpkg/installer/")
+ (symlink config.guess "tlpkg/installer/config.guess"))
+
+ ;; texlua shebangs are not patched by the patch-source-shebangs
+ ;; phase because the texlua executable does not exist at that
+ ;; time.
+ (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))
+ (with-directory-excursion out
+ (patch-source-shebangs))))))))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "GUIX_TEXMF")
+ (files '("share/texmf-dist")))))
+ (synopsis "TeX Live, a package of the TeX typesetting system")
+ (description
+ "TeX Live provides a comprehensive TeX document production system.
It includes all the major TeX-related programs, macro packages, and fonts
that are free software, including support for many languages around the
world.
diff --cc guix/packages.scm
index 3997f4c,67ef6ea..460e666
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@@ -5,7 -5,7 +5,8 @@@
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
+ ;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc guix/utils.scm
index 6dac7ae,96cd8c7..02efbdd
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@@ -8,7 -8,8 +8,9 @@@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018, 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
+ ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc m4/guix.m4
index 7a3426f,c1ce087..f0d85a2
--- a/m4/guix.m4
+++ b/m4/guix.m4
@@@ -1,8 -1,7 +1,8 @@@
dnl GNU Guix --- Functional package management for GNU
- dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic
Courtès <ludo@gnu.org>
+ dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021 Ludovic
Courtès <ludo@gnu.org>
dnl Copyright © 2014 Mark H Weaver <mhw@netris.org>
dnl Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+dnl Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
dnl
dnl This file is part of GNU Guix.
dnl