07/10: import: opam: Generate license for package.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 3f5bc6cbb34e1b57829ce3bf482310c49f03d3c3
Author: Xinglu Chen <public@yoctocell.xyz>
AuthorDate: Mon May 24 23:24:28 2021 +0200

    import: opam: Generate license for package.
    
    * guix/import/opam.scm (opam->guix-package): Generate license for the
    ‘license’ field.
    * tests/opam.scm (test-opam-file): Update accordingly.
    ("opam->guix-package"): Likewise.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/import/opam.scm | 4 +++-
 tests/opam.scm       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/guix/import/opam.scm b/guix/import/opam.scm
index 670973b..0201376 100644
--- a/guix/import/opam.scm
+++ b/guix/import/opam.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -335,7 +336,8 @@ or #f on failure."
                        (home-page ,(metadata-ref opam-content "homepage"))
                        (synopsis ,(metadata-ref opam-content "synopsis"))
                        (description ,(metadata-ref opam-content "description"))
-                       (license #f))
+                       (license ,(spdx-string->license
+                                  (metadata-ref opam-content "license"))))
                     (filter
                       (lambda (name)
                         (not (member name '("dune" "jbuilder"))))
diff --git a/tests/opam.scm b/tests/opam.scm
index 11984b5..f1e3b70 100644
--- a/tests/opam.scm
+++ b/tests/opam.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -55,6 +56,7 @@ depends: [
 synopsis: \"Some example package\"
 description: \"\"\"
 This package is just an example.\"\"\"
+license: \"BSD-3-Clause\"
 url {
   src: \"https://example.org/foo-1.0.0.tar.gz\";
   checksum: \"md5=74c6e897658e820006106f45f736381f\"
@@ -109,7 +111,7 @@ url {
                    ('home-page "https://example.org/";)
                    ('synopsis "Some example package")
                    ('description "This package is just an example.")
-                   ('license #f))
+                   ('license 'license:bsd-3))
                  (string=? (bytevector->nix-base32-string
                             test-source-hash)
                            hash))