[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
367/421: gnu: simple-texlive-package: Turn it into a stub.
From: |
guix-commits |
Subject: |
367/421: gnu: simple-texlive-package: Turn it into a stub. |
Date: |
Sun, 28 May 2023 01:30:29 -0400 (EDT) |
ngz pushed a commit to branch tex-team-next
in repository guix.
commit 7ff1ef7bfc20ce01943b345a6ab6818eff4a8eeb
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Thu May 18 11:30:19 2023 +0200
gnu: simple-texlive-package: Turn it into a stub.
No texlive package makes use of #:TRIVIAL? keyword anymore. This function
now
always use TEXLIVE-BUILD-SYSTEM until is can be completely removed.
* gnu/packages/tex.scm (simple-texlive-package): Always use
TEXLIVE-BUILD-SYSTEM.
---
gnu/packages/tex.scm | 46 +++-------------------------------------------
1 file changed, 3 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index eb359a8455..e5ddfa94dd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -107,8 +107,7 @@
#:key trivial?)
"Return a template for a simple TeX Live package with the given NAME,
downloading from a list of LOCATIONS in the TeX Live repository, and expecting
-the provided output HASH. If TRIVIAL? is provided, all files will simply be
-copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used."
+the provided output HASH. The TRIVIAL? keyword is not used."
(set! locations
;; Some locations may be manually inserted, so be tolerant with
;; leading slashes. Ignore them consistently.
@@ -124,47 +123,8 @@ copied to their outputs; otherwise the
TEXLIVE-BUILD-SYSTEM is used."
(name name)
(version (number->string %texlive-revision))
(source (texlive-origin name version locations hash))
- (outputs (if with-documentation?
- '("out" "doc")
- '("out")))
- (build-system (if trivial?
- gnu-build-system
- texlive-build-system))
- (arguments
- (let ((copy-files
- `(lambda* (#:key outputs inputs tex-directory #:allow-other-keys)
- (let (,@(if with-documentation?
- `((doc (string-append (assoc-ref outputs "doc")
- "/share/texmf-dist")))
- '())
- (source (assoc-ref inputs "source"))
- (out (string-append (assoc-ref outputs "out")
- "/share/texmf-dist")))
- ,@(if with-documentation?
- '((mkdir-p doc)
- (copy-recursively
- (string-append source "/doc")
- (string-append doc "/doc")))
- '())
- (mkdir-p out)
- (copy-recursively "." out)
- ;; In any case, if documentation exists, it is already in the
- ;; "doc" output, so remove it from regular one.
- (let ((doc (string-append out "/doc")))
- (when (file-exists? doc)
- (delete-file-recursively doc)))
- ;; Also remove all source files.
- (let ((srcfiles (string-append out "/source")))
- (when (file-exists? srcfiles)
- (delete-file-recursively srcfiles)))))))
- (if trivial?
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (replace 'build (const #t))
- (replace 'install ,copy-files)))
- `())))
+ (outputs (if with-documentation? '("out" "doc") '("out")))
+ (build-system texlive-build-system)
(home-page #f)
(synopsis #f)
(description #f)
- 329/421: gnu: texlive-latexconfig: Refresh package definition., (continued)
- 329/421: gnu: texlive-latexconfig: Refresh package definition., guix-commits, 2023/05/28
- 333/421: gnu: texlive-ruhyphen: Refresh package definition., guix-commits, 2023/05/28
- 334/421: gnu: texlive-ukrhyph: Refresh package definition., guix-commits, 2023/05/28
- 336/421: gnu: texlive-helvetic: Refresh package definition., guix-commits, 2023/05/28
- 341/421: gnu: texlive-knuth-lib: Refresh package definition., guix-commits, 2023/05/28
- 344/421: gnu: texlive-tex-gyre: Refresh package definition., guix-commits, 2023/05/28
- 345/421: gnu: texlive-courier: Refresh package definition., guix-commits, 2023/05/28
- 349/421: gnu: texlive-cbfonts-fd: Refresh package definition., guix-commits, 2023/05/28
- 365/421: gnu: texlive-hyphen-package: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 366/421: gnu: texlive-tetex: Refresh package definition., guix-commits, 2023/05/28
- 367/421: gnu: simple-texlive-package: Turn it into a stub.,
guix-commits <=
- 373/421: gnu: texlive-sectsty: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 378/421: gnu: texlive-qrcode: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 416/421: gnu: texlive-xindy: Use TEXLIVE-BUILD-SYSTEM and related tools., guix-commits, 2023/05/28
- 388/421: gnu: texlive-datatool: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 396/421: guix: import: Handle native inputs in texlive importer., guix-commits, 2023/05/28
- 411/421: gnu: texlive-lh: Fix build., guix-commits, 2023/05/28
- 403/421: gnu: texlive-amsfonts: Fix build., guix-commits, 2023/05/28
- 383/421: gnu: texlive-babel-finnish: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 391/421: gnu: texlive-soulutf8: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 419/421: guix: import: Improve importing texlive meta packages., guix-commits, 2023/05/28