import: utils: Fix license name mismatches and define CUA-OPL-1.0.

* guix/licenses.scm (cua-opl1.0): New variable.
* guix/import/utils.scm (spdx-string->license): Rename licenses to fit
the internal names and add a notice pointing to guix/licenses.scm.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Helio Machado 2020-10-15 18:32:59 +02:00 committed by Ludovic Courtès
parent 21fdf429a7
commit f045a7a926
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 19 additions and 5 deletions

View file

@ -15,6 +15,7 @@
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2020 André Batista <nandre@riseup.net>
;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -49,6 +50,7 @@
artistic2.0 clarified-artistic
copyleft-next
cpl1.0
cua-opl1.0
edl1.0
epl1.0
epl2.0
@ -117,6 +119,9 @@
;;; https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix
;;; https://www.gnu.org/licenses/license-list
;;;
;;; Please update spdx-string->license from guix/import/utils.scm
;;; when modifying this list to avoid mismatches.
;;;
;;; Code:
(define agpl1
@ -269,6 +274,11 @@ at URI, which may be a file:// URI pointing the package's tree."
"http://directory.fsf.org/wiki/License:CPLv1.0"
"https://www.gnu.org/licenses/license-list#CommonPublicLicense10"))
(define cua-opl1.0
(license "CUA Office Public License v1.0"
"https://spdx.org/licenses/CUA-OPL-1.0.html"
"https://opensource.org/licenses/CUA-OPL-1.0"))
(define edl1.0
(license "EDL 1.0"
"http://directory.fsf.org/wiki/License:EDLv1.0"