~ruther/guix-local

0c21ec1c7915bdc08c68c66eba411cf533d4e503 — Attila Lendvai 4 years ago da73727
import: utils: Add more licenses and extend their detection.

* guix/import/utils.scm (spdx-string->license): Identify more
licenses (CC-BY-4.0, Freetype, HPND).
* guix/licenses.scm: Add a comment that mentions "MIT" so that people
who grep for MIT end up there.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2 files changed, 5 insertions(+), 0 deletions(-)

M guix/import/utils.scm
M guix/licenses.scm
M guix/import/utils.scm => guix/import/utils.scm +3 -0
@@ 152,6 152,7 @@ of the string VERSION is replaced by the symbol 'version."
    ("CC0-1.0"                     'license:cc0)
    ("CC-BY-2.0"                   'license:cc-by2.0)
    ("CC-BY-3.0"                   'license:cc-by3.0)
    ("CC-BY-4.0"                   'license:cc-by4.0)
    ("CC-BY-SA-2.0"                'license:cc-by-sa2.0)
    ("CC-BY-SA-3.0"                'license:cc-by-sa3.0)
    ("CC-BY-SA-4.0"                'license:cc-by-sa4.0)


@@ 163,6 164,7 @@ of the string VERSION is replaced by the symbol 'version."
    ("EPL-1.0"                     'license:epl1.0)
    ("MIT"                         'license:expat)
    ("FTL"                         'license:freetype)
    ("Freetype"                    'license:freetype)
    ("GFDL-1.1"                    'license:fdl1.1+)
    ("GFDL-1.2"                    'license:fdl1.2+)
    ("GFDL-1.3"                    'license:fdl1.3+)


@@ 179,6 181,7 @@ of the string VERSION is replaced by the symbol 'version."
    ("GPL-3.0-only"                'license:gpl3)
    ("GPL-3.0+"                    'license:gpl3+)
    ("GPL-3.0-or-later"            'license:gpl3+)
    ("HPND"                        'license:hpnd)
    ("ISC"                         'license:isc)
    ("IJG"                         'license:ijg)
    ("Imlib2"                      'license:imlib2)

M guix/licenses.scm => guix/licenses.scm +2 -0
@@ 308,6 308,8 @@ at URI, which may be a file:// URI pointing the package's tree."
           "https://directory.fsf.org/wiki/License:EUPL-1.2"
           "https://www.gnu.org/licenses/license-list#EUPL-1.2"))

;; Some people call it the MIT license. For clarification see:
;; https://www.gnu.org/licenses/license-list.html#Expat
(define expat
  (license "Expat"
           "http://directory.fsf.org/wiki/License:Expat"