From 7a18bd9e74b56a04ec7e4e120789e91d78830444 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
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.
---
 gnu/packages/docbook.scm | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'gnu/packages/docbook.scm')

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index f16c8130e4..ff6d32b168 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
-- 
cgit v1.2.3