From dcc5c34504c94732c135a85fb4db40ca9796270e Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Sun, 15 Oct 2023 11:38:18 +0200 Subject: [PATCH] guix: import: opam: Handle list of licenses. Fixes . Reported by Simon Tournier . * guix/import/opam.scm (opam->guix-package): Handle lists of licenses. Signed-off-by: Simon Tournier --- guix/import/opam.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index e67146e593..86e82cde59 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -379,8 +379,10 @@ file names. Return a 'package' sexp or #f on failure." (synopsis ,(metadata-ref opam-content "synopsis")) (description ,(and=> (metadata-ref opam-content "description") beautify-description)) - (license ,(spdx-string->license - (metadata-ref opam-content "license")))) + (license ,(match (metadata-ref opam-content "license") + ((('string-pat strs) ...) + `(list ,@(map spdx-string->license strs))) + ((? string? str) (spdx-string->license str))))) (filter (lambda (name) (not (member name '("dune" "jbuilder"))))