diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-11-28 00:38:25 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-28 00:38:25 +0100 |
| commit | 0897ad7fac04fc9d814e83eed46e88c7bf9740bc (patch) | |
| tree | 9bccfdb52de4c468778ceaabe337c0539c302a30 /guix/import/texlive.scm | |
| parent | 6d460e80d1b06fc094374e7ba5c2503f2a897f11 (diff) | |
| parent | 9943d238e9f07dccae973b641eb7738637ce95fb (diff) | |
| download | guix-patches-0897ad7fac04fc9d814e83eed46e88c7bf9740bc.tar guix-patches-0897ad7fac04fc9d814e83eed46e88c7bf9740bc.tar.gz | |
Merge branch 'master' into staging
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 |