[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
40/40: guix: import: opam: Handle list of licenses.
From: |
guix-commits |
Subject: |
40/40: guix: import: opam: Handle list of licenses. |
Date: |
Tue, 17 Oct 2023 08:54:42 -0400 (EDT) |
zimoun pushed a commit to branch master
in repository guix.
commit dcc5c34504c94732c135a85fb4db40ca9796270e
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Sun Oct 15 11:38:18 2023 +0200
guix: import: opam: Handle list of licenses.
Fixes <https://issues.guix.gnu.org/issue/66461>.
Reported by Simon Tournier <zimon.toutoune@gmail.com>.
* guix/import/opam.scm (opam->guix-package): Handle lists of licenses.
Signed-off-by: Simon Tournier <zimon.toutoune@gmail.com>
---
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"))))
- 18/40: scripts: install: Handle EPIPE errors when displaying help., (continued)
- 18/40: scripts: install: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 07/40: scripts: deploy: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 33/40: scripts: size: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 10/40: scripts: download: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 19/40: scripts: lint: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 28/40: scripts: remove: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 36/40: scripts: substitute: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 13/40: scripts: git: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 15/40: scripts: hash: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 37/40: scripts: time-machine: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 40/40: guix: import: opam: Handle list of licenses.,
guix-commits <=
- 04/40: scripts: challenge: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 09/40: scripts: discover: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 20/40: scripts: locate: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 12/40: scripts: gc: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 06/40: scripts: copy: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 02/40: scripts: archive: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 05/40: scripts: container: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 16/40: scripts: home: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17
- 01/40: ui: Handle EPIPE errors when displaying Guix version., guix-commits, 2023/10/17
- 21/40: scripts: offload: Handle EPIPE errors when displaying help., guix-commits, 2023/10/17