diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2020-12-27 12:05:24 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2020-12-27 12:06:49 +0100 |
| commit | 5aae614868b8a7e3097ae70f6024352aa5c8de21 (patch) | |
| tree | d0ec0f75455e2c4615a0c47fe03b9af960bc7e41 /tests | |
| parent | 649786f0cbd69083c7ae33ae1d441c19b68fc0ab (diff) | |
| download | guix-5aae614868b8a7e3097ae70f6024352aa5c8de21.tar.gz | |
import/utils: alist->package: Handle SPDX license names only as fallback.
Fixes <https://bugs.gnu.org/45453>.
* guix/import/utils.scm (alist->package): Find plain license names in (guix
licenses) first, and only fall back to SPDX names on error.
* tests/import-utils.scm ("alist->package with SPDX license name 1/2",
"alist->package with SPDX license name 2/2"): New tests.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/import-utils.scm | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/tests/import-utils.scm b/tests/import-utils.scm index 2357ea5c40..874816442e 100644 --- a/tests/import-utils.scm +++ b/tests/import-utils.scm @@ -122,6 +122,38 @@ (or (package-license (alist->package meta)) 'license-is-false))) +(test-equal "alist->package with SPDX license name 1/2" ;<https://bugs.gnu.org/45453> + license:expat + (let* ((meta '(("name" . "hello") + ("version" . "2.10") + ("source" . (("method" . "url-fetch") + ("uri" . "mirror://gnu/hello/hello-2.10.tar.gz") + ("sha256" . + (("base32" . + "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"))))) + ("build-system" . "gnu") + ("home-page" . "https://gnu.org") + ("synopsis" . "Say hi") + ("description" . "This package says hi.") + ("license" . "expat")))) + (package-license (alist->package meta)))) + +(test-equal "alist->package with SPDX license name 2/2" ;<https://bugs.gnu.org/45453> + license:expat + (let* ((meta '(("name" . "hello") + ("version" . "2.10") + ("source" . (("method" . "url-fetch") + ("uri" . "mirror://gnu/hello/hello-2.10.tar.gz") + ("sha256" . + (("base32" . + "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"))))) + ("build-system" . "gnu") + ("home-page" . "https://gnu.org") + ("synopsis" . "Say hi") + ("description" . "This package says hi.") + ("license" . "MIT")))) + (package-license (alist->package meta)))) + (test-equal "alist->package with dependencies" `(("gettext" ,(specification->package "gettext"))) (let* ((meta '(("name" . "hello") |