gnu: Replace uses of texlive-*-amsfonts.

* gnu/packages/algebra.scm (pari-gp)[native-inputs]: Replace
texlive-fonts-amsfonts and texlive-latex-amsfonts with texlive-amsfonts in
texlive-union.
* gnu/packages/docbook.scm (dblatex)[inputs]: Same.
* gnu/packages/plotutils.scm (asymptote)[native-inputs]: Same.
* gnu/packages/python-xyz.scm (python-numpy-documentation,
python-matplotlib-documentation, python-ipython-documentation)
[native-inputs]: Same.
* gnu/packages/statistics.scm (r-with-tests)[native-inputs]: Same.
* gnu/packages/tex.scm (teximpatient)[native-inputs]: Same.
This commit is contained in:
Ricardo Wurmus 2019-07-15 19:30:57 +02:00
parent 82ff725df9
commit f75aa97f95
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
6 changed files with 10 additions and 18 deletions

View file

@ -236,8 +236,7 @@ (define-public pari-gp
(build-system gnu-build-system)
(native-inputs
`(("texlive" ,(texlive-union
(list texlive-fonts-amsfonts
texlive-latex-amsfonts)))))
(list texlive-amsfonts)))))
(inputs `(("gmp" ,gmp)
("libx11" ,libx11)
("perl" ,perl)

View file

@ -195,7 +195,7 @@ (define-public dblatex
(build-system python-build-system)
;; TODO: Add xfig/transfig for fig2dev utility
(inputs
`(("texlive" ,(texlive-union (list texlive-latex-amsfonts
`(("texlive" ,(texlive-union (list texlive-amsfonts
texlive-latex-anysize
texlive-latex-appendix
texlive-latex-changebar
@ -219,7 +219,6 @@ (define-public dblatex
texlive-latex-url
texlive-latex-wasysym
texlive-fonts-amsfonts
texlive-fonts-ec
texlive-fonts-rsfs
texlive-fonts-stmaryrd

View file

@ -198,8 +198,7 @@ (define-public asymptote
("perl" ,perl)
("texinfo" ,texinfo) ;For generating documentation
;; For the manual and the tests.
("texlive" ,(texlive-union (list texlive-fonts-amsfonts
texlive-latex-amsfonts
("texlive" ,(texlive-union (list texlive-amsfonts
texlive-latex-geometry
texlive-latex-graphics
texlive-latex-oberdiek ; for ifluatex

View file

@ -3495,12 +3495,11 @@ (define-public python-numpy-documentation
("pkg-config" ,pkg-config)
("python-sphinx" ,python-sphinx)
("python-numpydoc" ,python-numpydoc)
("texlive" ,(texlive-union (list texlive-fonts-amsfonts
texlive-fonts-cm-super
("texlive" ,(texlive-union (list texlive-fonts-cm-super
texlive-fonts-ec
texlive-generic-ifxetex
texlive-generic-pdftex
texlive-latex-amsfonts
texlive-amsfonts
texlive-latex-capt-of
texlive-latex-cmap
texlive-latex-environ
@ -3899,7 +3898,7 @@ (define-public python-matplotlib-documentation
("python-ipykernel" ,python-ipykernel)
("python-mock" ,python-mock)
("graphviz" ,graphviz)
("texlive" ,(texlive-union (list texlive-latex-amsfonts
("texlive" ,(texlive-union (list texlive-amsfonts
texlive-latex-amsmath
texlive-latex-enumitem
texlive-latex-expdlist
@ -3910,7 +3909,6 @@ (define-public python-matplotlib-documentation
texlive-generic-pdftex
texlive-fonts-amsfonts
texlive-fonts-ec
texlive-fonts-adobe-times
texlive-fonts-txfonts)))
@ -5467,11 +5465,10 @@ (define-public python-ipython-documentation
`(("python-sphinx" ,python-sphinx)
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
;; FIXME: It's possible that a smaller union would work just as well.
("texlive" ,(texlive-union (list texlive-fonts-amsfonts
("texlive" ,(texlive-union (list texlive-amsfonts
texlive-fonts-ec
texlive-generic-ifxetex
texlive-generic-pdftex
texlive-latex-amsfonts
texlive-latex-capt-of
texlive-latex-cmap
texlive-latex-environ

View file

@ -319,9 +319,8 @@ (define r-with-tests
("perl" ,perl)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ; for building HTML manuals
("texlive" ,(texlive-union (list texlive-fonts-amsfonts
texlive-fonts-ec
texlive-latex-amsfonts
("texlive" ,(texlive-union (list texlive-fonts-ec
texlive-amsfonts
texlive-latex-base
texlive-latex-fancyvrb
texlive-latex-graphics

View file

@ -6646,8 +6646,7 @@ (define-public teximpatient
(delete-file "book.pdf")
#t)))))
(native-inputs
`(("texlive" ,(texlive-union (list texlive-latex-amsfonts
texlive-fonts-amsfonts
`(("texlive" ,(texlive-union (list texlive-amsfonts
texlive-fonts-adobe-palatino
texlive-fonts-adobe-zapfding
texlive-fonts-knuth-lib