summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-01-13 22:26:23 +0100
committerLudovic Courtès <ludo@gnu.org>2022-01-13 23:11:19 +0100
commit641b599d0bd1902abeab19e286cdd6c368f8daa3 (patch)
tree7f162e6a7d363919ddb9b13b4bba2de182abddd7
parentb1fc98d6b063a117fe2bcc19a60c8b9a48301593 (diff)
downloadguix-641b599d0bd1902abeab19e286cdd6c368f8daa3.tar.gz
import: texlive: Remove labels from 'propagated-inputs' field.
* guix/import/texlive.scm (tlpdb->package): Remove labels from
'propagated-inputs' field.
* tests/texlive.scm ("texlive->guix-package"): Adjust accordingly.
-rw-r--r--guix/import/texlive.scm8
-rw-r--r--tests/texlive.scm10
2 files changed, 9 insertions, 9 deletions
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index d5021669be..77b3c6380c 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -239,10 +239,10 @@
         ,@(or (and=> (assoc-ref data 'depend)
                      (lambda (inputs)
                        `((propagated-inputs
-                          ,(map (lambda (tex-name)
-                                  (let ((name (guix-name tex-name)))
-                                    (list name (list 'unquote (string->symbol name)))))
-                                inputs)))))
+                          (list ,@(map (lambda (tex-name)
+                                         (let ((name (guix-name tex-name)))
+                                           (string->symbol name)))
+                                       inputs))))))
               '())
         ,@(or (and=> (assoc-ref data 'catalogue-ctan)
                      (lambda (url)
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 5ddd991767..f718e3a0a0 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -185,11 +185,11 @@ completely compatible with Plain TeX.")
                           ('base32 (? string? hash))
                           #:trivial? #t))
                ('propagated-inputs
-                (("texlive-cm" ',texlive-cm)
-                 ("texlive-hyphen-base" ',texlive-hyphen-base)
-                 ("texlive-knuth-lib" ',texlive-knuth-lib)
-                 ("texlive-plain" ',texlive-plain)
-                 ("texlive-tex" ',texlive-tex)))
+                ('list 'texlive-cm
+                       'texlive-hyphen-base
+                       'texlive-knuth-lib
+                       'texlive-plain
+                       'texlive-tex))
                ('home-page "https://www.tug.org/texlive/")
                ('synopsis "Plain TeX macros for Physicists")
                ('description (? string? description))