[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
99/111: gnu: Replace uses of texlive-*-amsfonts.
|
From: |
guix-commits |
|
Subject: |
99/111: gnu: Replace uses of texlive-*-amsfonts. |
|
Date: |
Tue, 16 Jul 2019 09:21:12 -0400 (EDT) |
rekado pushed a commit to branch wip-texlive
in repository guix.
commit 03063cc27af991d939c83cf745358bdd7b45497e
Author: Ricardo Wurmus <address@hidden>
Date: Mon Jul 15 19:30:57 2019 +0200
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.
---
gnu/packages/algebra.scm | 3 +--
gnu/packages/docbook.scm | 3 +--
gnu/packages/plotutils.scm | 3 +--
gnu/packages/python-xyz.scm | 11 ++++-------
gnu/packages/statistics.scm | 5 ++---
gnu/packages/tex.scm | 3 +--
6 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 87eadf0..9767ad7 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -236,8 +236,7 @@ the real span of the lattice.")
(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)
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 1e5379b..d114e24 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -195,7 +195,7 @@ by no means limited to these applications.) This package
provides XML DTDs.")
(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 @@ by no means limited to these applications.) This package
provides XML DTDs.")
texlive-latex-url
texlive-latex-wasysym
- texlive-fonts-amsfonts
texlive-fonts-ec
texlive-fonts-rsfs
texlive-fonts-stmaryrd
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index b4ea20e..88bc6b3 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -198,8 +198,7 @@ colors, styles, options and details.")
("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
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index eda21d8..cdf88bd 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3488,12 +3488,11 @@ color scales, and color space conversion easy. It has
support for:
("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
@@ -3905,7 +3904,7 @@ toolkits.")
("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
@@ -3916,7 +3915,6 @@ toolkits.")
texlive-generic-pdftex
- texlive-fonts-amsfonts
texlive-fonts-ec
texlive-fonts-adobe-times
texlive-fonts-txfonts)))
@@ -5451,11 +5449,10 @@ computing.")
`(("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
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index eb5e5b4..6ed1e40 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -319,9 +319,8 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
("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
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f088bb6..32a45e3 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6625,8 +6625,7 @@ develop documents with LaTeX, in a single application.")
(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
- 93/111: gnu: Add texlive-etoolbox., (continued)
- 93/111: gnu: Add texlive-etoolbox., guix-commits, 2019/07/16
- 94/111: gnu: Add texlive-kpathsea., guix-commits, 2019/07/16
- 84/111: gnu: Add texlive-epsf., guix-commits, 2019/07/16
- 85/111: gnu: Add texlive-graphics-def., guix-commits, 2019/07/16
- 82/111: gnu: texlive-fontname: Simplify., guix-commits, 2019/07/16
- 91/111: gnu: Add texlive-seminar., guix-commits, 2019/07/16
- 92/111: gnu: Add texlive-doi., guix-commits, 2019/07/16
- 95/111: gnu: texlive-bin: Include scripts., guix-commits, 2019/07/16
- 86/111: gnu: Add texlive-graphics-cfg., guix-commits, 2019/07/16
- 88/111: gnu: Add texlive-url., guix-commits, 2019/07/16
- 99/111: gnu: Replace uses of texlive-*-amsfonts.,
guix-commits <=
- 87/111: gnu: texlive-latex-graphics: Simplify., guix-commits, 2019/07/16
- 98/111: gnu: Add texlive-amsfonts., guix-commits, 2019/07/16
- 96/111: gnu: texlive-dvips: Update source files., guix-commits, 2019/07/16
- 102/111: gnu: Add texlive-txfonts., guix-commits, 2019/07/16
- 97/111: gnu: texlive-latex-base: Simplify., guix-commits, 2019/07/16
- 106/111: gnu: Add texlive-times., guix-commits, 2019/07/16
- 103/111: gnu: Add texlive-xypic., guix-commits, 2019/07/16
- 109/111: WIP texlive-tlpdb: Init, guix-commits, 2019/07/16
- 100/111: gnu: texlive-fonts-ec: Update license URL., guix-commits, 2019/07/16
- 101/111: gnu: Add texlive-ae., guix-commits, 2019/07/16