andreas pushed a commit to branch tex-team in repository guix. commit 083da181f4dd90d6aefd75188c335a970775494a Author: Nicolas Goaziou <m...@nicolasgoaziou.fr> AuthorDate: Sat Mar 29 10:47:44 2025 +0100
gnu: Rename `texlive-updmap.cfg' into `texlive-local-tree'. * doc/build.scm (pdf-manual): * doc/contributing.texi (Submitting Patches): * gnu/packages/algebra.scm (pari-gp): (giac): * gnu/packages/assembly.scm (asl): * gnu/packages/audio.scm (chow-tape-model): * gnu/packages/bioconductor.scm (r-biocstyle): * gnu/packages/bioinformatics.scm (discrover): (phyml): (velvet): * gnu/packages/chemistry.scm (yaehmop): * gnu/packages/chez.scm (chez-scheme-for-racket): (stex-bootstrap): (chez-web): (chez-sockets): * gnu/packages/cran.scm (r-papaja): (r-prereg): * gnu/packages/docbook.scm (dblatex): * gnu/packages/emacs-xyz.scm (emacs-auctex): * gnu/packages/engineering.scm (fastcap): * gnu/packages/finance.scm (optionmatrix): * gnu/packages/fsf.scm (book-faif): * gnu/packages/gettext.scm (po4a): (po4a-minimal): * gnu/packages/graphics.scm (mmg): * gnu/packages/graphviz.scm (dot2tex): * gnu/packages/guile-xyz.scm (emacsy): (guile-cv): * gnu/packages/lisp.scm (sbcl): * gnu/packages/maths.scm (cddlib): (gnuplot): (itpp): (octave): (suitesparse-amd): (suitesparse-camd): (suitesparse-cholmod): (suitesparse-klu): (suitesparse-ldl): (suitesparse-mongoose): (suitesparse-spex): (suitesparse-spqr): (suitesparse-umfpack): (hypre): * gnu/packages/music.scm (lilypond): * gnu/packages/ocaml.scm (unison): (ocaml-bibtex2html): * gnu/packages/pdf.scm (extractpdfmark): * gnu/packages/photo.scm (enblend-enfuse): * gnu/packages/plotutils.scm (asymptote): * gnu/packages/python-xyz.scm (python-numpy-documentation): (python-ipython-documentation): (python-pypandoc): * gnu/packages/radio.scm (gnuradio): (libosmo-dsp): * gnu/packages/scheme.scm (mit-scheme): * gnu/packages/security-token.scm (yubico-piv-tool): * gnu/packages/sphinx.scm (python-sphinx): (python-sphinx-5): * gnu/packages/statistics.scm (r-with-tests): (r-spams): * gnu/packages/tex.scm (texlive-local-tree): Renamed from… (texlive-updmap.cfg): … this. Deprecate the latter. (texlive-biblatex-philosophy): (texlive-bropd): (texlive-fontsize): (texlive-poetrytex): (texlive-reverxii): (texlive-stix): (texlive-suftesi): (texlive-thucoursework): (texlive-ulqda): (texlive-yathesis): (texlive-makecell): (texlive-robotarm): (texlive-bbold): (texlive-babel-romansh): (texlive-polyglossia): (texlive-innerscript): (teximpatient): (texlive-xkeyval): (texlive-arabxetex): (texlive-blox): (texlive-ecgdraw): (texlive-gradientframe): (texlive-everyhook): (texlive-actuarialangle): (texlive-actuarialsymbol): (texlive-autopdf): (texlive-etaremune): (texlive-extract): (texlive-forarray): (texlive-graphicx-psmin): (texlive-ha-prosper): (texlive-namespc): (texlive-newspaper): (texlive-powerdot): (texlive-recipecard): (texlive-show2e): (texlive-tablists): (texlive-ted): (texlive-xargs): (texlive-xpeek): * gnu/packages/xdisorg.scm (xforms): * gnu/packages/algebra.scm (gap): * gnu/packages/cpp.scm (jthread): * guix/lint.scm (check-inputs-should-be-native): Rename `texlive-updmap.cfg' into `texlive-local-tree'. Change-Id: I129280807c418e57acbcbda399545ab27a9e0a33 --- doc/build.scm | 2 +- doc/contributing.texi | 2 +- gnu/packages/algebra.scm | 8 +- gnu/packages/assembly.scm | 2 +- gnu/packages/audio.scm | 4 +- gnu/packages/bioconductor.scm | 2 +- gnu/packages/bioinformatics.scm | 6 +- gnu/packages/chemistry.scm | 2 +- gnu/packages/chez.scm | 8 +- gnu/packages/cpp.scm | 28 +++--- gnu/packages/cran.scm | 4 +- gnu/packages/docbook.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/engineering.scm | 4 +- gnu/packages/finance.scm | 4 +- gnu/packages/fsf.scm | 2 +- gnu/packages/gettext.scm | 4 +- gnu/packages/graphics.scm | 4 +- gnu/packages/graphviz.scm | 2 +- gnu/packages/guile-xyz.scm | 4 +- gnu/packages/lisp.scm | 2 +- gnu/packages/maths.scm | 30 +++---- gnu/packages/music.scm | 4 +- gnu/packages/ocaml.scm | 4 +- gnu/packages/pdf.scm | 2 +- gnu/packages/photo.scm | 2 +- gnu/packages/plotutils.scm | 2 +- gnu/packages/python-xyz.scm | 10 ++- gnu/packages/radio.scm | 4 +- gnu/packages/scheme.scm | 2 +- gnu/packages/security-token.scm | 2 +- gnu/packages/sphinx.scm | 6 +- gnu/packages/statistics.scm | 4 +- gnu/packages/tex.scm | 186 ++++++++++++++++++++-------------------- gnu/packages/xdisorg.scm | 2 +- guix/lint.scm | 2 +- 36 files changed, 182 insertions(+), 178 deletions(-) diff --git a/doc/build.scm b/doc/build.scm index 4fbaa0fa11..22d8d18ae1 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -912,7 +912,7 @@ makeinfo OPTIONS." sed tar texinfo - (texlive-updmap.cfg + (texlive-local-tree (list texlive-epsf texlive-texinfo))))))) (define build diff --git a/doc/contributing.texi b/doc/contributing.texi index ab4f30d54b..f62939dc44 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1965,7 +1965,7 @@ to other packages unwillingly retained. It may also help determine whether to split the package (@pxref{Packages with Multiple Outputs}), and which optional dependencies should be used. In particular, avoid adding @code{texlive} as a dependency: because of its extreme size, use -@code{texlive-updmap.cfg} procedure instead. +@code{texlive-local-tree} procedure instead. @item Check that dependent packages (if applicable) are not affected by the diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index b8c531e75d..ec78ab3018 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2022, 2023, 2024 Andreas Enge <andr...@enge.fr> ;;; Copyright © 2013, 2015, 2017, 2018, 2021 Ludovic Courtès <l...@gnu.org> -;;; Copyright © 2016-2024 Nicolas Goaziou <m...@nicolasgoaziou.fr> +;;; Copyright © 2016-2025 Nicolas Goaziou <m...@nicolasgoaziou.fr> ;;; Copyright © 2014, 2018 Mark H Weaver <m...@netris.org> ;;; Copyright © 2016, 2018, 2019, 2021, 2023 Ricardo Wurmus <rek...@elephly.net> ;;; Copyright © 2017, 2020-2022 Efraim Flashner <efr...@flashner.co.il> @@ -269,7 +269,7 @@ the real span of the lattice.") (base32 "0qahws0jmmqv3v611zdwhvg0rz5a678lhi8z51x16yzrbj7mfc3x")))) (build-system gnu-build-system) - (native-inputs (list (texlive-updmap.cfg))) + (native-inputs (list (texlive-local-tree))) (inputs (list gmp libx11 perl readline)) (arguments (list @@ -473,7 +473,7 @@ precision.") hevea python-wrapper readline - (texlive-updmap.cfg))) + (texlive-local-tree))) (home-page "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html") (synopsis "Computer algebra system") (description @@ -1351,7 +1351,7 @@ xtensor provides: (for-each delete-file-recursively '("extern" "hpcgap/extern")))))) (build-system gnu-build-system) - (native-inputs (list (texlive-updmap.cfg + (native-inputs (list (texlive-local-tree (list texlive-enumitem texlive-etoolbox texlive-fancyvrb diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 84a7274b3d..97cd59c854 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -110,7 +110,7 @@ "docs")))) #:test-target "test")) (native-inputs - (list (texlive-updmap.cfg (list texlive-german texlive-hyperref)))) + (list (texlive-local-tree (list texlive-german texlive-hyperref)))) (outputs '("out" "doc")) (home-page "http://john.ccac.rwth-aachen.de:8000/as/") (synopsis diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f9daf07521..95ff240a79 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2019 Christine Lemmer-Webber <cweb...@dustycloud.org> ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smie...@interia.pl> ;;; Copyright © 2019 Hartmt Goebel <h.goe...@crazy-compilers.com> -;;; Copyright © 2019, 2021 Nicolas Goaziou <m...@nicolasgoaziou.fr> +;;; Copyright © 2019, 2021, 2025 Nicolas Goaziou <m...@nicolasgoaziou.fr> ;;; Copyright © 2020 Vincent Legoll <vincent.leg...@gmail.com> ;;; Copyright © 2020, 2021 Guillaume Le Vaillant <g...@posteo.net> ;;; Copyright © 2020 Jonathan Frederickson <jonat...@terracrypt.net> @@ -1646,7 +1646,7 @@ generators of mostly elementary and occasionally exotic nature.") lv2)) (native-inputs (list pkg-config - (texlive-updmap.cfg + (texlive-local-tree (list texlive-geometry texlive-xetex texlive-collection-pictures)))) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8f3baef37e..4c6e0939bc 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -23649,7 +23649,7 @@ different graph related packages produced by Bioconductor.") (native-inputs (list ghostscript r-biocgenerics r-knitr r-runit - (texlive-updmap.cfg + (texlive-local-tree (list texlive-bera texlive-booktabs texlive-caption diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 50acf1e73c..1391135542 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7500,7 +7500,7 @@ data and settings.") (inputs (list boost cairo rmath-standalone)) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-doi texlive-etoolbox texlive-examplep @@ -16158,7 +16158,7 @@ programs for inferring phylogenies (evolutionary trees).") (list automake autoconf openmpi - (texlive-updmap.cfg + (texlive-local-tree (list texlive-caption texlive-cite texlive-fancyvrb @@ -21353,7 +21353,7 @@ to an artifact/contaminant file.") (inputs (list openmpi zlib)) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-infwarerr texlive-kvoptions texlive-pdftexcmds)))) diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index d05792c56d..65e39b73fb 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -905,7 +905,7 @@ emphasis on quality rather than speed.") (inputs (list openblas)) (native-inputs (list gfortran - (texlive-updmap.cfg + (texlive-local-tree (list texlive-epstopdf texlive-latexmk)))) (home-page "https://github.com/greglandrum/yaehmop") diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index e31e439304..e6aee9dde5 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -312,7 +312,7 @@ will name the threaded machine type unless THREADS? is provided as #f." (list this-package `(,this-package "doc")) (list stex-bootstrap - (texlive-updmap.cfg + (texlive-local-tree (list texlive-enumitem texlive-etoolbox)))) ,chez-nanopass-bootstrap @@ -728,7 +728,7 @@ package @code{cs-bootstrap} to bootstrap its initial version of Chez Scheme.") ;; though it would probably be easy to add. (propagated-inputs (list xorg-rgb - (texlive-updmap.cfg (list texlive-epsf)) + (texlive-local-tree (list texlive-epsf)) ghostscript netpbm)) ;; Debian uses a versionless path for STEXLIB, @@ -977,7 +977,7 @@ create compilers, making them easier to understand and maintain.") (native-inputs (list chez-scheme ghostscript - (texlive-updmap.cfg + (texlive-local-tree (list texlive-charter texlive-context texlive-cweb @@ -1044,7 +1044,7 @@ programming in Scheme.") (native-inputs (list chez-scheme chez-web - (texlive-updmap.cfg))) + (texlive-local-tree))) (arguments (list #:tests? #f ; no tests diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index f18b0a73f1..ebc7e852a2 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1299,25 +1299,25 @@ intuitive syntax and trivial integration.") #$version ".pdf")))))))) (native-inputs (list perl - (texlive-updmap.cfg - (list texlive-ulem - texlive-rsfs - texlive-memoir - texlive-substr - texlive-xcolor - texlive-isodate + (texlive-local-tree + (list texlive-booktabs texlive-caption - texlive-relsize - texlive-extract - texlive-xpatch - texlive-xkeyval - texlive-jknapltx - texlive-booktabs texlive-enumitem texlive-etoolbox + texlive-extract + texlive-isodate + texlive-jknapltx texlive-listings + texlive-memoir texlive-microtype - texlive-underscore)))) + texlive-relsize + texlive-rsfs + texlive-substr + texlive-ulem + texlive-underscore + texlive-xcolor + texlive-xkeyval + texlive-xpatch)))) (home-page "https://github.com/josuttis/jthread") (synopsis "C++ class for a joining and cooperative interruptible thread") (description diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5810a47422..b7a04c7914 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8693,7 +8693,7 @@ palettes, color maps, and tools to evaluate them.") texlive-was ; upgreek.sty texlive-xcolor texlive-xpatch - (texlive-updmap.cfg (list + (texlive-local-tree (list texlive-amsfonts texlive-times texlive-lm)))) @@ -50726,7 +50726,7 @@ package online.") texlive-tools texlive-ulem texlive-upquote - (texlive-updmap.cfg (list texlive-lm)))) + (texlive-local-tree (list texlive-lm)))) (native-inputs (list r-testthat)) (home-page "https://github.com/crsh/prereg") (synopsis diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index f68bf639cf..1e164f165a 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -709,7 +709,7 @@ the in DocBook SGML DTDs.") (inputs (list bash-minimal texlive-bin - (texlive-updmap.cfg (list texlive-amsmath + (texlive-local-tree (list texlive-amsmath texlive-anysize texlive-appendix texlive-auxhook diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 18a139d997..50a6f4c386 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5227,7 +5227,7 @@ as a library for other Emacs packages.") (invoke "pdftex" "tex-ref") (install-file "tex-ref.pdf" doc-dir)))))))) (native-inputs - (list perl (texlive-updmap.cfg))) + (list perl (texlive-local-tree))) (inputs (list ghostscript)) (home-page "https://www.gnu.org/software/auctex/") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9da5dd34ec..f799782802 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -693,11 +693,11 @@ featuring various improvements and bug fixes."))) "fastcap-mulGlobal.patch")))) (build-system gnu-build-system) (native-inputs - ;; FIXME: with (texlive-updmap.cfg) citation references are rendered as + ;; FIXME: with (texlive-local-tree) citation references are rendered as ;; question marks. During the build warnings like these are printed: ;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line ;; 3. - `(("texlive" ,(texlive-updmap.cfg)) + `(("texlive" ,(texlive-local-tree)) ("ghostscript" ,ghostscript))) (arguments `(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all") diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f9cc39b720..4535c33b0c 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <m...@tobias.gr> ;;; Copyright © 2018 Eric Bavier <bav...@member.fsf.org> ;;; Copyright © 2018 Adriano Peluso <caton...@gmail.com> -;;; Copyright © 2018-2022, 2024 Nicolas Goaziou <m...@nicolasgoaziou.fr> +;;; Copyright © 2018-2022, 2024, 2025 Nicolas Goaziou <m...@nicolasgoaziou.fr> ;;; Copyright © 2018 Arun Isaac <arunis...@systemreboot.net> ;;; Copyright © 2019-2025 Guillaume Le Vaillant <g...@posteo.net> ;;; Copyright © 2019 Tanguy Le Carrour <tan...@bioneland.org> @@ -2214,7 +2214,7 @@ trading, and risk management in real-life.") (list gsl gtk+ ncurses)) (native-inputs (list pkg-config texinfo - (texlive-updmap.cfg (list texlive-epsf texlive-texinfo)))) + (texlive-local-tree (list texlive-epsf texlive-texinfo)))) (home-page "https://anthonybradford.github.io/optionmatrix/") (synopsis "Financial derivative calculator") (description diff --git a/gnu/packages/fsf.scm b/gnu/packages/fsf.scm index b38fa9ef34..b8817d363e 100644 --- a/gnu/packages/fsf.scm +++ b/gnu/packages/fsf.scm @@ -37,7 +37,7 @@ "0qf14d0n6k1dn9z0fdnx9qkhn4iq685xd443w7l7w54bm931p7dw")))) (build-system copy-build-system) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-caption texlive-endnotes texlive-etoolbox diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 7862c296bd..7064809f62 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -305,7 +305,7 @@ from Markdown files.") docbook-sgml-4.1 docbook-xml-4.5 perl-test-pod - (texlive-updmap.cfg))) + (texlive-local-tree))) (inputs (list bash-minimal opensp @@ -332,7 +332,7 @@ areas where they were not expected like documentation.") ;; Remove test dependencies, primarily to reduce the size of the ;; dependency graph of the ‘guix’ package. (modify-inputs (package-native-inputs po4a) - (delete "docbook-xml" "perl-test-pod" "texlive-updmap.cfg"))) + (delete "docbook-xml" "perl-test-pod" "texlive-local-tree"))) (arguments (substitute-keyword-arguments (package-arguments po4a) ((#:tests? _ #t) #f))) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index c3f02fac6f..66ad5fdb81 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2019, 2020 Marius Bakke <mba...@fastmail.com> ;;; Copyright © 2019 Tanguy Le Carrour <tan...@bioneland.org> ;;; Copyright © 2020 Jakub Kądziołka <k...@kadziolka.net> -;;; Copyright © 2020, 2021 Nicolas Goaziou <m...@nicolasgoaziou.fr> +;;; Copyright © 2020, 2021, 2025 Nicolas Goaziou <m...@nicolasgoaziou.fr> ;;; Copyright © 2020 Raghav Gururajan <raghavgurura...@disroot.org> ;;; Copyright © 2020-2024 Maxim Cournoyer <maxim.courno...@gmail.com> ;;; Copyright © 2020 Gabriel Arazas <foo.dogsqua...@gmail.com> @@ -2933,7 +2933,7 @@ generated discrete signed distance field using the cubic spline kernel. (list doxygen graphviz ;; TODO: Fix failing LaTeX invocation (which results in equations ;; being inserted literally into PNGs rather than being typeset). - ;; (texlive-updmap.cfg) + ;; (texlive-local-tree) perl)) ;used to generate Fortran headers (inputs diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index cb6d7d82fe..896ce82cb3 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -447,7 +447,7 @@ graphs in Graphviz's DOT language, written in pure Python.") "-k" "not test_semicolon"))))))) (native-inputs (list python-pytest - (texlive-updmap.cfg + (texlive-local-tree (list texlive-pgf texlive-preview texlive-pstricks diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 5dd45f89bf..554d8881e4 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4734,7 +4734,7 @@ code terse and reduce the need for ad hoc lambdas.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo) - ("texlive" ,(texlive-updmap.cfg (list texlive-epsf))))) + ("texlive" ,(texlive-local-tree (list texlive-epsf))))) (inputs (list bash-minimal dbus-glib @@ -5107,7 +5107,7 @@ feature-set, fully programmable in Guile Scheme.") (inputs (list vigra vigra-c guile-3.0)) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-booktabs texlive-iwona texlive-lm diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 875e1a27f6..08eabb77a3 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1435,7 +1435,7 @@ be built as a stand-alone REPL interpreter.") ed inetutils ;for hostname(1) texinfo - (texlive-updmap.cfg (list texlive-texinfo)) + (texlive-local-tree (list texlive-texinfo)) which)) (inputs (list bash-minimal diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index eb23a375b4..eb43944cb2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2018 Eric Brown <br...@fastmail.com> ;;; Copyright © 2018, 2021, 2024 Julien Lepiller <jul...@lepiller.eu> ;;; Copyright © 2018 Amin Bandali <band...@gnu.org> -;;; Copyright © 2019, 2021-2024 Nicolas Goaziou <m...@nicolasgoaziou.fr> +;;; Copyright © 2019, 2021-2025 Nicolas Goaziou <m...@nicolasgoaziou.fr> ;;; Copyright © 2019 Steve Sprang <s...@stevesprang.com> ;;; Copyright © 2019 Robert Smith <robertsm...@posteo.net> ;;; Copyright © 2020 Jakub Kądziołka <k...@kadziolka.net> @@ -1000,7 +1000,7 @@ digits of precision.") (list autoconf automake libtool - (texlive-updmap.cfg + (texlive-local-tree (list texlive-amsfonts texlive-graphics texlive-l3backend @@ -1463,7 +1463,7 @@ giza instead of PGPLOT for the implementation, though.") (base32 "16ipf7m2c2v1cldp3kwxbjj6db6bzy0rkrpp4kzhh61a3866cnp8")))) (build-system gnu-build-system) (native-inputs - (list pkg-config (texlive-updmap.cfg))) + (list pkg-config (texlive-local-tree))) (inputs (list cairo gd libcerf lua pango readline)) (arguments @@ -2329,7 +2329,7 @@ the resulting text.") (inputs (list fftw lapack openblas)) ;; FIXME: Even though the fonts are available dvips complains: ;; "Font cmmi10 not found; characters will be left blank." - (native-inputs (list (texlive-updmap.cfg) ghostscript doxygen)) + (native-inputs (list (texlive-local-tree) ghostscript doxygen)) (home-page "https://itpp.sourceforge.net") (synopsis "C++ library of maths, signal processing and communication classes") (description "IT++ is a C++ library of mathematical, signal processing and @@ -3386,7 +3386,7 @@ script files.") ,@(package-inputs octave-cli))) (native-inputs `(("qttools-5" , qttools-5) ;for lrelease - ("texlive" ,(texlive-updmap.cfg (list texlive-epsf))) ; for texi2dvi + ("texlive" ,(texlive-local-tree (list texlive-epsf))) ; for texi2dvi ,@(package-native-inputs octave-cli))) (arguments (substitute-keyword-arguments (package-arguments octave-cli) @@ -6301,7 +6301,7 @@ package contains a library with common configuration options.") (string-append #$output "/share/doc/" #$name "-" #$version))))))) (propagated-inputs (list suitesparse-config)) - (native-inputs (list gfortran (texlive-updmap.cfg '()))) + (native-inputs (list gfortran (texlive-local-tree '()))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Sparse matrix ordering for Cholesky factorization") (description "AMD is a set of routines for ordering a sparse matrix prior @@ -6377,7 +6377,7 @@ matrix into block upper triangular form.") (string-append #$output "/share/doc/" #$name "-" #$version))))))) (propagated-inputs (list suitesparse-config)) - (native-inputs (list (texlive-updmap.cfg '()))) + (native-inputs (list (texlive-local-tree '()))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Sparse matrix ordering for Cholesky factorization with constraints") (description "CAMD is a set of routines for ordering a sparse matrix prior @@ -6578,7 +6578,7 @@ target_link_libraries(CHOLMOD_static PRIVATE ${METIS_LIBRARY} ${GKLIB_LIBRARY})" suitesparse-ccolamd suitesparse-colamd)) (propagated-inputs (list suitesparse-config)) - (native-inputs (list (texlive-updmap.cfg '()))) + (native-inputs (list (texlive-local-tree '()))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Library for solving sparse symmetric positive definite linear equations") @@ -6678,7 +6678,7 @@ direct methods on both real and complex matrices.") (list suitesparse-amd suitesparse-btf suitesparse-cholmod)) - (native-inputs (list (texlive-updmap.cfg '()))) + (native-inputs (list (texlive-local-tree '()))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Routines for solving sparse linear problems with a LU factorization") (description "KLU is a method for computing the LU factorization of sparse @@ -6730,7 +6730,7 @@ for real and complex matrices.") #$name "-" #$version))))))) (inputs (list suitesparse-amd)) (propagated-inputs (list suitesparse-config)) - (native-inputs (list (texlive-updmap.cfg '()))) + (native-inputs (list (texlive-local-tree '()))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "LDL' factorization method for sparse, symmetric matrices") (description "This package contains a set of routines for computing the @@ -6821,7 +6821,7 @@ for reading and writing sparse matrices in the Rutherford/Boeing format.") (propagated-inputs (list suitesparse-config)) (native-inputs (list texlive-epstopdf - (texlive-updmap.cfg + (texlive-local-tree (list texlive-algorithmicx texlive-booktabs texlive-lastpage @@ -6890,7 +6890,7 @@ edge cuts using a coarsening and refinement framework.") (inputs (list suitesparse-amd suitesparse-colamd)) (propagated-inputs (list gmp mpfr suitesparse-config)) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-paralist texlive-comment texlive-psfrag @@ -6969,7 +6969,7 @@ LU factorization for solving unsymmetric sparse linear systems.") suitesparse-config)) (propagated-inputs (list suitesparse-cholmod)) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-epsf)))) (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") (synopsis "Sparse QR factorization method") @@ -7035,7 +7035,7 @@ matrices.") (list suitesparse-amd suitesparse-config)) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-framed texlive-mdframed @@ -7733,7 +7733,7 @@ set.") python-breathe python-sphinx python-sphinx-rtd-theme - (texlive-updmap.cfg + (texlive-local-tree (list texlive-adjustbox texlive-alphalph texlive-capt-of diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 14f8aea3e5..201c53b8f1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016 Alex Griffin <a...@ajgrf.com> ;;; Copyright © 2017 nikita <nik...@n0.is> ;;; Copyright © 2017 Rodger Fox <thylak...@openmailbox.org> -;;; Copyright © 2017–2024 Nicolas Goaziou <m...@nicolasgoaziou.fr> +;;; Copyright © 2017–2025 Nicolas Goaziou <m...@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018, 2019, 2021 Pierre Langlois <pierre.langl...@gmx.com> ;;; Copyright © 2017 Arun Isaac <arunis...@systemreboot.net> ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <m...@tobias.gr> @@ -1718,7 +1718,7 @@ and auto-mapping slices to MIDI note numbers.") rsync texinfo texi2html-1.82 - (texlive-updmap.cfg + (texlive-local-tree (list texlive-cyrillic texlive-epsf texlive-fontinst diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a5632c6ad1..5e4c08667a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1453,7 +1453,7 @@ software engineering.") "1fy4c1wb6xn9gxdabs25yajbzik3amifyr7nzd4d9vn6r3gll9sw")))) (build-system dune-build-system) (propagated-inputs (list lablgtk3 zlib)) - (native-inputs (list ghostscript (texlive-updmap.cfg '()) hevea lynx which)) + (native-inputs (list ghostscript (texlive-local-tree '()) hevea lynx which)) (arguments `(#:phases (modify-phases %standard-phases @@ -9462,7 +9462,7 @@ SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.") ;; mktexfmt needs writable home directory. (setenv "HOME" (getcwd))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-infwarerr texlive-kvoptions texlive-pdftexcmds diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 20abcf82b5..a1c9da2c8a 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -215,7 +215,7 @@ comparison modes: words, characters, and appearance.") gettext-minimal ghostscript pkg-config - (texlive-updmap.cfg))) + (texlive-local-tree))) (inputs (list poppler)) (home-page "https://github.com/trueroad/extractpdfmark") diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index c71d498a5a..f8491e99dd 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -406,7 +406,7 @@ overlapping images, as well as some command line tools.") m4 perl-readonly texlive-texloganalyser - (texlive-updmap.cfg + (texlive-local-tree (list texlive-bold-extra texlive-cm-mf-extra-bold texlive-comment diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 50c7918f00..44749402e6 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -97,7 +97,7 @@ pkg-config rapidjson texinfo ;for generating documentation - (texlive-updmap.cfg + (texlive-local-tree (list texlive-epsf texlive-etoolbox texlive-hypdoc diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8fd996036c..c877bafd5d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10174,7 +10174,7 @@ include_dirs = ~:*~a/include~%" #$(this-package-input "openblas")))))) python-sphinx-design python-sphinx-panels texinfo - (texlive-updmap.cfg + (texlive-local-tree (list texlive-cbfonts texlive-cm-super texlive-expdlist @@ -14692,7 +14692,7 @@ computing.") python-sphinx python-sphinx-rtd-theme texinfo - (texlive-updmap.cfg + (texlive-local-tree (list texlive-latexmk texlive-polyglossia texlive-xetex @@ -34793,8 +34793,10 @@ By default it uses the open Python vulnerability database Safety DB.") ;; Ideally, we would supersede texlive-xpatch with texlive-regexpatch once ;; the missing etoolbox.sty file is added (native-inputs - (list (texlive-updmap.cfg - (list texlive-xpatch texlive-lm + (list (texlive-local-tree + (list texlive-etoolbox + texlive-lm + texlive-regexpatch texlive-xcolor)) python-pip python-poetry-core diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 54b1f0c373..a358c9bbf3 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -920,7 +920,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") python-pyzmq python-scipy python-sphinx - (texlive-updmap.cfg (list texlive-newunicodechar)) + (texlive-local-tree (list texlive-newunicodechar)) xorg-server-for-tests)) (inputs (list alsa-lib @@ -1134,7 +1134,7 @@ to access different radio hardware.") ("doxygen" ,doxygen) ("libtool" ,libtool) ("pkg-config" ,pkg-config) - ("texlive" ,(texlive-updmap.cfg (list texlive-newunicodechar))))) + ("texlive" ,(texlive-local-tree (list texlive-newunicodechar))))) (inputs (list fftwf)) (arguments diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 811f74e6d6..9248df4327 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -202,7 +202,7 @@ ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) - ("texlive" ,(texlive-updmap.cfg + ("texlive" ,(texlive-local-tree (list texlive-epsf texlive-texinfo))) ("texinfo" ,texinfo) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index e4ebea09e5..1d4a0360e7 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -441,7 +441,7 @@ is the de-facto standard to access cryptographic devices") graphviz help2man pkg-config - (texlive-updmap.cfg))) + (texlive-local-tree))) (home-page "https://developers.yubico.com/yubico-piv-tool/") (synopsis "Interact with the PIV application on a YubiKey") (description diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 4b3e598e38..6d789a3099 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017 Christine Lemmer-Webber <cweb...@dustycloud.org> ;;; Copyright © 2017 Julien Lepiller <jul...@lepiller.eu> ;;; Copyright © 2019, 2021, 2022 Efraim Flashner <efr...@flashner.co.il> -;;; Copyright © 2019, 2021, 2023 Nicolas Goaziou <m...@nicolasgoaziou.fr> +;;; Copyright © 2019, 2021, 2023, 2025 Nicolas Goaziou <m...@nicolasgoaziou.fr> ;;; Copyright © 2019 Alexandros Theodotou <a...@zrythm.org> ;;; Copyright © 2019 Brett Gilio <bre...@gnu.org> ;;; Copyright © 2020 Giacomo Leidi <goodoldp...@autistici.org> @@ -156,7 +156,7 @@ python-cython python-flit-core python-pytest - (texlive-updmap.cfg + (texlive-local-tree (list texlive-cm-super texlive-tex-gyre)))) (home-page "https://www.sphinx-doc.org") (synopsis "Python documentation generator") @@ -267,7 +267,7 @@ sources.") python-cython python-flit-core python-pytest - (texlive-updmap.cfg + (texlive-local-tree (list texlive-cm-super texlive-tex-gyre)))))) (define-public python-sphinxcontrib-apidoc diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 988f5e6bdd..3f6e6aacff 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -414,7 +414,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ perl pkg-config texinfo ; for building HTML manuals - (texlive-updmap.cfg + (texlive-local-tree (list texlive-etoolbox texlive-fancyvrb texlive-inconsolata @@ -2068,7 +2068,7 @@ character vector.") (list hevea perl swig - (texlive-updmap.cfg + (texlive-local-tree (list texlive-aeguill texlive-jknapltx)))) (propagated-inputs (list r-lattice diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1a37c6c188..5aaac35e53 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -179,13 +179,13 @@ ;;; (#:texlive-latex-bin? #f) ;;; ;;; -;;; Default font map files are updated in a profile hook (see -;;; `texlive-font-maps' in "profiles.scm"). However, this option is not -;;; available when building documentation for a package. Consequently, this -;;; module also provides TEXLIVE-UPDMAP.CFG function, which creates a TeX Live -;;; tree with font map files updates. It should be used exclusively for -;;; package definitions, as a native input. It is possible to augment that -;;; tree, in particular with additional font packages. +;;; Default font map files and ls-R database are updated in a profile hook +;;; (see `texlive-font-maps' in "profiles.scm"). However, this doesn't happen +;;; when building documentation for a package. Consequently, this module also +;;; provides TEXLIVE-LOCAL-TREE function, which creates a TeX Live tree with +;;; font map files updates and a dedicated database. It should be used +;;; exclusively for package definitions, as a native input. It is possible to +;;; augment that tree with additional TeX Live packages. ;;; ;;; ;;; Notes about updating TeX Live distribution: @@ -905,7 +905,7 @@ Live collection or scheme package to their profile instead of this package.") (license (license:fsf-free "https://www.tug.org/texlive/copying.html")) (home-page "https://www.tug.org/texlive/"))) -;; This package must be located before `texlive-updmap.cfg' in the module. +;; This package must be located before `texlive-local-tree' in the module. (define-public texlive-scheme-basic (package (name "texlive-scheme-basic") @@ -1281,9 +1281,9 @@ teTeX distribution that was maintained by Thomas Esser.") ;; This package must be located before any package adding it to its native ;; inputs. -(define-public texlive-updmap.cfg +(define-public texlive-local-tree (lambda* (#:optional (packages '())) - "Return a 'texlive-updmap.cfg' package which contains the fonts map and + "Return a 'texlive-local-tree' package which contains the fonts map and mktex scripts configuration, along with a base set of packages plus additional PACKAGES. @@ -1293,7 +1293,7 @@ documentation in the TeX format." (package (version (package-version texlive-source)) (source (package-source texlive-scripts)) - (name "texlive-updmap.cfg") + (name "texlive-local-tree") (build-system copy-build-system) (arguments (list @@ -1403,6 +1403,8 @@ as a package native input, in order to build TeX documentation.") '() (append default-packages packages)))))))) +(define-deprecated/alias texlive-updmap.cfg texlive-local-tree) + (define-public texlive-12many (package (name "texlive-12many") @@ -7491,11 +7493,11 @@ manuscripts, audiovisual resources, social media and legal references.") (base32 "05fapyb6wwyv4mwjhgg3gasvqkwpwd6jxv095hird9011n6drrzm")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-biblatex texlive-cochineal texlive-csquotes @@ -9117,10 +9119,10 @@ LaTeX 2.09. Neither @code{cite} nor @code{natbib} make this mistake.") (base32 "1cyyadfvrcym4vvxl9p9zb88692m0578nqljip12xxahb4srcyb9")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) - (native-inputs (list (texlive-updmap.cfg + (native-inputs (list (texlive-local-tree (list texlive-etoolbox texlive-hypdoc)))) (home-page "https://ctan.org/pkg/bropd") @@ -17275,7 +17277,7 @@ seen as an extension to FontAwesome.") (base32 "1y061r4hadb2c26dgch6lrjw6f4j87zj1gj5lgzgx0hyyz58snqy")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex" @@ -17291,7 +17293,7 @@ seen as an extension to FontAwesome.") (("\\[style=philosophy-classic\\]") "") (("\\\\DocInput\\{fontsize\\.dtx\\}") ""))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-biblatex texlive-booktabs texlive-caption @@ -31360,7 +31362,7 @@ poems, an index of first lines, and some structural commands.") (base32 "1y78zd1hd3z1901x6mc6q0mw4rgj3qcqhnjn34zix11r0gn4b2jr")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex" @@ -31375,7 +31377,7 @@ poems, an index of first lines, and some structural commands.") (("\\\\newcommand\\*\\\\code\\[1\\].*") "") (("\\\\code\\{") "\\texttt{"))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-fancyvrb texlive-framed @@ -32687,10 +32689,10 @@ both in English and Chinese with more ease and flexibility.") (base32 "1gg8qbc8ll3n6rfp3pjshbbjd30s4n3yk219y6qcmz1nv66fp1qq")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) - (native-inputs (list (texlive-updmap.cfg))) + (native-inputs (list (texlive-local-tree))) (home-page "https://ctan.org/pkg/reverxii") (synopsis "Playing Reversi in TeX") (description @@ -35406,14 +35408,14 @@ provides a matching math package using STIX2 letters (Roman and Greek) with (base32 "1ixxglx4azdnppiqhlkgyahj9a67zamljzv98n6hycp7y6jbd1x0")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex" ;; FIXME: I cannot build this package from source. #:phases #~(modify-phases %standard-phases (delete 'build)))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-accents texlive-caption texlive-enumitem @@ -35690,7 +35692,7 @@ The bundle comes with a set of ready-prepared puzzle files.") (base32 "07p2fv265g78zbfrq4j33ryz1z1b13g2rvln646w2g5md1zwm2hb")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "lualatex" @@ -35701,7 +35703,7 @@ The bundle comes with a set of ready-prepared puzzle files.") (("\\\\usepackage\\[T1\\]\\{fontenc\\}") "\\usepackage[LGR, T1]{fontenc}"))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-babel-greek texlive-biblatex texlive-biblatex-philosophy @@ -37065,7 +37067,7 @@ of Applied Sciences}. These Logos are available in English and in Dutch.") (base32 "1cv2kadwzwwrw3q98wy7cjjl3084qqp55ki50v7m2ylrjxinwkv4")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list @@ -37078,7 +37080,7 @@ of Applied Sciences}. These Logos are available in English and in Dutch.") (substitute* "source/latex/thucoursework/thucoursework.dtx" (("\\\\DocInput\\{\\\\jobname\\.dtx\\}") ""))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-booktabs texlive-carlisle texlive-ctex @@ -38291,13 +38293,13 @@ The font Palatine Parliamentary is required to use this package.") (base32 "07jzmk0p4l28dxxqqpma4px9riykg0zynnjycyripg2m76a9ah2g")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:link-scripts #~(list "ulqda.pl") #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-dot2texi texlive-etoolbox texlive-hypdoc @@ -40372,13 +40374,13 @@ provides three output modes: LaTeX, PostScript and PDF.") (base32 "0aa9875am0gxy7fxf3z9xdxva8x9anlx8k82c1hz95s3m119fccs")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:build-targets #~(list "yathesis.dtx") #:tex-format "lualatex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-accsupp texlive-alphalph texlive-attachfile2 @@ -48776,7 +48778,7 @@ conversion tools.") (base32 "1n122230s49jizldn8ps1pfa5dsg8wmh5x8wla4y6rsgjcccqn4s")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list @@ -48804,7 +48806,7 @@ conversion tools.") (substitute* "source/latex/makecell/makecell.dtx" (("\\\\ttabbox\\[\\\\hsize\\]") "\\ttabbox[10cm]"))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-diagbox texlive-etoolbox texlive-float @@ -53034,7 +53036,7 @@ steps can be customized in various ways.") (base32 "1lhvbwq979whvjwx9gyfhsxz20x6imhh57xm843zk6068lv0b3wj")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list @@ -53052,7 +53054,7 @@ steps can be customized in various ways.") \\generate{\\file{robotarm.sty}{\\from{robotarm.dtx}{robotarm-package}}} \\endbatchfile")))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-hypdoc texlive-tools)))) (home-page "https://ctan.org/pkg/robotarm") @@ -61232,7 +61234,7 @@ the fonts within maths.") (base32 "0x3fhz582xcv33s9yiwka82j8bz3nxribgmni3j8j03r6dih8d8r")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:build-targets #~(list "bbold.dtx") @@ -61247,7 +61249,7 @@ the fonts within maths.") (("\\\\DocInput\\{bbold\\.dtx\\}") ""))))))) (native-inputs (list texlive-metafont - (texlive-updmap.cfg + (texlive-local-tree (list texlive-etoolbox texlive-hypdoc)))) (home-page "https://ctan.org/pkg/bbold") (synopsis "Sans serif blackboard bold") @@ -62520,10 +62522,10 @@ provided.") (base32 "08lc76yglblidg24s5ap9j0xmzbxgsfwcf9f6g1m4bwbqwkh089x")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) - (native-inputs (list (texlive-updmap.cfg + (native-inputs (list (texlive-local-tree (list texlive-etoolbox texlive-hypdoc)))) (home-page "https://ctan.org/pkg/babel-romansh") @@ -67427,7 +67429,7 @@ with traditional TeX as well as with Unicode aware variants.") (base32 "1r5l5c586zzvkyz8irj47pb86m4hkarc7617hvz8gsx1qqnf4463")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list @@ -67458,7 +67460,7 @@ with traditional TeX as well as with Unicode aware variants.") font-linuxlibertine font-sil-ezra fontconfig - (texlive-updmap.cfg + (texlive-local-tree (list texlive-amiri texlive-babel texlive-bidi @@ -68846,11 +68848,11 @@ TeX, and LaTeX font definition and other relevant files.") (base32 "13kw7xkc3bpa494mzfphl2v3yn6y08013qnrp3h9awq4blgi2y8b")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "lualatex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-booktabs texlive-etoolbox texlive-hypdoc @@ -71492,7 +71494,7 @@ dynamic bibliography sets and many other features.") (string-append "--prefix=" #$output) "--root=/")))))) (native-inputs - (list texinfo (texlive-updmap.cfg (list texlive-texinfo)))) + (list texinfo (texlive-local-tree (list texlive-texinfo)))) (inputs (list python-wrapper)) (home-page "https://gitlab.com/latex-rubber/rubber/") (synopsis "Wrapper for LaTeX and friends") @@ -71660,7 +71662,7 @@ and PostScript specials. A working TeX installation is needed.") (native-inputs (list autoconf automake - (texlive-updmap.cfg + (texlive-local-tree (list texlive-mflogo-font texlive-palatino texlive-zapfding)))) @@ -77191,7 +77193,7 @@ produced using PSTricks.") (base32 "0nclsazny3hnzsi2vcixh2g1gsj5lvwxls1v569rms8ykgd9v7z8")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list @@ -77208,7 +77210,7 @@ produced using PSTricks.") (("usepackage\\{xcolor\\}") "usepackage[dvips]{xcolor}"))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-footmisc texlive-fourier @@ -78449,7 +78451,7 @@ the @code{psnfss} distribution.") (base32 "097lh7ksw9rg93f1c7a4fqglgfpydf1qp3sbgy9xfgszcdpknmrk")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list @@ -78469,7 +78471,7 @@ the @code{psnfss} distribution.") (native-inputs (list font-gnu-freefont fontconfig - (texlive-updmap.cfg + (texlive-local-tree (list texlive-amsmath texlive-amsfonts texlive-bidi @@ -84456,11 +84458,11 @@ diagrams (specially in power electronics).") (base32 "0xkv6rvkbchkwgfam5kiymng0xnc4vja5xb3b5d89rngdr041xwk")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-fancyvrb texlive-hypdoc @@ -85276,11 +85278,11 @@ LaTeX documents, using the TikZ package.") (base32 "16kbmf9fckms0vhi41h2p6k8znv6plzwn4f2j374zmpqphq1m3il")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-hypdoc texlive-layaureo @@ -85784,11 +85786,11 @@ files.") (base32 "0qy3ri6fdgzdslaaa7gakswvpc299xyarm8ng4cs8w64q14675r1")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-charter texlive-emp texlive-etoolbox @@ -87101,7 +87103,7 @@ in terms of the collating order of the text being processed.") (format #f "our $clisp = ~s;~%" (search-input-file inputs "/bin/clisp"))))))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-cbfonts-fd texlive-cyrillic texlive-etoolbox @@ -89693,11 +89695,11 @@ letters in their names may be defined.") (base32 "0rcw2d5ncq8avk33nxika34q3da1v4kcmr6jqdxdg49bq4h8ljs7")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-bera texlive-enumitem texlive-etoolbox @@ -90912,11 +90914,11 @@ terms and acronyms with their expanded form.") (base32 "0j8z47n0aawhvz2s4i0pwfp7yq1vqsxbd2sjx7f955n6k2f54hhw")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-enumitem texlive-etoolbox texlive-framed @@ -90957,7 +90959,7 @@ joint status in symbols of life contingencies.") (base32 "1rnipnm3crv9qmcf7icymizkp4bkkaa1p50qfni04aq89csqnkwq")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list @@ -90976,7 +90978,7 @@ joint status in symbols of life contingencies.") (getcwd) "/doc/latex/actuarialsymbol/mosaic.jpg" "}")))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-actuarialangle texlive-booktabs texlive-enumitem @@ -91996,11 +91998,11 @@ equations that are referenced. This operation is similar to the (base32 "0sdlazmx6g530ava1ip8mafbd2p57i7mf8sdlg3y1m4bvq244v4m")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "pdflatex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-catchfile texlive-cm-super texlive-etoolbox @@ -101333,11 +101335,11 @@ Metafont source and LaTeX macro support.") (base32 "12ljghlhh7li8pgpaa39gnsvvn4l4bmww74zik4q3qmirkhvi949")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-filecontents texlive-footmisc @@ -102046,7 +102048,7 @@ LaTeX, to generate a nice solution book.") (base32 "1w2nsgfyhjzg0gwr3rzhq13jh7lj63lh36qjv16hayd2kxrcpb62")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex" @@ -102056,7 +102058,7 @@ LaTeX, to generate a nice solution book.") ;; only be declared at top-level!". Skip build. (delete 'build)))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-float texlive-fourier @@ -103592,7 +103594,7 @@ rather than being numbered sequentially through the document.") (base32 "1xbl5lzyd264avy3dkqz7yq8imk6pziaalhi7smh9d4jra6412a3")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list @@ -103601,7 +103603,7 @@ rather than being numbered sequentially through the document.") ;; FIXME: I couldn't find how to build this package without error. (delete 'build)))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-breakurl texlive-caption texlive-examplep @@ -105304,11 +105306,11 @@ supported.") (base32 "1vppjv24cwnizg96pyhj68g2wx8dd4193c6bm2k4visqwpnwh95p")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-footmisc texlive-fourier @@ -105647,11 +105649,11 @@ environments.") (base32 "0xszyc03vf7h160gxqfd8yfs4aya7s17av4ylf9nc6abbvwipapk")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-eepic texlive-etoolbox texlive-hypdoc @@ -112255,11 +112257,11 @@ minimize writing and production time and cost.") (base32 "1k4j0rjfl0cy0in272k3dyiqzq5nc31zhygqckfvaw328mkkagz9")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-hypdoc texlive-ntgclass)))) (home-page "https://ctan.org/pkg/namespc") (synopsis "Rudimentary C++-like namespaces in LaTeX") @@ -112436,7 +112438,7 @@ all sizing is set automatically.") (base32 "1naa0w3bvnj709msfq9kk6yb7b5qf1sahisjr7z8bfs1q17ml8xc")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list @@ -112453,7 +112455,7 @@ all sizing is set automatically.") (getcwd) "/doc/latex/newspaper/Figure" n ".pdf" "}")))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-hypdoc texlive-pdflscape)))) (home-page "https://ctan.org/pkg/newspaper") (synopsis "Typeset newsletters to resemble newspapers") @@ -115704,7 +115706,7 @@ including back links.") (base32 "1b5fmrzaif2d7rwbwlpd9xdykpw1r5p5cpjqiw3gs1f3241p43f4")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (home-page "https://ctan.org/pkg/powerdot") (arguments @@ -115718,7 +115720,7 @@ including back links.") (substitute* "source/latex/powerdot/powerdot.dtx" (("\\\\DocInput\\{powerdot\\.dtx\\}") ""))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-enumitem texlive-etoolbox texlive-fourier @@ -116926,10 +116928,10 @@ binder cover sheets.") (base32 "0794jd9d28rjvwk6bx93al2dcavjrb341yjmivhmq74d504wahpf")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) - (native-inputs (list (texlive-updmap.cfg + (native-inputs (list (texlive-local-tree (list texlive-etoolbox texlive-hypdoc)))) (home-page "https://ctan.org/pkg/recipecard") (synopsis "Typeset recipes in note-card-sized boxes") @@ -119081,11 +119083,11 @@ document.") (base32 "1j1cb5qy25qni8wq1kaf6p6c0whzrbymhm00g4jjajaizagm4ki2")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-babel texlive-etoolbox texlive-hypdoc @@ -121090,11 +121092,11 @@ to provide several tables.") (base32 "1bwwqzdfsqnm338qwnc0lnyskk58k6s4lr0v2gfizskamzygmi1b")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-fontinst texlive-helvetic @@ -121563,11 +121565,11 @@ from a template document.)") (base32 "0vkp71bpmhs3ys29cx4sxcvqqx63pqym6n87j3sr5hy7rw20ya0x")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-hypdoc texlive-lm @@ -124528,11 +124530,11 @@ formats.") (base32 "1gbdnc1k819fncvnhzihx9q6qdxsrkpfjy47dh70bdwqf5klhqbh")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex")) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-etoolbox texlive-hypdoc texlive-lm @@ -125051,7 +125053,7 @@ only if it is necessary.") (base32 "01khzfgkvsfs8vs64wym07k5hnaa0rmcgpgajp1q06g5f9shcsjc")))) (outputs '("out" "doc")) - (properties '((updater-extra-native-inputs "texlive-updmap.cfg"))) + (properties '((updater-extra-native-inputs "texlive-local-tree"))) (build-system texlive-build-system) (arguments (list #:tex-format "latex" @@ -125064,7 +125066,7 @@ only if it is necessary.") (substitute* "source/latex/xpeek/xpeek.dtx" (("\\\\DocInput\\{\\\\jobname\\.dtx\\}") ""))))))) (native-inputs - (list (texlive-updmap.cfg + (list (texlive-local-tree (list texlive-alphalph texlive-booktabs texlive-csquotes diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d392949f9b..d8c6be80fe 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -4177,7 +4177,7 @@ the following features: libtool texinfo texi2html - (texlive-updmap.cfg (list texlive-epsf + (texlive-local-tree (list texlive-epsf texlive-texinfo)) imagemagick)) (propagated-inputs (list libx11 libxpm libjpeg-turbo)) diff --git a/guix/lint.scm b/guix/lint.scm index 0e93c53661..d4d08f7af4 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -603,7 +603,7 @@ of a package, and INPUT-NAMES, a list of package specifications such as "qmake" "qttools-5" "texinfo" - "texlive-updmap.cfg" + "texlive-local-tree" "xorg-server-for-tests" "yelp-tools"))) (map (lambda (input)