From 641b599d0bd1902abeab19e286cdd6c368f8daa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 13 Jan 2022 22:26:23 +0100 Subject: [PATCH] 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. --- guix/import/texlive.scm | 8 ++++---- tests/texlive.scm | 10 +++++----- 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))