[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: guix: profiles: Do not raise error on incomplete
From: |
guix-commits |
Subject: |
branch master updated: guix: profiles: Do not raise error on incomplete TeX Live setups. |
Date: |
Wed, 09 Aug 2023 12:28:15 -0400 |
This is an automated email from the git hooks/post-receive script.
ngz pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 3481a5cb37 guix: profiles: Do not raise error on incomplete TeX Live
setups.
3481a5cb37 is described below
commit 3481a5cb37cacbb54f74a2b1fa52ffc5c972b09f
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Wed Aug 9 10:45:42 2023 +0200
guix: profiles: Do not raise error on incomplete TeX Live setups.
* guix/profiles.scm (texlive-font-maps): Check if TEXLIVE-SCRIPTS is present
in the manifest before trying to generate font maps.
---
guix/profiles.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/guix/profiles.scm b/guix/profiles.scm
index c62d7f4d22..2bd6477cf8 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1787,6 +1787,11 @@ MANIFEST."
(cons (gexp-input thing output)
(append-map entry->texlive-input deps))
'()))))
+ (define texlive-scripts-entry?
+ (match-lambda
+ (($ <manifest-entry> name version output thing deps)
+ (or (string=? "texlive-scripts" name)
+ (any texlive-scripts-entry? deps)))))
(define texlive-inputs
(append-map entry->texlive-input (manifest-entries manifest)))
(define texlive-scripts
@@ -1887,9 +1892,11 @@ MANIFEST."
(copy-recursively a b)
(invoke mktexlsr b)
(install-file (string-append b "/ls-R") a))))))
-
(with-monad %store-monad
- (if (pair? texlive-inputs)
+ ;; `texlive-scripts' brings essential files to generate font maps.
+ ;; Therefore, it must be present in the profile. This check prevents
+ ;; incomplete modular TeX Live installations to generate errors.
+ (if (any texlive-scripts-entry? (manifest-entries manifest))
(gexp->derivation "texlive-font-maps" build
#:substitutable? #f
#:local-build? #t
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: guix: profiles: Do not raise error on incomplete TeX Live setups.,
guix-commits <=