* gnu/packages/tex.scm (texlive-lh)[outputs]: Add a "doc" output.
[arguments]: Override the 'copy-files phase to install many more files in the
correct locations.
This is a followup to b949f34f31 and
7269f0c1b2.
* gnu/packages/tex.scm (texlive-hyperref)[propagated-inputs]: Use
TEXLIVE-URL instead of TEXLIVE-LATEX-URL.
(texlive-pdftex)[propagated-inputs]: Use TEXLIVE-KNUTH-LIB instead of
TEXLIVE-FONTS-KNUTH-LIB.
(texlive-context)[propagated-inputs]: Use TEXLIVE-STMARYRD instead of
TEXLIVE-FONTS-STMARYRD.
This is a merge of commit f98dfdc1b6, with the
hash updated for TeX Live 2021.
* gnu/packages/tex.scm (texlive-context-base): Deprecate in favor of
TEXLIVE-CONTEXT.
(texlive-context)[source]: Extract manuals and more files.
[propagated-inputs]: Add TEXLIVE-AMSFONTS, TEXLIVE-LM, TEXLIVE-PDFTEX,
TEXLIVE-METAPOST, TEXLIVE-FONTS-STMARYRD, and TEXLIVE-MFLOGO-FONT.
This is a merge of commit 9003bd8709, with the
hash updated for TeX Live 2021.
* gnu/packages/chez.scm (texlive-pdftex)[source]: Extract two more files.
[propagated-inputs]: Add TEXLIVE-CM, TEXLIVE-ETEX, TEXLIVE-FONTS-KNUTH-LIB,
TEXLIVE-HYPHEN-BASE, TEXLIVE-KPATHSEA, TEXLIVE-TEX-INI-FILES, and
TEXLIVE-TEX-PLAIN.
* gnu/packages/tex.scm (texlive-context): New variable.
(texlive-context-base): Deprecate in favor of texlive-context.
* gnu/packages/chez.scm (chez-web)[native-inputs]: Replace
texlive-context-base with texlive-context.
LuaJIT isn’t ported to 64-bit PowerPC. ‘texlive-bin’ and
‘texlive-latex-base’ already disable the engines that rely on it, so just
do the same in texlive-texmf.
Fix suggested by Mathieu Othacehe <othacehe@gnu.org>.
* gnu/packages/tex.scm (texlive-texmf)[arguments]: Disable LuaJIT
engines when building for powerpc64le.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
Some packages need files from ‘texlive-latex-l3backend’ – which is a
supporting package of LaTeX3 – so propagate it from ‘texlive-latex-base’.
* gnu/packages/statistics.scm (r-with-tests)[native-inputs]: Remove
‘texlive-latex-l3backend’ from the texlive union.
* gnu/packages/tex.scm (texlive-latex-base)[propagated-inputs]: Add
‘texlive-latex-l3backend’.
(texlive-latex-xkeyval)[native-inputs]: Remove ‘texlive-latex-l3backend’.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
The “Building TeX Live” manual has a section about configure options for
distro builds¹. They mention this option:
--with-banner-add=/SomeDistro
This isn’t technically required, but is strongly recommended, so your
build and your distro can be distinguished from others.
Therefore add it to texlive-bin. This is how it appears on LuaTeX, for
example (it also shows up in other engines’ banners):
$ luatex
This is LuaTeX, Version 1.13.0 (TeX Live 2021/GNU Guix)
restricted system commands enabled.
**
The other options mentioned in that section are already being used.
¹ http://www.tug.org/texlive/doc/tlbuild.html#Distro-builds
* gnu/packages/tex.scm (texlive-bin)[arguments]: Add ‘--with-banner-add’
option.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
* gnu/packages/tex.scm (biber): Update to 2.16.
[source]: Remove 'patches'.
[inputs]: Add 'perl-io-string', 'perl-parse-recdescent', and
'perl-unicode-collate' (upstream appears to have fixed the issue
initially mentioned as a comment: recent issue was closed after
telling user to use perl-unicode-collate 1.29, which is the one
available; see <https://github.com/plk/biber/issues/378>.)
* gnu/packages/patches/biber-fix-encoding-write.patch,
gnu/packages/patches/biber-sortinithash.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
texlive-latex-pdftexcmds moved to a different directory in TeX Live 2021.
* gnu/packages/tex.scm (texlive-latex-pdftexcmds): Update hash and paths.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Use version 20210325 for the tarballs, which is the latest one available on
the historical releases repository. And use subversion tag 2021.3 which is
the latest one available as well.
TeX Live dropped support for using the system’s poppler library after the
2020 version. Quoting from `m4/kpse-xpdf-flags.m4`:
# Support for our semi-homegrown libs/xpdf library. This is derived
# from xpdf source code, but xpdf does not distribute it as a library.
# It is used by pdftex (and nothing else) to read PDF images.
# Other engines use the semi-homegrown pplib library (q.v.) for that.
# The well-known poppler library is also originally derived from xpdf
# source code, but has been greatly revised and extended. TL used to
# (sort of) support poppler as the system xpdf, but after the TL 2020
# release we dropped this, because we switched XeTeX to use pplib, and
# nothing else used poppler. (No engines ever used poppler to generate
# their PDF output).
#
# poppler is aggressively developed, with requirements for new compilers
# and language versions. That's fine for them, but since we don't need
# anything new, it has become too time-consuming and problematic to
# continue to support it in the TL sources, when we don't have any
# requirement for it.
Therefore the main change in this commit is making the texlive-bin package
use the embedded pplib and xpdf libraries.
Another noteworthy change is to texlive-latex-l3packages, which now needs
to ship a few pre-generated files that cannot be reproduced during the
build process (the comments in the package definition have more details).
* guix/build-system/texlive.scm (%texlive-tag): Set to “texlive-2021.3”.
(%texlive-revision): Set to 59745.
* gnu/packages/tex.scm (hyph-utf8-scripts, texlive-docstrip,
texlive-unicode-data texlive-hyphen-base, texlive-metafont, texlive-cm,
texlive-courier, texlive-lm, texlive-knuth-lib, texlive-tex-plain,
texlive-hyphen-finnish, texlive-hyphen-german, texlive-hyph-utf8,
texlive-dehyph-exptl, texlive-kpathsea, texlive-latex-fancyvrb,
texlive-graphics-def, texlive-latex-graphics, texlive-hyperref,
texlive-oberdiek, texlive-latex-tools, texlive-latex-l3kernel,
texlive-l3build, texlive-luaotfload, texlive-latex-amsmath, texlive-amscls,
texlive-babel, texlive-generic-babel-german, texlive-babel-swedish,
texlive-psnfss, texlive-latex-draftwatermark, texlive-latex-etoc,
texlive-etoolbox, texlive-latex-polyglossia, texlive-tex-texinfo,
texlive-latex-bookmark, texlive-latex-cmap, texlive-latex-fancyhdr,
texlive-latex-kvoptions, texlive-latex-eso-pic, texlive-latex-multirow,
texlive-latex-parskip, texlive-latex-pdfpages, texlive-metapost,
texlive-latex-acmart, texlive-latex-preview, texlive-latex-acronym,
texlive-pdftex, texlive-latex-media9, texlive-latex-ocgx2,
texlive-latex-ms, texlive-latex-pgf, texlive-latex-pgf-generic,
texlive-latex-koma-script, texlive-generic-ltxcmds, texlive-bibtex,
texlive-context-base, texlive-context, texlive-beamer, texlive-pstricks,
texlive-tools, texlive-latex-xkeyval, texlive-csquotes, texlive-biblatex,
texlive-todonotes, texlive-microtype, texlive-caption, texlive-fontaxes,
texlive-cabin, texlive-newtx, texlive-xcharter, texlive-adjustbox,
texlive-tcolorbox): Update hash.
(texlive-extra-src, texlive-texmf-src): Update version to
“20210325”. Update hash.
(texlive-bin)[source]: Update version to “20210325”. Update hash. Preserve
‘libs/pplib’ and ‘libs/xpdf’.
[inputs]: Update hash for ‘texlive-scripts’. Remove ‘poppler’.
[arguments]: Remove “--with-system-poppler” and “--with-system-xpdf” from
‘#:configure-flags’. Remove build phase ‘use-code-for-new-poppler’.
(texlive-hyphen-schoolfinnish): Add public variable.
(texlive-hyphen-macedonian): Add 8bit patterns. Update hash.
(texlive-latex-base)[template]: Update hash.
[arguments]: Set ‘LUAINPUTS’ environment variable in build phase.
[native-inputs]: Update hash for ‘texlive-luatexconfig’.
[propagated-inputs]: Add ‘texlive-hyphen-schoolfinnish’,
‘texlive-latex-l3kernel’ and ‘texlive-latex-l3packages’.
(texlive-latex-l3packages)[source]: Use ‘texlive-origin’. Update hash. Add
generated files.
[arguments]: Adjust paths for ‘TEXINPUTS’ environment variable. Add build
phase ‘copy-generated-files’.
(texlive-texmf, texlive): Update version to “20210325”.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
The package texlive-latex-base in TeX Live 2021 will depend on
texlive-latex-l3kernel and texlive-latex-l3packages. Therefore we need to
remove their build dependency on texlive-latex-base to avoid a circular
dependency.
l3kernel and l3packages don’t need LaTeX during build, just IniTeX.
So to make them use it, modify texlive-build-system to allow disabling
the #:texlive-latex-base and #:tex-format parameters, and also add
a #:tex-engine parameter.
We also need to add texlive-docstrip as a native input, which was
previously provided by texlive-latex-base.
* gnu/packages/tex.scm (texlive-latex-l3kernel,
texlive-latex-l3packages)[arguments]: Add ‘#:tex-engine’, ‘#:tex-format’
and ‘#:texlive-latex-base’ parameters.
[native-inputs]: Add ‘texlive-docstrip’.
* guix/build-system/texlive.scm (lower)[build-inputs]: Don’t add
‘texlive-latex-base’ if its keyword parameter is false.
(texlive-build): Add ‘tex-engine’ keyword parameter.
[builder]: If a ‘tex-engine’ parameter was passed, use it. Otherwise, use
‘tex-format’ as the engine.
* guix/build/texlive-build-system.scm (compile-with-latex): Add ‘engine’
parameter. If the ‘format’ parameter is false, add “-ini” option to the
command line.
(build): Add ‘tex-engine’ parameter. Pass it down to ‘compile-with-latex’.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Fixes: <https://bugs.gnu.org/49218>.
* gnu/packages/tex.scm (texlive-bin)[#:configure-flags]: Add
"--disable-luajithbtex" on powerpc64le systems.
(texlive-latex-base)[#:phases][build]: Add "mfluajit" to the disabled-formats
list on powerpc64le systems.
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a277 and
12964df69a respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
This change was automated via the following command:
$ git ls-files | xargs sed -i 's/,qtbase)/,qtbase-5)/g'
$ git ls-files | xargs sed -i 's/inherit qtbase)/inherit qtbase-5)/g'
$ git ls-files | xargs sed -i 's/package-version qtbase)/package-version qtbase-5)/g'
$ git checkout etc # to clear some spurious changes
This is done so the qtbase package can be upgraded to version 6 in the
following commit.
Ludovic Courtès
Ricardo Wurmus
Danny Milosavljevic
Vivien Kraus
Mathieu Othacehe
Tobias Geerinckx-Rice
Marius Bakke
Thiago Jung Bauermann
Efraim Flashner
Milkey Mouse
Nathan Benedetto Proença
Leo Prikler
Julien Lepiller
Ivan Gankevich
Chris Marusich
Xinglu Chen
Maxim Cournoyer