diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-12-05 17:57:35 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-05 17:57:35 +0100 |
commit | 9d5aa009062a49bd035ae33e37f6562526e7d38c (patch) | |
tree | 4ff2302863a5cf9f3cf604240ea793152156f532 /guix/import/texlive.scm | |
parent | 60bd56c6d8368c23dcd97b26501771c82316fc8c (diff) | |
parent | 2c2fc24b899d3286774f60405888718d98211213 (diff) | |
download | guix-patches-9d5aa009062a49bd035ae33e37f6562526e7d38c.tar guix-patches-9d5aa009062a49bd035ae33e37f6562526e7d38c.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/import/texlive.scm')
-rw-r--r-- | guix/import/texlive.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 791b514485..d528aace9a 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -140,7 +140,9 @@ expression describing it." (synopsis (sxml-value '(entry caption *text*))) (version (or (sxml-value '(entry version @ number *text*)) (sxml-value '(entry version @ date *text*)))) - (license (string->license (sxml-value '(entry license @ type *text*)))) + (license (match ((sxpath '(entry license @ type *text*)) sxml) + ((license) (string->license license)) + ((lst ...) (map string->license lst)))) (home-page (string-append "http://www.ctan.org/pkg/" id)) (ref (texlive-ref component id)) (checkout (download-svn-to-store store ref))) @@ -169,7 +171,9 @@ expression describing it." (sxml->string (or (sxml-value '(entry description)) '()))) #\newline))))) - (license ,license))))) + (license ,(match license + ((lst ...) `(list ,@lst)) + (license license))))))) (define texlive->guix-package (memoize |