[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
361/416: gnu: simple-texlive-package: Turn it into a stub.
From: |
guix-commits |
Subject: |
361/416: gnu: simple-texlive-package: Turn it into a stub. |
Date: |
Sun, 28 May 2023 02:33:33 -0400 (EDT) |
ngz pushed a commit to branch tex-team-next
in repository guix.
commit c65533b7594640ff1dc31299ee23a5d54c02245a
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)
- 348/416: gnu: texlive-hyphen-base: Refresh package definition., (continued)
- 348/416: gnu: texlive-hyphen-base: Refresh package definition., guix-commits, 2023/05/28
- 353/416: gnu: Add texlive-manfnt-font., guix-commits, 2023/05/28
- 351/416: gnu: texlive-dvipdfmx: Refresh package definition., guix-commits, 2023/05/28
- 350/416: gnu: texlive-dvips: Refresh package definition., guix-commits, 2023/05/28
- 354/416: gnu: Add texlive-mptopdf., guix-commits, 2023/05/28
- 360/416: gnu: texlive-tetex: Refresh package definition., guix-commits, 2023/05/28
- 363/416: gnu: texlive-amsmath: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 365/416: gnu: texlive-catchfile: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 366/416: gnu: texlive-tabu: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 369/416: gnu: texlive-pagenote: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 361/416: gnu: simple-texlive-package: Turn it into a stub.,
guix-commits <=
- 370/416: gnu: texlive-titling: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 371/416: gnu: texlive-grfext: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 372/416: gnu: texlive-qrcode: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 373/416: gnu: texlive-unicode-math: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 379/416: gnu: texlive-babel-polish: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 381/416: gnu: texlive-breqn: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 384/416: gnu: texlive-soul: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 383/416: gnu: texlive-lastpage: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 385/416: gnu: texlive-soulutf8: Remove SIMPLE-TEXLIVE-PACKAGE call., guix-commits, 2023/05/28
- 390/416: guix: import: Handle native inputs in texlive importer., guix-commits, 2023/05/28