diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2023-07-03 12:51:49 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2023-07-18 18:16:47 +0200 |
| commit | 7a18bd9e74b56a04ec7e4e120789e91d78830444 (patch) | |
| tree | 2f245364b9bc842cd22adb37d792c99ba02b3a88 /gnu/packages/docbook.scm | |
| parent | f37146969a2f24530fcdf270b2d19602809cb4ae (diff) | |
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.
Diffstat (limited to 'gnu/packages/docbook.scm')
| -rw-r--r-- | gnu/packages/docbook.scm | 18 |
1 files changed, 5 insertions, 13 deletions
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.") | |||
| 534 | (build-system python-build-system) | 534 | (build-system python-build-system) |
| 535 | ;; TODO: Add xfig/transfig for fig2dev utility | 535 | ;; TODO: Add xfig/transfig for fig2dev utility |
| 536 | (inputs | 536 | (inputs |
| 537 | `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts | 537 | `(("texlive" ,(texlive-updmap.cfg (list texlive-anysize |
| 538 | texlive-anysize | ||
| 539 | texlive-appendix | 538 | texlive-appendix |
| 540 | texlive-bookmark | ||
| 541 | texlive-changebar | 539 | texlive-changebar |
| 542 | texlive-colortbl | ||
| 543 | texlive-fancybox | 540 | texlive-fancybox |
| 544 | texlive-fancyhdr | ||
| 545 | texlive-fancyvrb | 541 | texlive-fancyvrb |
| 546 | texlive-float | 542 | texlive-float |
| 547 | texlive-footmisc | 543 | texlive-footmisc |
| 548 | texlive-hyperref | ||
| 549 | texlive-jknapltx | 544 | texlive-jknapltx |
| 550 | texlive-listings | 545 | texlive-listings |
| 551 | texlive-multirow | 546 | texlive-multirow |
| 552 | texlive-overpic | 547 | texlive-overpic |
| 553 | texlive-pdfpages | 548 | texlive-pdfpages |
| 554 | texlive-refcount | 549 | texlive-refcount |
| 555 | texlive-subfigure | ||
| 556 | texlive-titlesec | ||
| 557 | texlive-wasysym | ||
| 558 | |||
| 559 | texlive-rsfs | 550 | texlive-rsfs |
| 560 | texlive-stmaryrd | 551 | texlive-stmaryrd |
| 561 | 552 | texlive-subfigure | |
| 562 | texlive-iftex))) | 553 | texlive-titlesec |
| 554 | texlive-wasysym))) | ||
| 563 | ("imagemagick" ,imagemagick) ;for convert | 555 | ("imagemagick" ,imagemagick) ;for convert |
| 564 | ("inkscape" ,inkscape/stable) ;for svg conversion | 556 | ("inkscape" ,inkscape/stable) ;for svg conversion |
| 565 | ("docbook" ,docbook-xml) | 557 | ("docbook" ,docbook-xml) |
| 566 | ("libxslt" ,libxslt))) ;for xsltproc | 558 | ("libxslt" ,libxslt))) ;for xsltproc |
| 567 | (arguments | 559 | (arguments |
| 568 | `(;; Using setuptools causes an invalid "package_base" path in | 560 | `( ;; Using setuptools causes an invalid "package_base" path in |
| 569 | ;; out/bin/.dblatex-real due to a missing leading '/'. This is caused | 561 | ;; out/bin/.dblatex-real due to a missing leading '/'. This is caused |
| 570 | ;; by dblatex's setup.py stripping the root path when creating the | 562 | ;; by dblatex's setup.py stripping the root path when creating the |
| 571 | ;; script. (dblatex's setup.py still uses distutils and thus has to | 563 | ;; script. (dblatex's setup.py still uses distutils and thus has to |
