[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/12: gnu: texlive-union: Implement in terms of texlive-base.
From: |
guix-commits |
Subject: |
05/12: gnu: texlive-union: Implement in terms of texlive-base. |
Date: |
Tue, 15 Jan 2019 07:05:40 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit d7da23721a62af33e8573d306061b973b44f5c67
Author: Ricardo Wurmus <address@hidden>
Date: Mon Jan 14 22:13:34 2019 +0100
gnu: texlive-union: Implement in terms of texlive-base.
* gnu/packages/tex.scm (texlive-union): Inherit from texlive-base.
---
gnu/packages/tex.scm | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f19a9e7..9aa297f 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))
- branch master updated (ebe0271 -> 743497b), guix-commits, 2019/01/15
- 03/12: gnu: texlive-bin: Add native search paths., guix-commits, 2019/01/15
- 02/12: gnu: texlive-union: Wrap programs weakly., guix-commits, 2019/01/15
- 05/12: gnu: texlive-union: Implement in terms of texlive-base.,
guix-commits <=
- 04/12: gnu: Add texlive-base., guix-commits, 2019/01/15
- 07/12: gnu: Add texlive-fonts-lm., guix-commits, 2019/01/15
- 06/12: gnu: Add texlive-fonts-cm-super., guix-commits, 2019/01/15
- 11/12: gnu: python-numpy-documentation: Add missing packages to texlive-union., guix-commits, 2019/01/15
- 09/12: gnu: texlive-bin: Do not truncate output lines., guix-commits, 2019/01/15
- 12/12: guix: Add profile hook to build TeX live configuration., guix-commits, 2019/01/15
- 08/12: gnu: Add texlive-luatex-luaotfload., guix-commits, 2019/01/15
- 10/12: gnu: texlive-fonts-amsfonts: Install type1 fonts., guix-commits, 2019/01/15
- 01/12: gnu: texlive-latex-fontspec: Install default fontspec.cfg., guix-commits, 2019/01/15