From 3522e1970ab83479a70f7e52a8f832ea35844366 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 12 May 2023 23:55:44 +0200 Subject: gnu: texlive-dvips-l3backend -> texlive-l3backend. * gnu/packages/tex.scm (texlive-dvips-l3backend): Deprecate package. * gnu/packages/chez.scm (stex-bootstrap): * gnu/packages/maths.scm (cddlib): * gnu/packages/ocaml.scm (unison): * gnu/packages/plotutils.scm (asymptote): Use new name. --- gnu/packages/plotutils.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 46e86158b6e..57517c5bd29 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -308,18 +308,18 @@ colors, styles, options and details.") texinfo ;for generating documentation (texlive-updmap.cfg (list texlive-amsfonts - texlive-dvips-l3backend texlive-epsf texlive-etoolbox texlive-fonts-ec - texlive-infwarerr - texlive-kvdefinekeys - texlive-grfext - texlive-hyperref - texlive-latex-base texlive-latex-geometry texlive-graphics + texlive-grfext + texlive-hyperref + texlive-infwarerr + texlive-kvdefinekeys texlive-kvoptions + texlive-l3backend + texlive-latex-base texlive-latex-media9 texlive-oberdiek ;for ifluatex texlive-latex-ocgx2 -- cgit v1.3 From 9e4adea8adca392beaac705c10111639b8c51951 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 13 May 2023 11:54:41 +0200 Subject: gnu: texlive-latex-geometry -> texlive-geometry. * gnu/packages/tex.scm (texlive-geometry): New variable. (texlive-latex-geometry): Deprecate variable. (texlive-xindy): * gnu/packages/chemistry.scm (yaehmop): * gnu/packages/cran.scm (r-prereg): * gnu/packages/graphviz.scm (dot2tex): * gnu/packages/maths.scm (hypre): * gnu/packages/plotutils.scm (asymptote): * gnu/packages/python-xyz.scm (python-nbconvert): * gnu/packages/sphinx.scm (python-sphinx): Use new name. --- gnu/packages/chemistry.scm | 7 ++++--- gnu/packages/cran.scm | 2 +- gnu/packages/graphviz.scm | 2 +- gnu/packages/maths.scm | 2 +- gnu/packages/plotutils.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/sphinx.scm | 2 +- gnu/packages/tex.scm | 31 +++++++++++++++++-------------- 8 files changed, 27 insertions(+), 23 deletions(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index cddccf8aeaf..b97703e8104 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -899,9 +899,10 @@ emphasis on quality rather than speed.") (inputs (list openblas)) (native-inputs (list gfortran - (texlive-updmap.cfg (list texlive-fonts-ec - texlive-graphics - texlive-latex-geometry)))) + (texlive-updmap.cfg + (list texlive-fonts-ec + texlive-geometry + texlive-graphics)))) (home-page "https://github.com/greglandrum/yaehmop") (synopsis "Perform extended Hückel calculations") (description "@acronym{YAeHMOP, Yet Another extended Hueckel Molecular diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 75ffc81bfdb..4e3476222d4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -36197,7 +36197,7 @@ package online.") texlive-iftex texlive-fancyhdr texlive-fancyvrb - texlive-latex-geometry + texlive-geometry texlive-graphics texlive-latex-threeparttable texlive-titlesec diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 30dd6d34059..2f2a90461aa 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -387,8 +387,8 @@ graphs in Graphviz's DOT language, written in pure Python.") ;; the resulting generated TeX files, which \usepackage them. texlive-bin texlive-amsmath + texlive-geometry texlive-graphics - texlive-latex-geometry texlive-latex-base texlive-latex-preview texlive-latex-xkeyval diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 87b2b9816e4..f8cd4f385b4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5803,7 +5803,7 @@ set.") texlive-latex-float texlive-fncychap texlive-framed - texlive-latex-geometry + texlive-geometry texlive-hanging texlive-hyperref texlive-latex-multirow diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 57517c5bd29..20b08a74c23 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -311,7 +311,7 @@ colors, styles, options and details.") texlive-epsf texlive-etoolbox texlive-fonts-ec - texlive-latex-geometry + texlive-geometry texlive-graphics texlive-grfext texlive-hyperref diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0d2da17edc5..100ad3647e5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15187,7 +15187,7 @@ time.") texlive-hyperref texlive-fancyvrb texlive-latex-float - texlive-latex-geometry + texlive-geometry texlive-latex-jknapltx texlive-ms texlive-latex-parskip diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 42ddbade1e7..df701f55f04 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -119,7 +119,7 @@ texlive-latex-float texlive-fncychap texlive-framed - texlive-latex-geometry + texlive-geometry texlive-graphics ;graphicx, color texlive-kvoptions texlive-latex-needspace diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3b1145d6674..dbda7418380 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6017,22 +6017,23 @@ BibLaTeX, and is considered experimental.") (define-deprecated-package texlive-latex-gcite texlive-gcite) -(define-public texlive-latex-geometry +(define-public texlive-geometry (package - (name "texlive-latex-geometry") + (name "texlive-geometry") (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (texlive-ref "latex" "geometry")) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0a9nrmiwksnpa6iaapirqid974ai56qgin2n4h9mggy9v8gp7r71")))) + (source (texlive-origin + name version + (list "doc/latex/geometry/" + "source/latex/geometry/" + "tex/latex/geometry/") + (base32 + "09jwdrg4s1c0gqmx7s57byw5kc09cna3li85y9ix0vxa6f6iqzi1"))) (build-system texlive-build-system) - (arguments '(#:tex-directory "latex/geometry")) + (outputs '("out" "doc")) (propagated-inputs - (list texlive-oberdiek ;for ifpdf - texlive-graphics)) ;for keyval + (list texlive-atbegshi + texlive-graphics ;for keyval + texlive-iftex)) (home-page "https://www.ctan.org/pkg/geometry") (synopsis "Flexible and complete interface to document dimensions") (description @@ -6040,11 +6041,13 @@ BibLaTeX, and is considered experimental.") page layout, implementing auto-centering and auto-balancing mechanisms so that the users have only to give the least description for the page layout. The package knows about all the standard paper sizes, so that the user need not -know what the nominal \"real\" dimensions of the paper are, just its standard +know what the nominal real dimensions of the paper are, just its standard name (such as a4, letter, etc.). An important feature is the package's ability to communicate the paper size it's set up to the output.") (license license:lppl))) +(define-deprecated-package texlive-latex-geometry texlive-geometry) + (define-public texlive-latex-mdwtools (package (name "texlive-latex-mdwtools") @@ -11730,7 +11733,7 @@ handle complex tests.") texlive-hyperref texlive-latex-base texlive-cyrillic - texlive-latex-geometry + texlive-geometry (texlive-updmap.cfg ;fonts (list texlive-cbfonts texlive-lh -- cgit v1.3 From 76819a965589b62f83acf083305ae412a9fd91e5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 13 May 2023 15:59:14 +0200 Subject: gnu: texlive-fonts-ec -> texlive-ec. * gnu/packages/tex.scm (texlive-ec): New variable. (texlive-fonts-ec): Deprecate variable. (lyx): (biber): * gnu/packages/python-xyz.scm (python-pypandoc): * gnu/packages/statistics.scm (r-with-tests): * doc/build.scm (pdf-manual): * gnu/packages/bioinformatics.scm (discrover): (phyml): (velvet): * gnu/packages/chemistry.scm (yaehmop): * gnu/packages/chez.scm (stex-bootstrap): * gnu/packages/ocaml.scm (unison): (ocaml-bibtex2html): * gnu/packages/plotutils.scm (asymptote): Use new name. --- doc/build.scm | 2 +- gnu/packages/bioinformatics.scm | 6 +- gnu/packages/chemistry.scm | 2 +- gnu/packages/chez.scm | 8 +-- gnu/packages/ocaml.scm | 4 +- gnu/packages/plotutils.scm | 2 +- gnu/packages/python-xyz.scm | 4 +- gnu/packages/statistics.scm | 8 +-- gnu/packages/tex.scm | 128 +++++++++++++++++++--------------------- 9 files changed, 80 insertions(+), 84 deletions(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/doc/build.scm b/doc/build.scm index 0a5bddbcb6a..995f4878e1a 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -915,7 +915,7 @@ makeinfo OPTIONS." texlive-base texlive-bin ;for GUIX_TEXMF texlive-epsf - texlive-fonts-ec + texlive-ec texlive-tex-texinfo))))) (define build diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 22d2722538d..6bb188c2c2c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4768,7 +4768,7 @@ data and settings.") (list texlive-cm texlive-amsfonts texlive-doi - texlive-fonts-ec + texlive-ec texlive-latex-examplep texlive-hyperref texlive-ms @@ -12106,8 +12106,8 @@ programs for inferring phylogenies (evolutionary trees).") (texlive-updmap.cfg (list texlive-amsfonts texlive-caption texlive-cite + texlive-ec texlive-fancyvrb - texlive-fonts-ec texlive-graphics texlive-grfext texlive-hyperref @@ -17090,7 +17090,7 @@ to an artifact/contaminant file.") (list openmpi zlib)) (native-inputs `(("texlive" ,(texlive-updmap.cfg (list texlive-graphics - texlive-fonts-ec + texlive-ec texlive-hyperref))))) (home-page "https://www.ebi.ac.uk/~zerbino/velvet/") (synopsis "Nucleic acid sequence assembler for very short reads") diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index b97703e8104..44107e825a0 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -900,7 +900,7 @@ emphasis on quality rather than speed.") (native-inputs (list gfortran (texlive-updmap.cfg - (list texlive-fonts-ec + (list texlive-ec texlive-geometry texlive-graphics)))) (home-page "https://github.com/greglandrum/yaehmop") diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 2c8d53def89..b988b00fd7f 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -760,11 +760,11 @@ Chez Scheme."))) (propagated-inputs (list xorg-rgb (texlive-updmap.cfg - (list texlive-l3backend - texlive-hyperref - texlive-bibtex + (list texlive-bibtex + texlive-ec texlive-epsf - texlive-fonts-ec + texlive-hyperref + texlive-l3backend texlive-oberdiek)) ghostscript netpbm)) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d3990bdd4d3..9e399064c88 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1378,7 +1378,7 @@ libpanel, librsvg and quartz.") ;; For documentation ("ghostscript" ,ghostscript) ("texlive" ,(texlive-updmap.cfg - (list texlive-fonts-ec texlive-l3backend))) + (list texlive-ec texlive-l3backend))) ("hevea" ,hevea) ("lynx" ,lynx) ("which" ,which))) @@ -10255,7 +10255,7 @@ SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.") (native-inputs `(("which" ,which) ("texlive" ,(texlive-updmap.cfg - (list texlive-fonts-ec texlive-preprint + (list texlive-ec texlive-preprint texlive-hyperref texlive-bibtex))))) (propagated-inputs (list hevea)) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 20b08a74c23..6e4256ea99c 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -308,9 +308,9 @@ colors, styles, options and details.") texinfo ;for generating documentation (texlive-updmap.cfg (list texlive-amsfonts + texlive-ec texlive-epsf texlive-etoolbox - texlive-fonts-ec texlive-geometry texlive-graphics texlive-grfext diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0165925c70c..7edaf1dbc85 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29191,11 +29191,11 @@ By default it uses the open Python vulnerability database Safety DB.") `(("wheel" ,python-wheel))) (native-inputs `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts - texlive-fonts-ec + texlive-ec texlive-iftex texlive-hyperref - texlive-oberdiek texlive-lm + texlive-oberdiek texlive-xcolor))))) (arguments `(#:phases diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a1f96936e4b..74a27cec89f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -389,14 +389,14 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ pkg-config texinfo ; for building HTML manuals (texlive-updmap.cfg (list texlive-ae - texlive-inconsolata - texlive-fonts-ec - texlive-grfext texlive-amsfonts - texlive-latex-base + texlive-ec texlive-fancyvrb texlive-graphics + texlive-grfext texlive-hyperref + texlive-inconsolata + texlive-latex-base texlive-oberdiek texlive-tools texlive-upquote diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 056a4f8a32c..8561525d28b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6882,69 +6882,64 @@ package options.") (define-deprecated-package texlive-latex-kvoptions texlive-kvoptions) -(define-public texlive-fonts-ec +(define-public texlive-ec (package - (name "texlive-fonts-ec") + (name "texlive-ec") (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/source/jknappen/ec/")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "12av65fbz9xiashm09c9m1fj1mijxls5xspd7652ry1n5s0nixy4")))) - (build-system gnu-build-system) + (source (texlive-origin + name version + (list "doc/fonts/ec/" + "fonts/source/jknappen/ec/" + "fonts/tfm/jknappen/ec/") + (base32 + "1cyi0vv9dnp45s0ilsrbkyznj9ji62s5bhkqgh49461mv2f8qj6p"))) + (outputs '("out" "doc")) + (build-system texlive-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1) - (srfi srfi-26)) - #:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key inputs #:allow-other-keys) - (let ((mf (assoc-ref inputs "texlive-metafont"))) - ;; Tell mf where to find mf.base - (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c")) - ;; Tell mf where to look for source files - (setenv "MFINPUTS" - (string-append (getcwd) ":" - mf "/share/texmf-dist/metafont/base:" - (assoc-ref inputs "texlive-cm") - "/share/texmf-dist/fonts/source/public/cm"))) - (mkdir "build") - (for-each (lambda (font) - (format #t "building font ~a\n" font) - (invoke "mf" "-progname=mf" - "-output-directory=build" - (string-append "\\" - "mode:=ljfour; " - "mag:=1; " - "batchmode; " - "input " (basename font ".mf")))) - (find-files "." "[0-9]+\\.mf$")) - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (tfm (string-append - out "/share/texmf-dist/fonts/tfm/jknappen/ec")) - (mf (string-append - out "/share/texmf-dist/fonts/source/jknappen/ec"))) - (for-each (cut install-file <> tfm) - (find-files "build" "\\.*")) - (for-each (cut install-file <> mf) - (find-files "." "\\.mf")) - #t)))))) + (list + #:modules + '((guix build texlive-build-system) + (guix build utils) + (srfi srfi-1) + (srfi srfi-26)) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 're-generate-fonts-metrics + (lambda _ + (let ((mf #$(this-package-native-input "texlive-metafont")) + (cm #$(this-package-native-input "texlive-cm")) + (root (getcwd))) + (mkdir-p "build") + (with-directory-excursion "fonts/source/jknappen/ec" + ;; Tell mf where to find mf.base. + (setenv "MFBASES" + (string-append mf "/share/texmf-dist/web2c")) + ;; Tell mf where to look for source files. + (setenv "MFINPUTS" + (string-append + (getcwd) ":" + mf "/share/texmf-dist/metafont/base:" + cm "/share/texmf-dist/fonts/source/public/cm")) + ;; Build font metrics (tfm). + (for-each (lambda (font) + (format #t "building font ~a\n" font) + (invoke "mf" "-progname=mf" + (string-append "-output-directory=" + root "/build") + (string-append "\\" + "mode:=ljfour; " + "mag:=1; " + "batchmode; " + "input " + (basename font ".mf")))) + (find-files "." "[0-9]+\\.mf$"))) + ;; Install font metrics at the appropriate location. + (for-each + (cut install-file <> "fonts/tfm/jknappen/ec") + (find-files "build/" "\\.tfm$")))))))) (native-inputs - (list texlive-bin texlive-metafont texlive-cm)) - (home-page "https://www.ctan.org/pkg/ec") + (list texlive-bin texlive-cm texlive-metafont)) + (home-page "https://ctan.org/pkg/ec") (synopsis "Computer modern fonts in T1 and TS1 encodings") (description "The EC fonts are European Computer Modern Fonts, supporting the complete @@ -6954,15 +6949,16 @@ files. The set also contains a Text Companion Symbol font, called @code{tc}, featuring many useful characters needed in text typesetting, for example oldstyle digits, currency symbols (including the newly created Euro symbol), the permille sign, copyright, trade mark and servicemark as well as a copyleft -sign, and many others. Recent releases of LaTeX2e support the EC fonts. The -EC fonts supersede the preliminary version released as the DC fonts. The -fonts are available in (traced) Adobe Type 1 format, as part of the -@code{cm-super} bundle. The other Computer Modern-style T1-encoded Type 1 -set, Latin Modern, is not actually a direct development of the EC set, and -differs from the EC in a number of particulars.") +sign, and many others. The fonts are available in (traced) Adobe Type +1 format, as part of the @code{cm-super} bundle. The other Computer +Modern-style T1-encoded Type 1 set, Latin Modern, is not actually a direct +development of the EC set, and differs from the EC in a number of +particulars.") (license (license:fsf-free "https://www.tug.org/svn/texlive/tags/\ texlive-2019.3/Master/texmf-dist/doc/fonts/ec/copyrite.txt")))) +(define-deprecated-package texlive-fonts-ec texlive-ec) + ;; FIXME: the fonts should be built from source, but running "tex aefonts.tex" ;; fails with obscure TeX-typical error messages. (define-public texlive-ae @@ -8944,7 +8940,7 @@ and Karl Berry.") qtsvg-5 zlib)) (propagated-inputs - (list (texlive-updmap.cfg (list texlive-fonts-ec)))) + (list (texlive-updmap.cfg (list texlive-ec)))) (native-inputs (list python pkg-config)) (home-page "https://www.lyx.org/") -- cgit v1.3 From daf6f34c1e3d34dd515c153782aa51701a2bba62 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 13 May 2023 16:42:51 +0200 Subject: gnu: texlive-latex-parskip -> texlive-parskip. * gnu/packages/tex.scm (texlive-parskip): New variable. (texlive-latex-parskip): Deprecate variable. * gnu/packages/maths.scm (hypre): * gnu/packages/plotutils.scm (asymptote): * gnu/packages/python-xyz.scm (python-nbconvert): * gnu/packages/sphinx.scm (python-sphinx): Use new name. --- gnu/packages/maths.scm | 2 +- gnu/packages/plotutils.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/sphinx.scm | 2 +- gnu/packages/tex.scm | 42 +++++++++++++++++------------------------- 5 files changed, 21 insertions(+), 29 deletions(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7a98c05e29b..38d99ab2e57 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5810,7 +5810,7 @@ set.") texlive-natbib texlive-latex-needspace texlive-newunicodechar - texlive-latex-parskip + texlive-parskip texlive-stackengine texlive-latex-tabulary texlive-tocloft diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 6e4256ea99c..6f052d2a045 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -323,7 +323,7 @@ colors, styles, options and details.") texlive-latex-media9 texlive-oberdiek ;for ifluatex texlive-latex-ocgx2 - texlive-latex-parskip + texlive-parskip texlive-pdftexcmds texlive-tex-texinfo)))) (inputs diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c0c13a37343..66788cfa6f3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15190,7 +15190,7 @@ time.") texlive-geometry texlive-jknapltx texlive-ms - texlive-latex-parskip + texlive-parskip texlive-trimspaces texlive-upquote texlive-stringenc diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index a69a8b44ed3..97c05234ea6 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -123,7 +123,7 @@ texlive-graphics ;graphicx, color texlive-kvoptions texlive-latex-needspace - texlive-latex-parskip + texlive-parskip texlive-latex-preview texlive-latex-tabulary texlive-titlesec diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 720548289ad..9650456b20a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7414,40 +7414,32 @@ positions; a grid for orientation is available.") (define-deprecated-package texlive-latex-overpic texlive-overpic) -(define-public texlive-latex-parskip +(define-public texlive-parskip (package - (name "texlive-latex-parskip") + (name "texlive-parskip") (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/parskip")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1zll8jci8lsd7y44j567akf6y8fp2p7qq23rs527zhr0br9mn3sh")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/latex/parskip"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) + (source (texlive-origin + name version + (list "doc/latex/parskip/" + "source/latex/parskip/" + "tex/latex/parskip/") + (base32 + "18yygddxv3kblvf4jhzqa8h1js0n8g1bw723r6ss2hlz4lj64kf0"))) + (outputs '("out" "doc")) + (build-system texlive-build-system) + (propagated-inputs + (list texlive-etoolbox + texlive-kvoptions)) (home-page "https://www.ctan.org/pkg/parskip") - (synopsis "Layout with zero \\parindent, non-zero \\parskip") + (synopsis "Layout with zero @code{\\parindent}, non-zero @code{\\parskip}") (description "Simply changing @code{\\parskip} and @code{\\parindent} leaves a layout that is untidy; this package (though it is no substitute for a properly designed class) helps alleviate this untidiness.") (license license:lppl))) +(define-deprecated-package texlive-latex-parskip texlive-parskip) + (define-public texlive-latex-pbox (package (inherit (simple-texlive-package -- cgit v1.3 From d7fc4cec0777955c27063b0ef09c59d1a2596efb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 May 2023 11:42:24 +0200 Subject: gnu: texlive-latex-media9 -> texlive-media9. * gnu/packages/tex.scm (texlive-media9): New variable. (texlive-latex-media9): Deprecate variable. * gnu/packages/plotutils.scm (asymptote)[native-inputs]: Use new name. --- gnu/packages/plotutils.scm | 2 +- gnu/packages/tex.scm | 51 +++++++++++++++++++--------------------------- 2 files changed, 22 insertions(+), 31 deletions(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 6f052d2a045..a49df67c296 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -320,7 +320,7 @@ colors, styles, options and details.") texlive-kvoptions texlive-l3backend texlive-latex-base - texlive-latex-media9 + texlive-media9 texlive-oberdiek ;for ifluatex texlive-latex-ocgx2 texlive-parskip diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c074811fd76..7dba840a5fa 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -9037,46 +9037,37 @@ with documents of any length in which the usual processing abilities are required: automatic sectioning and pagination, spell checking and so forth.") (license license:gpl2+))) -(define-public texlive-latex-media9 +(define-public texlive-media9 (package - (name "texlive-latex-media9") + (name "texlive-media9") (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/media9")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0a1v70k6231323y1lazfda1y9568w8hn7c8jhc7rblkhdfv3slw7")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/latex/media9"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) - (home-page "https://www.ctan.org/pkg/media9") + (source (texlive-origin + name version + (list "doc/latex/media9/" + "source/latex/media9/files/" + "source/latex/media9/players/" + "tex/latex/media9/javascript/" + "tex/latex/media9/players/") + (base32 + "1kx0zbwd7pd4mah0b8l595hyjc03g505kfmn6fv7iaqvkixqrgbi"))) + (outputs '("out" "doc")) + (build-system texlive-build-system) + (home-page "https://ctan.org/pkg/media9") (synopsis "Multimedia inclusion package with Adobe Reader-9/X compatibility") (description - "The package provides an interface to embed interactive Flash (SWF) and 3D -objects (Adobe U3D & PRC), as well as video and sound files or streams in the -popular MP4, FLV and MP3 formats into PDF documents with Acrobat-9/X + "The package provides an interface to embed interactive Flash (SWF) and +3D objects (Adobe U3D & PRC), as well as video and sound files or streams in +the popular MP4, FLV and MP3 formats into PDF documents with Acrobat-9/X compatibility. Playback of multimedia files uses the built-in Flash Player of -Adobe Reader and does, therefore, not depend on external plug-ins. Flash Player -supports the efficient H.264 codec for video compression. +Adobe Reader and does, therefore, not depend on external plug-ins. Flash +Player supports the efficient H.264 codec for video compression. The package is based on the RichMedia Annotation, an Adobe addition to the PDF specification. It replaces the now obsolete @code{movie15} package.") (license license:lppl))) +(define-deprecated-package texlive-latex-media9 texlive-media9) + (define-public texlive-latex-ocgx2 (package (name "texlive-latex-ocgx2") -- cgit v1.3 From b6ad756412fd5da6d9e0e8d16b969e4c27092106 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 May 2023 11:47:34 +0200 Subject: gnu: texlive-latex-ocgx2 -> texlive-ocgx2. * gnu/packages/tex.scm (texlive-ocgx2): New variable. (texlive-latex-ocgx2): Deprecate variable. * gnu/packages/plotutils.scm (asymptote): Use new name. --- gnu/packages/plotutils.scm | 2 +- gnu/packages/tex.scm | 65 +++++++++++++++++----------------------------- 2 files changed, 25 insertions(+), 42 deletions(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index a49df67c296..4a681d3ecb5 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -322,7 +322,7 @@ colors, styles, options and details.") texlive-latex-base texlive-media9 texlive-oberdiek ;for ifluatex - texlive-latex-ocgx2 + texlive-ocgx2 texlive-parskip texlive-pdftexcmds texlive-tex-texinfo)))) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 7dba840a5fa..e37577d80d1 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -9068,51 +9068,34 @@ specification. It replaces the now obsolete @code{movie15} package.") (define-deprecated-package texlive-latex-media9 texlive-media9) -(define-public texlive-latex-ocgx2 +(define-public texlive-ocgx2 (package - (name "texlive-latex-ocgx2") + (name "texlive-ocgx2") (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/ocgx2")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1mrz1mj59m27bfya52vi4lm84ifisaf30pmf8id1biqwcq4jyynh")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/latex/ogcx2"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) - (home-page "https://www.ctan.org/pkg/ocgx2") - (synopsis "Provide OCG (Optional Content Groups) support within a PDF document") - (description - "This package provides OCG (Optional Content Groups) support within a PDF -document. - -It re-implements the functionality of the @code{ocg}, @code{ocgx}, and -@code{ocg-p} packages and adds support for all known engines and back-ends -including: - -@itemize -@item LaTeX → dvips → @code{ps2pdf}/Distiller -@item (Xe)LaTeX(x) → @code{dvipdfmx} -@item pdfLaTeX and LuaLaTeX . -@end itemize - -It also ensures compatibility with the @code{media9} and @code{animate} packages.") + (source (texlive-origin + name version + (list "doc/latex/ocgx2/" "tex/latex/ocgx2/") + (base32 + "195zli0l69rvxxd7cs387g6bipppfl0pyfsf5invq191zlv319b2"))) + (outputs '("out" "doc")) + (build-system texlive-build-system) + (propagated-inputs + (list texlive-l3packages + texlive-media9 + texlive-pgf)) + (home-page "https://ctan.org/pkg/ocgx2") + (synopsis "Drop-in replacement for 'ocgx' and 'ocg-p'") + (description + "This package serves as a drop-in replacement for the packages +@code{ocgx} by Paul Gaborit and @code{ocg-p} by Werner Moshammer for the +creation of PDF Layers. It re-implements the functionality of the @code{ocg}, +@code{ocgx}, and @code{ocg-p} packages and adds support for all known engines +and back-ends. It also ensures compatibility with the @code{media9} and +@code{animate} packages.") (license license:lppl))) +(define-deprecated-package texlive-latex-ocgx2 texlive-ocgx2) + (define-public texlive-ms (let ((template (simple-texlive-package -- cgit v1.3 From ac29f53d304ed6b875562375fbc66c9cd366f8fd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 May 2023 21:47:36 +0200 Subject: gnu: texlive-tex-texinfo -> texlive-texinfo. * gnu/packages/tex.scm (texlive-texinfo): New variable. (texlive-tex-texinfo): Deprecate variable. * doc/build.scm (pdf-manual): * gnu/packages/finance.scm (optionmatrix): * gnu/packages/lisp.scm (sbcl): * gnu/packages/plotutils.scm (asymptote): * gnu/packages/scheme.scm (mit-scheme): * gnu/packages/xdisorg.scm (xforms): Use new name. --- doc/build.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/lisp.scm | 2 +- gnu/packages/plotutils.scm | 2 +- gnu/packages/scheme.scm | 5 +++-- gnu/packages/tex.scm | 38 ++++++++++++-------------------------- gnu/packages/xdisorg.scm | 2 +- 7 files changed, 20 insertions(+), 33 deletions(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/doc/build.scm b/doc/build.scm index 995f4878e1a..9c0cc994047 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -916,7 +916,7 @@ makeinfo OPTIONS." texlive-bin ;for GUIX_TEXMF texlive-epsf texlive-ec - texlive-tex-texinfo))))) + texlive-texinfo))))) (define build (with-imported-modules '((guix build utils)) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index eb480762edf..e0d6bd6e2ce 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -2073,7 +2073,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-tex-texinfo)))) + (texlive-updmap.cfg (list texlive-epsf texlive-texinfo)))) (home-page "https://anthonybradford.github.io/optionmatrix/") (synopsis "Financial derivative calculator") (description diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 37735020ad5..900daca53c2 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -481,7 +481,7 @@ an interpreter, a compiler, a debugger, and much more.") ed inetutils ;for hostname(1) texinfo - (texlive-updmap.cfg (list texlive-tex-texinfo)) + (texlive-updmap.cfg (list texlive-texinfo)) which)) (inputs (list gmp ; for sb-gmp diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 4a681d3ecb5..db14272804d 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -325,7 +325,7 @@ colors, styles, options and details.") texlive-ocgx2 texlive-parskip texlive-pdftexcmds - texlive-tex-texinfo)))) + texlive-texinfo)))) (inputs (list bash-minimal eigen diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 215ea741f86..a4f43001cac 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -191,8 +191,9 @@ ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) - ("texlive" ,(texlive-updmap.cfg (list texlive-tex-texinfo - texlive-epsf))) + ("texlive" ,(texlive-updmap.cfg + (list texlive-epsf + texlive-texinfo))) ("texinfo" ,texinfo) ("ghostscript" ,ghostscript) ("m4" ,m4))) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 884f35c9598..a83310619e7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6523,34 +6523,18 @@ a few situations where longtable has problems.") (define-deprecated-package texlive-latex-supertabular texlive-supertabular) -(define-public texlive-tex-texinfo +(define-public texlive-texinfo (package - (name "texlive-tex-texinfo") + (name "texlive-texinfo") (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/texinfo")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1qcmcsxdsibca0mad559vhz36xaxsbkivgv1hc98vdyd90fg4y31")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/texinfo"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) - (home-page "https://www.ctan.org/pkg/texinfo") - (synopsis "TeX macros to handle Texinfo files") + (source (texlive-origin + name version + (list "tex/texinfo/") + (base32 + "0wbbhjr1jqiicnssiy6n5s4v5p6axhlilpkfhix4kavbj8mb6mfn"))) + (build-system texlive-build-system) + (home-page "https://ctan.org/pkg/texinfo") + (synopsis "Texinfo documentation system") (description "Texinfo is the preferred format for documentation in the GNU project; the format may be used to produce online or printed output from a single @@ -6559,6 +6543,8 @@ other programs in the distribution offer online interactive use (with hypertext linkages in some cases).") (license license:gpl3+))) +(define-deprecated-package texlive-tex-texinfo texlive-texinfo) + (define-public texlive-textcase (package (inherit (simple-texlive-package diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 1f7539764c4..da5ca76e106 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -3486,7 +3486,7 @@ the following features: texinfo texi2html (texlive-updmap.cfg (list texlive-epsf - texlive-tex-texinfo)) + texlive-texinfo)) imagemagick)) (propagated-inputs (list libx11 libxpm libjpeg-turbo)) (home-page "http://xforms-toolkit.org/") -- cgit v1.3 From 520551a59699e0c23c429a83a50be057f0160f5c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 13 Jun 2023 16:36:03 +0200 Subject: gnu: Replace texlive-latex-base with texlive-latex-bin. Although `latex-base' is clearly defined on CTAN, it isn't a proper TeX Live package. Since we're trying to follow as closely as possible this TeX distribution, we replace the package with the closest one, which is `texlive-latex-bin'. As a consequence, the #:TEXLIVE-LATEX-BASE argument becomes #:TEXLIVE-LATEX-BIN?, emphasizing the fact that the meaningful values for it are booleans. * gnu/packages/graphviz.scm (dot2tex)[propagated-inputs]: Remove TEXLIVE-GRAPHICS, TEXLIVE-LATEX-BASE. Add TEXLIVE-LATEX-BIN. * gnu/packages/plotutils.scm (asymptote)[native-inputs]: Remove TEXLIVE-LATEX-BASE, TEXLIVE-GRAPHICS, TEXLIVE-L3BACKEND. Use TEXLIVE-UPDMAP.CFG. * gnu/packages/sphinx.scm (python-sphinx)[propagated-inputs]: Remove TEXLIVE-GRAPHICS, TEXLIVE-LATEX-BASE. Add TEXLIVE-LATEX-BIN. * gnu/packages/tex.scm (texlive-latex-base): Deprecate variable. (texlive-hyphen-complete): (texlive-tex): (texlive-latex): (texlive-docstrip): (texlive-unicode-data): (texlive-hyphen-base): (texlive-tex-ini-files): (texlive-metafont): (texlive-modes): (texlive-knuth-lib): (texlive-latex-fonts): (texlive-etex): (texlive-plain): (texlive-kpathsea): (texlive-latexconfig): (texlive-latex-bin): (texlive-l3kernel): (texlive-l3backend): (texlive-l3packages): (texlive-luatex): (texlive-luahbtex): (texlive-babel): (texlive-cyrillic): (texlive-pdftex): (texlive-cm)[arguments]: Replace #:TEXLIVE-LATEX-BASE with #:TEXLIVE-LATEX-BIN?. (texlive-lm): (texlive-lua-alt-getopt): (texlive-luaotfload): (texlive-graphics-def): (texlive-graphics-cfg): Set #:TEXLIVE-LATEX-BIN? to #F. (texlive-graphics): (texlive-lualibs): (texlive-firstaid): (texlive-atveryend)[arguments]: Set #:TEXLIVE-LATEX-BIN? to #F. [native-inputs]: Add TEXLIVE-DOCSTRIP, TEXLIVE-PDFTEX. (texlive-updmap.cfg): Remove TEXLIVE-CM, TEXLIVE-GRAPHICS, TEXLIVE-LATEX-BASE. Add TEXLIVE-LATEX-BIN. (texlive-atbegshi)[arguments]: Set #:TEXLIVE-LATEX-BIN? to #F. [native-inputs]: Add TEXLIVE-DOCSTRIP, TEXLIVE-PDFTEX. [propagated-inputs]: Remove TEXLIVE-IFTEX, TEXLIVE-INFWARERR and TEXLIVE-LTXCMDS. (texlive-everyshi)[arguments]: Build package with a temporary "latex.fmt" file. (texlive-cyrillic): Set #:TEXLIVE-LATEX-BIN? to #T. * guix/build-system/texlive.scm (default-texlive-latex-base): Rename to TEXLIVE-LATEX-BIN. (lower): Set default value for TEXLIVE-LATEX-BIN? to #TRUE. * gnu/packages/statistics.scm (r-with-tests): Remove TEXLIVE-LATEX-BASE and TEXLIVE-GRAPHICS. * doc/guix.texi (Build Systems): Document #:TEXLIVE-LATEX-BIN? argument. Remove reference to #:TEXLIVE-LATEX-BASE. --- doc/guix.texi | 14 ++-- gnu/packages/graphviz.scm | 3 +- gnu/packages/plotutils.scm | 3 - gnu/packages/sphinx.scm | 3 +- gnu/packages/statistics.scm | 27 ++++---- gnu/packages/tex.scm | 153 ++++++++++++++++++++---------------------- guix/build-system/texlive.scm | 14 ++-- 7 files changed, 105 insertions(+), 112 deletions(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/doc/guix.texi b/doc/guix.texi index e58bb65bd12..213c183e1ff 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10012,10 +10012,16 @@ files whenever possible. Likewise, it can also create TeX formats (i.e., @file{.fmt} files) listed in the @code{#:create-formats} argument. -The build system adds only @code{texlive-bin} and -@code{texlive-latex-base} (both from @code{(gnu packages tex}) to the -inputs. Both can be overridden with the arguments @code{#:texlive-bin} -and @code{#:texlive-latex-base}, respectively. +The build system adds @code{texlive-bin} from @code{(gnu packages tex)} +to the native inputs. It can be overridden with the +@code{#:texlive-bin} argument. + +The package @code{texlive-latex-bin}, from the same module, contains +most of the tools for building TeX Live packages; for convenience, it is +also added by default to the native inputs. However, this can be +troublesome when building a dependency of @code{texlive-latex-bin} +itself. In this particular situation, the @code{#:texlive-latex-bin?} +argument should be set to @code{#f}. @end defvar @defvar ruby-build-system diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 658cc494d15..61e4ec7a9fe 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -388,8 +388,7 @@ graphs in Graphviz's DOT language, written in pure Python.") texlive-amsmath texlive-bin texlive-geometry - texlive-graphics - texlive-latex-base + texlive-latex-bin texlive-pgf texlive-pstricks texlive-preview diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index db14272804d..00ddd34355f 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -312,14 +312,11 @@ colors, styles, options and details.") texlive-epsf texlive-etoolbox texlive-geometry - texlive-graphics texlive-grfext texlive-hyperref texlive-infwarerr texlive-kvdefinekeys texlive-kvoptions - texlive-l3backend - texlive-latex-base texlive-media9 texlive-oberdiek ;for ifluatex texlive-ocgx2 diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index b2ad5d99e82..173accd768b 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -117,10 +117,9 @@ texlive-fncychap texlive-framed texlive-geometry - texlive-graphics ;graphicx, color texlive-hyperref texlive-kvoptions - texlive-latex-base ;alltt, atbegshi, makeidx, textcomp + texlive-latex-bin texlive-ltxcmds texlive-needspace texlive-oberdiek ;hypcap diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a25b8d2cb37..1cea3afda5e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -388,20 +388,19 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ perl pkg-config texinfo ; for building HTML manuals - (texlive-updmap.cfg (list texlive-ae - texlive-amsfonts - texlive-ec - texlive-fancyvrb - texlive-graphics - texlive-grfext - texlive-hyperref - texlive-inconsolata - texlive-latex-base - texlive-oberdiek - texlive-tools - texlive-upquote - texlive-url - texlive-xkeyval)) + (texlive-updmap.cfg + (list texlive-ae + texlive-amsfonts + texlive-ec + texlive-fancyvrb + texlive-grfext + texlive-hyperref + texlive-inconsolata + texlive-oberdiek + texlive-tools + texlive-upquote + texlive-url + texlive-xkeyval)) tzdata-for-tests xz)) (inputs diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 57de356205f..e66993e4921 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -147,7 +147,7 @@ (build-system texlive-build-system) (arguments (list - #:texlive-latex-base #f + #:texlive-latex-bin? #f #:tex-engine "tex" #:phases #~(modify-phases %standard-phases @@ -715,7 +715,7 @@ This package contains the binaries.") (outputs '("out" "doc")) (build-system texlive-build-system) (arguments - (list #:texlive-latex-base #f + (list #:texlive-latex-bin? #f #:create-formats #~(list "tex"))) (propagated-inputs (list texlive-cm @@ -751,7 +751,7 @@ it should not be processed without Knuth's direct permission.") (build-system texlive-build-system) (arguments (list - #:texlive-latex-base #f + #:texlive-latex-bin? #f #:tex-engine "tex" #:tex-format #f #:build-targets #~(list "unpack.ins") @@ -879,7 +879,7 @@ a replacement for LaTeX's @code{\\@@alph} and @code{\\@@Alph} macros.") "1pxbqbia0727vg01xv8451szm55z2w8sb0vv3kf4iqx5ibb6m0d2"))) (build-system texlive-build-system) (arguments - (list #:texlive-latex-base #f)) + (list #:texlive-latex-bin? #f)) (home-page "https://www.ctan.org/texlive") (synopsis "Utility to strip documentation from TeX files") (description "This package provides the docstrip utility to strip @@ -921,7 +921,7 @@ affected).") "1d41zvjsig7sqf2j2m89dnbv3gicpb16r04b4ikps4gabhbky83k"))) (outputs '("out" "doc")) (build-system texlive-build-system) - (arguments (list #:texlive-latex-base #f)) + (arguments (list #:texlive-latex-bin? #f)) (home-page "https://ctan.org/pkg/unicode-data") (synopsis "Unicode data and loaders for TeX") (description "This bundle provides generic access to Unicode Consortium @@ -979,7 +979,7 @@ until the package appears.") (base32 "1nad1bqpjsywm49hlv7d75mqvgha3j5vayvkvfhv8wwzgdb3mk84"))) (build-system texlive-build-system) - (arguments (list #:texlive-latex-base #f)) + (arguments (list #:texlive-latex-bin? #f)) (home-page "https://tug.org/texlive/") (synopsis "Core hyphenation support files") (description "This package includes Knuth's original @file{hyphen.tex}, @@ -1094,7 +1094,7 @@ PostScript.") "0a18k27fz1vjha5blwskxpnd715k08hmfm7d1yc2f7adaf0rwl3m"))) (outputs '("out" "doc")) (build-system texlive-build-system) - (arguments (list #:texlive-latex-base #f)) + (arguments (list #:texlive-latex-bin? #f)) (home-page "https://www.ctan.org/pkg/tex-ini-files") (synopsis "Files for creating TeX formats") (description @@ -1128,7 +1128,7 @@ adapt the plain e-TeX source file to work with XeTeX and LuaTeX.") (build-system texlive-build-system) (arguments (list - #:texlive-latex-base #f + #:texlive-latex-bin? #f #:phases #~(modify-phases %standard-phases (add-after 'build 'generate-mf.base @@ -1228,7 +1228,7 @@ that support for the Pandora fonts is also available via the (outputs '("out" "doc")) (build-system texlive-build-system) (arguments - (list #:texlive-latex-base #f)) + (list #:texlive-latex-bin? #f)) (home-page "https://ctan.org/pkg/modes") (synopsis "Collection of Metafont @code{mode_def}'s") (description @@ -1426,7 +1426,7 @@ part of the cite bundle of the author's citation-related packages.") (build-system texlive-build-system) (arguments (list - #:texlive-latex-base #f + #:texlive-latex-bin? #f #:phases #~(modify-phases %standard-phases (add-after 'generate-font-metrics 'generate-pk @@ -1632,6 +1632,7 @@ in LuaTeX. It is required by the @code{luatexbase} package which uses "0yyk0dr4yms82mwy4dc03zf5igyhgcb65icdah042rk23rlpxygv"))) (outputs '("out" "doc")) (build-system texlive-build-system) + (arguments (list #:texlive-latex-bin? #f)) (home-page "https://ctan.org/pkg/lm") (synopsis "Latin Modern family of fonts") (description "The Latin Modern fonts are derived from the famous Computer @@ -1709,7 +1710,7 @@ conversion software and word processors.") (base32 "0dl8z340n6m6xn7wari4hir0syxqi0kl2fhnf0bvnmkqhqwyzpca"))) (build-system texlive-build-system) - (arguments (list #:texlive-latex-base #f)) + (arguments (list #:texlive-latex-bin? #f)) (native-inputs (list texlive-cm texlive-metafont)) (home-page "https://ctan.org/pkg/knuth-lib") (synopsis "Small library of METAFONT sources") @@ -1755,7 +1756,7 @@ directories.") "1bzqzzhs15w7dqz90hfjnaffjqh24q14w2h1h8vnxzvrlsyv21vq"))) (outputs '("out" "doc")) (build-system texlive-build-system) - (arguments (list #:texlive-latex-base #f)) + (arguments (list #:texlive-latex-bin? #f)) (native-inputs (list texlive-cm texlive-metafont)) (home-page "https://ctan.org/pkg/latex-fonts") (synopsis "Collection of fonts used in LaTeX distributions") @@ -1943,7 +1944,7 @@ features generation of clean UTF-8 patterns.") "17pvh7i9zw8qa5hr53kci7di64fqzx4j35gsn28s36b74x6xj4bc"))) (outputs '("out" "doc")) (build-system texlive-build-system) - (arguments (list #:texlive-latex-base #f)) + (arguments (list #:texlive-latex-bin? #f)) (native-inputs (list texlive-cm texlive-metafont)) (home-page "https://www.ctan.org/pkg/etex") (synopsis "Extended version of TeX") @@ -1991,7 +1992,7 @@ e-TeX's facilities.") (list #:tex-engine "tex" #:tex-format #f - #:texlive-latex-base #f)) + #:texlive-latex-bin? #f)) (home-page "https://ctan.org/pkg/plain") (synopsis "Plain TeX format and supporting files") (description @@ -2174,7 +2175,7 @@ replacement for the @code{inputenc} package.") (build-system texlive-build-system) (arguments (list - #:texlive-latex-base #f + #:texlive-latex-bin? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-references @@ -2240,61 +2241,13 @@ default and narrow versions of multiple integrals.") (base32 "1x5fyr2185nx3qlyariykdz44hcy5azimrk9db2p707dg08bjhsd"))) (build-system texlive-build-system) - (arguments (list #:texlive-latex-base #f)) + (arguments (list #:texlive-latex-bin? #f)) (home-page "https://ctan.org/pkg/latexconfig") (synopsis "Configuration files for LaTeX-related formats") (description "The package provides configuration files for LaTeX-related formats.") (license license:lppl))) -(define-public texlive-latex-base - (package - (name "texlive-latex-base") - (version (number->string %texlive-revision)) - (source (texlive-origin - name version - (list "doc/latex/base/" "makeindex/latex/" - "source/latex/base/" "tex/latex/base/") - (base32 - "0k2b6qi281cl4zml6l537iyps1zwaq7pip81qq8vlkhb9h5ggpnw"))) - (build-system texlive-build-system) - (outputs '("out" "doc")) - (arguments - (list - #:texlive-latex-base #f - #:tex-engine "tex" - #:tex-format #f - #:build-targets #~(list "unpack.ins") - #:create-formats #~(list "dvilualatex" "latex" "lualatex" "pdflatex"))) - (propagated-inputs - (list texlive-babel - texlive-cm - texlive-etex - texlive-hyphen-complete - texlive-knuth-lib - texlive-kpathsea - texlive-l3backend - texlive-l3kernel - texlive-latex-fonts - texlive-latexconfig - texlive-luatex - texlive-pdftex - texlive-plain - texlive-tex-ini-files - texlive-unicode-data - ;; TODO: This dependency isn't needed for LaTeX version 2021-06-01 - ;; and later. See: - ;; - texlive-l3packages)) - (home-page "https://www.ctan.org/pkg/latex-base") - (synopsis "Base sources of LaTeX") - (description - "This bundle comprises the source of LaTeX itself, together with several -packages which are considered part of the kernel. This bundle, together with -the required packages, constitutes what every LaTeX distribution should -contain.") - (license license:lppl1.3c+))) - (define-public texlive-latex-bin (package (name "texlive-latex-bin") @@ -2315,7 +2268,7 @@ contain.") (build-system texlive-build-system) (arguments (list - #:texlive-latex-base #f + #:texlive-latex-bin? #f #:create-formats #~(list "dvilualatex" "latex" "lualatex" "pdflatex"))) (propagated-inputs (list texlive-atbegshi @@ -2346,6 +2299,8 @@ contain.") several packages that are considered as part of the LaTeX kernel.") (license license:lppl1.3c+))) +(define-deprecated-package texlive-latex-base texlive-latex-bin) + (define-public texlive-atenddvi (package (name "texlive-atenddvi") @@ -2416,6 +2371,8 @@ customize their appearance in the enclosing document.") "1rp805h0m99rxs107a798l951lyahlnp7irfklfadn2a2ljzhafn"))) (outputs '("out" "doc")) (build-system texlive-build-system) + (arguments (list #:texlive-latex-bin? #f)) + (native-inputs (list texlive-docstrip texlive-pdftex)) (home-page "https://ctan.org/pkg/atveryend") (synopsis "Hooks at the very end of a document") (description @@ -2636,6 +2593,7 @@ Unicode points; it is maintained by Adobe. The additional "0b66fy06safyrd717rfr476g1gz6nqfv1vqvam7ac2yy0g0djb17"))) (outputs '("out" "doc")) (build-system texlive-build-system) + (arguments (list #:texlive-latex-bin? #f)) (home-page "https://ctan.org/pkg/graphics-def") (synopsis "Colour and graphics option files") (description @@ -2657,6 +2615,7 @@ packages.") "00n63adb2laf43lzix39xl68aq0k5k80mmrw602w99w5n7f96gsf"))) (outputs '("out" "doc")) (build-system texlive-build-system) + (arguments (list #:texlive-latex-bin? #f)) (home-page "https://ctan.org/pkg/graphics-cfg") (synopsis "Sample configuration files for LaTeX color and graphics") (description @@ -2677,6 +2636,8 @@ set default \"driver\" options for the color and graphics packages.") "0prw1zcv4fcj3zg0kyhj0k7ax0530adl60bajzvbv3fi16d7rqlq"))) (outputs '("out" "doc")) (build-system texlive-build-system) + (arguments (list #:texlive-latex-bin? #f)) + (native-inputs (list texlive-docstrip texlive-pdftex)) (propagated-inputs (list texlive-graphics-def texlive-graphics-cfg)) (home-page "https://ctan.org/macros/latex/required/graphics") @@ -3112,7 +3073,7 @@ of file names.") (list #:tex-engine "tex" #:tex-format #f - #:texlive-latex-base #f)) + #:texlive-latex-bin? #f)) (native-inputs (list texlive-docstrip)) (propagated-inputs @@ -3147,7 +3108,7 @@ LaTeX3 conventions can be used with regular LaTeX2e packages.") (list #:tex-engine "tex" #:tex-format #f - #:texlive-latex-base #f)) + #:texlive-latex-bin? #f)) (native-inputs (list texlive-docstrip)) (home-page "https://ctan.org/pkg/l3backend") @@ -3194,7 +3155,7 @@ an independent schedule.") "xtemplate.ins") #:tex-engine "tex" #:tex-format #f - #:texlive-latex-base #f)) + #:texlive-latex-bin? #f)) (native-inputs (list texlive-docstrip)) (propagated-inputs @@ -3450,6 +3411,8 @@ they are not directly related to Unicode mathematics typesetting.") "0gf60vj9y75a7dlrmpbyqgsa00s1717r6if3lm5ldm41i9fm8ywz"))) (outputs '("out" "doc")) (build-system texlive-build-system) + (arguments (list #:texlive-latex-bin? #f)) + (native-inputs (list texlive-docstrip texlive-pdftex)) (home-page "https://ctan.org/pkg/lualibs") (synopsis "Additional Lua functions for LuaTeX macro programmers") (description @@ -3472,6 +3435,7 @@ this bundle for use independent of ConTeXt.") "0cizxzn33n3pn98xkqnxb8s6vdwkar3xrwhraqrs05pjfdn9d4wz"))) (outputs '("out" "doc")) (build-system texlive-build-system) + (arguments (list #:texlive-latex-bin? #f)) (home-page "https://ctan.org/pkg/lua-alt-getopt") (synopsis "Process application arguments as @code{getopt_long}") (description @@ -3502,7 +3466,7 @@ in the same way as BSD/GNU @code{getopt_long(3)} functions do.") (outputs '("out" "doc")) (build-system texlive-build-system) (arguments - (list #:texlive-latex-base #f + (list #:texlive-latex-bin? #f #:create-formats #~(list "dviluatex" "luatex"))) (propagated-inputs (list texlive-cm @@ -3585,7 +3549,7 @@ upgrade smoothly to the new support structure.") (build-system texlive-build-system) (arguments (list - #:texlive-latex-base #f + #:texlive-latex-bin? #f #:create-formats #~(list "luahbtex"))) (propagated-inputs (list texlive-cm @@ -3623,6 +3587,7 @@ shaping, instead of LuaTeX's built-in shaper.") "15xhnb4kyzmr11lj0md1d502cqrxyq6zdcq738z9394k6bas377f"))) (outputs '("out" "doc")) (build-system texlive-build-system) + (arguments (list #:texlive-latex-bin? #f)) (propagated-inputs (list texlive-lm texlive-lua-alt-getopt texlive-lualibs)) (home-page "https://ctan.org/pkg/luaotfload") (synopsis "OpenType font loader for LuaTeX") @@ -3772,7 +3737,7 @@ available as part of the AMS-LaTeX distribution.") (build-system texlive-build-system) (arguments (list - #:texlive-latex-base #f + #:texlive-latex-bin? #f #:phases #~(modify-phases %standard-phases ;; This package tries to produce babel.aux twice but refuses to @@ -4029,8 +3994,7 @@ German.") (arguments (list #:tex-engine "tex" - #:tex-format #f - #:texlive-latex-base #f)) + #:tex-format #f)) (native-inputs (list texlive-docstrip)) (home-page "https://ctan.org/pkg/cyrillic") @@ -4148,13 +4112,11 @@ part of the LaTeX required set of packages.") configuration of a base set of packages plus PACKAGES." (let ((default-packages (list texlive-bin - texlive-cm texlive-cm-super texlive-dvips texlive-fontname - texlive-graphics texlive-kpathsea - texlive-latex-base + texlive-latex-bin texlive-latex-fonts texlive-metafont ;; LaTeX packages from the "required" set. @@ -4673,6 +4635,8 @@ corresponding italics: light, regular, medium, bold, ...") "1ahn47kz8a2qdmzdfdgjanf6h5bn8f2rzp1zvwgjpk1plcix8k90"))) (outputs '("out" "doc")) (build-system texlive-build-system) + (arguments (list #:texlive-latex-bin? #f)) + (native-inputs (list texlive-docstrip texlive-pdftex)) (home-page "https://ctan.org/pkg/firstaid") (synopsis "First aid for external LaTeX files and packages that need updating") @@ -7772,7 +7736,7 @@ e-TeX.") (build-system texlive-build-system) (arguments (list - #:texlive-latex-base #f + #:texlive-latex-bin? #f #:create-formats #~(list "etex" "pdfetex" "pdftex"))) (propagated-inputs (list texlive-cm @@ -8733,8 +8697,8 @@ not only with KOMA-Script classes but also with the standard classes.") "0vd90wdjwj5w4g4xka4nms3rgixjw63iwf0hj0v1akcfflwvgn69"))) (outputs '("out" "doc")) (build-system texlive-build-system) - (propagated-inputs - (list texlive-iftex texlive-infwarerr texlive-ltxcmds)) + (arguments (list #:texlive-latex-bin? #f)) + (native-inputs (list texlive-docstrip texlive-pdftex)) (home-page "https://ctan.org/pkg/atbegshi") (synopsis "Execute commands at @code{\\shipout} time") (description @@ -12422,8 +12386,37 @@ compatibility reasons.") "11y6xazv1nk0m2hzsainjr8ijn5cff04xfccm6a65hzg7ipggraj"))) (outputs '("out" "doc")) (build-system texlive-build-system) + ;; Building `texlive-everyshi' requires "latex" format, provided by + ;; `texlive-latex-bin'. However, `texlive-everyshi' is also a propagated + ;; inputs from `texlive-latex-bin'. To work around this cycle, build + ;; a temporary "latex.fmt" format file, and use it to build the package. + ;; At the end of the process, remove that temporary format file. (arguments - (list #:tex-format "latex")) + (list + #:texlive-latex-bin? #f + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'create-latex-format + (lambda* (#:key inputs #:allow-other-keys) + (apply (assoc-ref %standard-phases 'create-formats) + (list #:inputs inputs #:create-formats '("latex"))))) + (replace 'build + (lambda* (#:key inputs build-targets tex-engine #:allow-other-keys) + (apply (assoc-ref %standard-phases 'build) + (list #:inputs inputs + #:build-targets build-targets + #:tex-engine tex-engine + #:tex-format (string-append (getcwd) + "/web2c/pdftex/latex"))))) + (add-after 'build 'remove-latex-format + (lambda _ + (delete-file-recursively "web2c")))))) + (native-inputs + (list texlive-l3kernel + texlive-l3packages + texlive-latex + texlive-latexconfig + texlive-tex-ini-files)) (home-page "https://ctan.org/pkg/everyshi") (synopsis "Take action at every @code{\\shipout}") (description diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm index e68cb875898..19bf459dc21 100644 --- a/guix/build-system/texlive.scm +++ b/guix/build-system/texlive.scm @@ -88,24 +88,24 @@ level package ID." (let ((tex-mod (resolve-interface '(gnu packages tex)))) (module-ref tex-mod 'texlive-bin))) -(define (default-texlive-latex-base) - "Return the default texlive-latex-base package." +(define (texlive-latex-bin) + "Return the default texlive-latex-bin package." ;; Lazily resolve the binding to avoid a circular dependency. (let ((tex-mod (resolve-interface '(gnu packages tex)))) - (module-ref tex-mod 'texlive-latex-base))) + (module-ref tex-mod 'texlive-latex-bin))) (define* (lower name #:key source inputs native-inputs outputs system target - (texlive-latex-base (default-texlive-latex-base)) + (texlive-latex-bin? #true) (texlive-bin (default-texlive-bin)) #:allow-other-keys #:rest arguments) "Return a bag for NAME." (define private-keywords '(#:target #:inputs #:native-inputs - #:texlive-latex-base #:texlive-bin)) + #:texlive-latex-bin? #:texlive-bin)) (bag (name name) @@ -118,8 +118,8 @@ level package ID." ;; Keep the standard inputs of 'gnu-build-system'. ,@(standard-packages))) (build-inputs `(("texlive-bin" ,texlive-bin) - ,@(if texlive-latex-base - `(("texlive-latex-base" ,texlive-latex-base)) + ,@(if texlive-latex-bin? + `(("texlive-latex-bin" ,(texlive-latex-bin))) '()) ,@native-inputs)) (outputs outputs) -- cgit v1.3 From 7a18bd9e74b56a04ec7e4e120789e91d78830444 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 3 Jul 2023 12:51:49 +0200 Subject: gnu: Rationalize texlive-updmap.cfg and texlive-tiny inputs. TEXLIVE-UPDMAP.CFG and TEXLIVE-TINY should only be used as native inputs. Also remove texlive packages already provided by them. * doc/build.scm (pdf-manual): * gnu/packages/algebra.scm (pari-gp): * gnu/packages/bioinformatics.scm (discrover): (phyml): (velvet): * gnu/packages/chemistry.scm (yaehmop): * gnu/packages/chez.scm (stex-bootstrap): (chez-web): (chez-sockets): * gnu/packages/cran.scm (r-prereg): * gnu/packages/docbook.scm (dblatex): * gnu/packages/emacs-xyz.scm (emacs-auctex): * gnu/packages/engineering.scm (fastcap): * gnu/packages/fsf.scm (book-faif): * gnu/packages/graphviz.scm (dot2tex): * gnu/packages/maths.scm (hypre): * gnu/packages/ocaml.scm (unison): (ocaml-bibtex2html): * gnu/packages/plotutils.scm (asymptote): * gnu/packages/python-xyz.scm (python-nbconvert): (python-pypandoc): * gnu/packages/radio.scm (gnuradio): (libosmo-dsp): * gnu/packages/statistics.scm (r-with-tests): * gnu/packages/tex.scm (texlive-makecmds): (texlive-innerscript): (teximpatient): (texlive-xkeyval): Remove texlive packages already provided by TEXLIVE-UPDMAP.CFG. Don't add TEXLIVE-TINY or TEXLIVE-UPDMAP.CFG as inputs. --- doc/build.scm | 4 +- gnu/packages/algebra.scm | 3 +- gnu/packages/bioinformatics.scm | 20 ++-------- gnu/packages/chemistry.scm | 5 +-- gnu/packages/chez.scm | 20 ++-------- gnu/packages/cran.scm | 2 +- gnu/packages/docbook.scm | 18 +++------ gnu/packages/emacs-xyz.scm | 3 +- gnu/packages/engineering.scm | 2 +- gnu/packages/fsf.scm | 3 -- gnu/packages/graphviz.scm | 3 +- gnu/packages/maths.scm | 82 +++++++++++++++++++---------------------- gnu/packages/ocaml.scm | 10 ++--- gnu/packages/plotutils.scm | 8 +--- gnu/packages/python-xyz.scm | 28 +++++--------- gnu/packages/radio.scm | 11 ++---- gnu/packages/statistics.scm | 10 +---- gnu/packages/tex.scm | 34 +++++------------ 18 files changed, 85 insertions(+), 181 deletions(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/doc/build.scm b/doc/build.scm index 577f900e20e..2cd57b4a92a 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -913,9 +913,7 @@ makeinfo OPTIONS." tar texinfo (texlive-updmap.cfg - (list texlive-ec - texlive-epsf - texlive-texinfo))))))) + (list texlive-epsf texlive-texinfo))))))) (define build (with-imported-modules '((guix build utils)) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index c755bc7060c..896cf1bb9ac 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -236,8 +236,7 @@ the real span of the lattice.") (base32 "03swii601kxnphl6v7wv0rh2xn4rz6xbljzvfw5v9py6w3z5nm63")))) (build-system gnu-build-system) - (native-inputs (list (texlive-updmap.cfg - (list texlive-amsfonts)))) + (native-inputs (list texlive-tiny)) (inputs (list gmp libx11 perl readline)) (arguments '(#:make-flags '("all") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5021eea6c1b..aff5a552e73 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4765,15 +4765,10 @@ data and settings.") (list boost cairo rmath-standalone)) (native-inputs (list (texlive-updmap.cfg - (list texlive-cm - texlive-amsfonts - texlive-doi - texlive-ec + (list texlive-doi texlive-examplep - texlive-hyperref texlive-ms texlive-natbib - texlive-bibtex ;style files used by natbib texlive-pgf ;tikz texlive-verbatimbox)) imagemagick)) @@ -12104,14 +12099,9 @@ programs for inferring phylogenies (evolutionary trees).") autoconf openmpi (texlive-updmap.cfg - (list texlive-amsfonts - texlive-caption + (list texlive-caption texlive-cite - texlive-ec texlive-fancyvrb - texlive-graphics - texlive-grfext - texlive-hyperref texlive-infwarerr texlive-kvoptions texlive-pdftexcmds @@ -17094,11 +17084,7 @@ to an artifact/contaminant file.") (list openmpi zlib)) (native-inputs (list (texlive-updmap.cfg - (list texlive-ec - texlive-graphics - texlive-grfext - texlive-hyperref - texlive-infwarerr + (list texlive-infwarerr texlive-kvoptions texlive-pdftexcmds)))) (home-page "https://www.ebi.ac.uk/~zerbino/velvet/") diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 95c5905cf3c..bee540bc168 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -900,10 +900,7 @@ emphasis on quality rather than speed.") (native-inputs (list gfortran (texlive-updmap.cfg - (list texlive-ec - texlive-epstopdf - texlive-geometry - texlive-graphics + (list texlive-epstopdf texlive-latexmk)))) (home-page "https://github.com/greglandrum/yaehmop") (synopsis "Perform extended Hückel calculations") diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 86dd47d2ec0..99c8dcac3a6 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -759,13 +759,7 @@ Chez Scheme."))) ;; though it would probably be easy to add. (propagated-inputs (list xorg-rgb - (texlive-updmap.cfg - (list texlive-bibtex - texlive-ec - texlive-epsf - texlive-hyperref - texlive-l3backend - texlive-oberdiek)) + (texlive-updmap.cfg (list texlive-epsf)) ghostscript netpbm)) ;; Debian uses a versionless path for STEXLIB, @@ -1018,14 +1012,8 @@ create compilers, making them easier to understand and maintain.") ;; mktexpk: don't know how to create bitmap font for bchr8r ;; Replacing the following with `texlive` fixes it. ;; What is missing? - (texlive-updmap.cfg (list texlive-oberdiek - texlive-epsf - texlive-metapost - texlive-charter - texlive-pdftex - texlive-context - texlive-cm - texlive-plain)))) + (texlive-updmap.cfg + (list texlive-context texlive-epsf texlive-metapost)))) (arguments (list #:make-flags @@ -1079,7 +1067,7 @@ programming in Scheme.") (native-inputs (list (chez-scheme-for-system) chez-web - (texlive-updmap.cfg (list texlive-pdftex)))) + texlive-tiny)) (arguments (list #:tests? #f ; no tests diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c4276ea1472..bc2f7acb7fe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -36207,7 +36207,7 @@ package online.") texlive-tools texlive-ulem texlive-upquote - (texlive-updmap.cfg (list texlive-amsfonts texlive-lm)))) + (texlive-updmap.cfg (list texlive-lm)))) (home-page "https://github.com/crsh/prereg") (synopsis "R Markdown Templates to preregister Scientific Studies") diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index f16c8130e4a..ff6d32b168f 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -534,38 +534,30 @@ the in DocBook SGML DTDs.") (build-system python-build-system) ;; TODO: Add xfig/transfig for fig2dev utility (inputs - `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts - texlive-anysize + `(("texlive" ,(texlive-updmap.cfg (list texlive-anysize texlive-appendix - texlive-bookmark texlive-changebar - texlive-colortbl texlive-fancybox - texlive-fancyhdr texlive-fancyvrb texlive-float texlive-footmisc - texlive-hyperref texlive-jknapltx texlive-listings texlive-multirow texlive-overpic texlive-pdfpages texlive-refcount - texlive-subfigure - texlive-titlesec - texlive-wasysym - texlive-rsfs texlive-stmaryrd - - texlive-iftex))) + texlive-subfigure + texlive-titlesec + texlive-wasysym))) ("imagemagick" ,imagemagick) ;for convert ("inkscape" ,inkscape/stable) ;for svg conversion ("docbook" ,docbook-xml) ("libxslt" ,libxslt))) ;for xsltproc (arguments - `(;; Using setuptools causes an invalid "package_base" path in + `( ;; Using setuptools causes an invalid "package_base" path in ;; out/bin/.dblatex-real due to a missing leading '/'. This is caused ;; by dblatex's setup.py stripping the root path when creating the ;; script. (dblatex's setup.py still uses distutils and thus has to diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 748add0caee..39c539afe7b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3985,8 +3985,7 @@ as a library for other Emacs packages.") (native-inputs (list perl)) (inputs - (list ghostscript - (texlive-updmap.cfg (list texlive-amsfonts)))) + (list ghostscript)) (home-page "https://www.gnu.org/software/auctex/") (synopsis "Integrated environment for TeX") (description diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 4499d9e07cb..8ee8e99b343 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -578,7 +578,7 @@ featuring various improvements and bug fixes."))) ;; FIXME: with texlive-tiny 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 (list texlive-amsfonts))) + `(("texlive" ,texlive-tiny) ("ghostscript" ,ghostscript))) (arguments `(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all") diff --git a/gnu/packages/fsf.scm b/gnu/packages/fsf.scm index b07ad141648..e952978bbf9 100644 --- a/gnu/packages/fsf.scm +++ b/gnu/packages/fsf.scm @@ -39,12 +39,9 @@ (native-inputs (list (texlive-updmap.cfg (list texlive-caption - texlive-ec texlive-endnotes texlive-fncychap - texlive-geometry texlive-helvetic - texlive-hyperref texlive-times texlive-ucs)))) (arguments diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 08dd73b24f6..b91c365e3c5 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -382,8 +382,7 @@ graphs in Graphviz's DOT language, written in pure Python.") (native-inputs (list python-pytest (texlive-updmap.cfg - (list texlive-geometry - texlive-pgf + (list texlive-pgf texlive-preview texlive-pstricks texlive-xcolor diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5083b5bb6bd..27ded198d0d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5777,50 +5777,44 @@ set.") python python-breathe python-sphinx - (texlive-updmap.cfg (list texlive-adjustbox - texlive-alphalph - texlive-amsfonts - texlive-bibtex - texlive-capt-of - texlive-caption - texlive-cm - texlive-cmap - texlive-colortbl - texlive-courier - texlive-enumitem - texlive-etoc - texlive-etoolbox - texlive-fancyhdr - texlive-fancyvrb - texlive-float - texlive-fncychap - texlive-framed - texlive-geometry - texlive-hanging - texlive-helvetic - texlive-hyperref - texlive-jknapltx - texlive-latexmk - texlive-listofitems - texlive-multirow - texlive-natbib - texlive-needspace - texlive-newunicodechar - texlive-parskip - texlive-sectsty - texlive-stackengine - texlive-tabulary - texlive-tex-gyre - texlive-titlesec - texlive-tocloft - texlive-ulem - texlive-upquote - texlive-varwidth - texlive-wasy - texlive-wasysym - texlive-wrapfig - texlive-xcolor - texlive-xypic)))) + (texlive-updmap.cfg + (list texlive-adjustbox + texlive-alphalph + texlive-capt-of + texlive-caption + texlive-cmap + texlive-courier + texlive-enumitem + texlive-etoc + texlive-etoolbox + texlive-fancyvrb + texlive-float + texlive-fncychap + texlive-framed + texlive-hanging + texlive-helvetic + texlive-jknapltx + texlive-latexmk + texlive-listofitems + texlive-multirow + texlive-natbib + texlive-needspace + texlive-newunicodechar + texlive-parskip + texlive-sectsty + texlive-stackengine + texlive-tabulary + texlive-tex-gyre + texlive-titlesec + texlive-tocloft + texlive-ulem + texlive-upquote + texlive-varwidth + texlive-wasy + texlive-wasysym + texlive-wrapfig + texlive-xcolor + texlive-xypic)))) (inputs (list openblas lapack)) (arguments diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e919c409737..bc09b111ab6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1377,8 +1377,7 @@ libpanel, librsvg and quartz.") `(("ocaml" ,ocaml-4.09) ;; For documentation ("ghostscript" ,ghostscript) - ("texlive" ,(texlive-updmap.cfg - (list texlive-ec texlive-l3backend))) + ("texlive" ,texlive-tiny) ("hevea" ,hevea) ("lynx" ,lynx) ("which" ,which))) @@ -10258,12 +10257,9 @@ SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.") (setenv "HOME" (getcwd))))))) (native-inputs (list (texlive-updmap.cfg - (list texlive-bibtex - texlive-hyperref - texlive-infwarerr + (list texlive-infwarerr texlive-kvoptions - texlive-pdftexcmds - texlive-preprint)) + texlive-pdftexcmds)) which)) (propagated-inputs (list hevea)) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 00ddd34355f..06ffa95532c 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -307,18 +307,12 @@ colors, styles, options and details.") rapidjson texinfo ;for generating documentation (texlive-updmap.cfg - (list texlive-amsfonts - texlive-ec - texlive-epsf + (list texlive-epsf texlive-etoolbox - texlive-geometry - texlive-grfext - texlive-hyperref texlive-infwarerr texlive-kvdefinekeys texlive-kvoptions texlive-media9 - texlive-oberdiek ;for ifluatex texlive-ocgx2 texlive-parskip texlive-pdftexcmds diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac560bfcfdd..2d8a942309e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15200,17 +15200,15 @@ time.") texlive-ulem texlive-unicode-math texlive-xcolor - (texlive-updmap.cfg (list texlive-amsfonts - texlive-amsmath - texlive-eurosym - texlive-jknapltx - texlive-lm - texlive-lm-math - texlive-mathpazo - texlive-oberdiek - texlive-rsfs - texlive-ucs - texlive-zapfding)))) + (texlive-updmap.cfg + (list texlive-eurosym + texlive-jknapltx + texlive-lm + texlive-lm-math + texlive-mathpazo + texlive-rsfs + texlive-ucs + texlive-zapfding)))) (home-page "https://jupyter.org") (synopsis "Converting Jupyter Notebooks") (description "The @code{nbconvert} tool, @code{jupyter nbconvert}, converts @@ -29190,13 +29188,7 @@ By default it uses the open Python vulnerability database Safety DB.") (propagated-inputs `(("wheel" ,python-wheel))) (native-inputs - `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts - texlive-ec - texlive-iftex - texlive-hyperref - texlive-lm - texlive-oberdiek - texlive-xcolor))))) + `(("texlive" ,(texlive-updmap.cfg (list texlive-lm texlive-xcolor))))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 0ef9896de9d..43c9f22c660 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -709,10 +709,8 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") python-pyzmq python-scipy python-sphinx - (texlive-updmap.cfg (list texlive-amsfonts - texlive-amsmath - ;; TODO: Add newunicodechar. - texlive-graphics)) + texlive-tiny + (texlive-updmap.cfg (list texlive-newunicodechar)) xorg-server-for-tests)) (inputs (list alsa-lib @@ -919,10 +917,7 @@ to access different radio hardware.") ("doxygen" ,doxygen) ("libtool" ,libtool) ("pkg-config" ,pkg-config) - ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts - texlive-amsmath - ;; TODO: Add newunicodechar. - texlive-graphics))))) + ("texlive" ,(texlive-updmap.cfg (list texlive-newunicodechar))))) (inputs (list fftwf)) (arguments diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1cea3afda5e..51c41bb0b8e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -389,17 +389,9 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ pkg-config texinfo ; for building HTML manuals (texlive-updmap.cfg - (list texlive-ae - texlive-amsfonts - texlive-ec - texlive-fancyvrb - texlive-grfext - texlive-hyperref + (list texlive-fancyvrb texlive-inconsolata - texlive-oberdiek - texlive-tools texlive-upquote - texlive-url texlive-xkeyval)) tzdata-for-tests xz)) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 47bbc243a68..39695080a4e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8243,10 +8243,7 @@ diagrams.") "05y5n265in7mrbpgjxqg339l8r8dmp6lvl4k528pr3rkb8z94qaf"))) (outputs '("out" "doc")) (build-system texlive-build-system) - (native-inputs - (list (texlive-updmap.cfg - (list texlive-amsfonts - texlive-cm)))) + (native-inputs (list texlive-tiny)) (home-page "https://www.ctan.org/pkg/makecmds") (synopsis "TeX macro to define or redefine a command") (description "The package provides a @code{\\makecommand} command, which @@ -9487,13 +9484,9 @@ TeX, and LaTeX font definition and other relevant files.") (("\\DocInput\\{innerscript.dtx\\}") ""))))))) (native-inputs (list (texlive-updmap.cfg - (list texlive-amsfonts - texlive-booktabs - texlive-epstopdf-pkg + (list texlive-booktabs texlive-etoolbox - texlive-geometry texlive-hypdoc - texlive-hyperref texlive-infwarerr texlive-kvoptions texlive-microtype @@ -11531,13 +11524,13 @@ and PostScript specials. A working TeX installation is needed.") (("timestamp.*%") (string-append "timestamp{" ,version "}")))))))) - (native-inputs (list autoconf automake - (texlive-updmap.cfg (list texlive-amsfonts - texlive-palatino - texlive-zapfding - texlive-knuth-lib - texlive-mflogo-font - texlive-pdftex)))) + (native-inputs + (list autoconf + automake + (texlive-updmap.cfg + (list texlive-mflogo-font + texlive-palatino + texlive-zapfding)))) (home-page "https://www.gnu.org/software/teximpatient/") (synopsis "Book on TeX, plain TeX and Eplain") (description @@ -11603,8 +11596,6 @@ and Karl Berry.") qtbase-5 qtsvg-5 zlib)) - (propagated-inputs - (list (texlive-updmap.cfg (list texlive-ec)))) (native-inputs (list python pkg-config)) (home-page "https://www.lyx.org/") @@ -13928,13 +13919,9 @@ facilities of @code{tabu} in a modified @code{longtable} environment.") "usepackage[dvips]{xcolor}"))))))) (native-inputs (list (texlive-updmap.cfg - (list texlive-ec - texlive-footmisc + (list texlive-footmisc texlive-fourier - texlive-graphics-def texlive-hypdoc - texlive-hyperref - texlive-iftex texlive-infwarerr texlive-kvoptions texlive-listings @@ -13942,7 +13929,6 @@ facilities of @code{tabu} in a modified @code{longtable} environment.") texlive-pgf texlive-pst-text texlive-pstricks - texlive-url texlive-xcolor)))) (home-page "https://ctan.org/pkg/xkeyval") (synopsis "Extension of the @code{keyval} package") -- cgit v1.3 From 582ec648c9986a0e267a07da59c9f9712805610d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 3 Jul 2023 19:11:24 +0200 Subject: gnu: asymptote: Fix build. * gnu/packages/plotutils.scm (asymptote)[native-inputs]: Add TEXLIVE-HYPDOC. --- gnu/packages/plotutils.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/plotutils.scm') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 06ffa95532c..fde3e5bd5c7 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -309,6 +309,7 @@ colors, styles, options and details.") (texlive-updmap.cfg (list texlive-epsf texlive-etoolbox + texlive-hypdoc texlive-infwarerr texlive-kvdefinekeys texlive-kvoptions -- cgit v1.3