diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2023-05-17 10:57:23 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2023-07-18 18:10:25 +0200 |
| commit | 3fc925aa84901072a1fc9a1d05b1b3efc24c47e2 (patch) | |
| tree | 53d0839d6b954a062c4ae82b75766242187f59bf /guix | |
| parent | 308b3e83c3dc65987f7187e55b2fa549147882d1 (diff) | |
| download | guix-3fc925aa84901072a1fc9a1d05b1b3efc24c47e2.tar.gz | |
guix: import: Fix multiple licenses output in texlive importer.
* guix/import/texlive.scm (string->license): Add missing case and try first to
split license strings before giving up.
* tests/texlive.scm (%fake-tlpdb): Add test data.
("texlive->guix-package, multiple licenses"): New test.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/import/texlive.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 31abf533c4..33a0e7d1d9 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -109,7 +109,8 @@ ("cc-by-nc-nd-2.5" 'non-free) ("cc-by-nc-nd-3" 'non-free) ("cc-by-nc-nd-4" 'non-free) - ((x) (string->license x)) + ((? string? x) (string->license (string-split x #\space))) + ((x) `(error unknown-license ,x)) ((lst ...) `(list ,@(map string->license lst))) (x `(error unknown-license ,x)))) |