aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-01-14 22:13:34 +0100
committerRicardo Wurmus <rekado@elephly.net>2019-01-15 13:05:22 +0100
commitd7da23721a62af33e8573d306061b973b44f5c67 (patch)
tree9cb3a955dca796e79b02b7e99a7c56ce002d3fda
parentbfcb9d4dbf8da28dac749f4e97024a089f3bee56 (diff)
downloadguix-d7da23721a62af33e8573d306061b973b44f5c67.tar
guix-d7da23721a62af33e8573d306061b973b44f5c67.tar.gz
gnu: texlive-union: Implement in terms of texlive-base.
* gnu/packages/tex.scm (texlive-union): Inherit from texlive-base.
-rw-r--r--gnu/packages/tex.scm25
1 files changed, 5 insertions, 20 deletions
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f19a9e7a1b..9aa297f141 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1866,31 +1866,15 @@ It includes little more than the required set of LaTeX packages.")
'()
default-packages)))))
+;; For use in package definitions only
(define-public texlive-union
(lambda* (#:optional (packages '()))
"Return 'texlive-union' package which is a union of PACKAGES and the
standard LaTeX packages."
- (let ((default-packages
- (list texlive-bin
- texlive-dvips
- texlive-fontname
- texlive-fonts-cm
- texlive-fonts-latex
- texlive-metafont-base
- texlive-latex-base
- ;; LaTeX packages from the "required" set.
- texlive-latex-amsmath
- texlive-latex-amscls
- texlive-latex-babel
- texlive-generic-babel-english
- texlive-latex-cyrillic
- texlive-latex-graphics
- texlive-latex-psnfss
- texlive-latex-tools)))
- (package
+ (let ((default-packages (match (package-propagated-inputs texlive-base)
+ (((labels packages) ...) packages))))
+ (package (inherit texlive-base)
(name "texlive-union")
- (version (number->string %texlive-revision))
- (source #f)
(build-system trivial-build-system)
(arguments
'(#:modules ((guix build union)
@@ -1954,6 +1938,7 @@ distribution.")
'()
(append default-packages packages)))))))
+;; For use in package definitions only
(define-public texlive-tiny
(package
(inherit (texlive-union))