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/bioinformatics.scm | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

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

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 5021eea6c1..aff5a552e7 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/")
-- 
cgit v1.2.3