From patchwork Tue Nov 2 10:57:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 34212 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 44ADF27BBE3; Tue, 2 Nov 2021 11:05:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 056AC27BBE1 for ; Tue, 2 Nov 2021 11:05:28 +0000 (GMT) Received: from localhost ([::1]:37148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhrba-00064A-TM for patchwork@mira.cbaines.net; Tue, 02 Nov 2021 07:05:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhrWO-0008Cq-0c for guix-patches@gnu.org; Tue, 02 Nov 2021 07:00:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhrWM-0006xS-92 for guix-patches@gnu.org; Tue, 02 Nov 2021 07:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mhrWM-0007Se-7D for guix-patches@gnu.org; Tue, 02 Nov 2021 07:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51566] [PATCH v2] guix: import: Add more licenses and extend their detection. References: <20211102100315.2730-1-attila@lendvai.name> In-Reply-To: <20211102100315.2730-1-attila@lendvai.name> Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Nov 2021 11:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51566 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51566@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 51566-submit@debbugs.gnu.org id=B51566.163585076528600 (code B ref 51566); Tue, 02 Nov 2021 11:00:02 +0000 Received: (at 51566) by debbugs.gnu.org; 2 Nov 2021 10:59:25 +0000 Received: from localhost ([127.0.0.1]:36831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhrVl-0007RE-FE for submit@debbugs.gnu.org; Tue, 02 Nov 2021 06:59:25 -0400 Received: from mail-ed1-f48.google.com ([209.85.208.48]:41515) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhrVW-0007Qk-8r for 51566@debbugs.gnu.org; Tue, 02 Nov 2021 06:59:24 -0400 Received: by mail-ed1-f48.google.com with SMTP id ee33so3470681edb.8 for <51566@debbugs.gnu.org>; Tue, 02 Nov 2021 03:59:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ehCATuYNc3cPxDmILrei5vZPqNff4r2QncnkbGraRUU=; b=VQVJAOaUHQ+yc2ELzUC2yJv/660JJR3IsChXy6GD2ku3MjKBWipAWArEKn6GAhOk8Z O5fJyMvQJGHemdilM1ioYALZ1PHoX4Q01I3hMG7PHE8i1155RAwLJfAzdoCVhPgE1JnX kbFVchpJSryuW7qm7de1TI0Hzhm9qltGeEKKOKJz7pp1GklC0RSSCFhqwyiy0/YmkxuP j7Kwo9cDDlxg8zMIqCs8uwQnr5yA4TftQuv1/Y/OEpuQ7QFJGyU8GMhl79kx2NKGW3Gw dtVI2uOZHsZlAJRch9dxyNkMZC/jBkVQyMlXayQg4HVbcuk9nN9wWDGa/USOWZ2zKTUz I8Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=ehCATuYNc3cPxDmILrei5vZPqNff4r2QncnkbGraRUU=; b=Hke2pbdzlteIAjDemgZl4D0UCYMC4qfrBJ4nXOPfYCifdV5Sk5AG2cle6iRA4hcMZf LKFoXSzf/UYBXUu8fED3k692RLIHtLjlW6wer92I7JqgvSqHGKEgQAEJMoxBPTRXmiAE t4N1lqxU5PUBsJy8ezBb7AmG8p4RIZgzgTE0x+YzWDw5ElIiDP64Qx/LRyIS2zXHZeCf hJXt+aEW5zbc90petua060+5fpQzPV1qycHLRm4wAbbuz7vWqIpxYhzx/Du3dPj6w5xI NyI4cHwLnEs9lR9hxjVNidEJMxMHHNlnDR0SzPpS8T6h98CnIXPSrH1d7wq1elMmNkfw BFVg== X-Gm-Message-State: AOAM530ET5hlU2SSpuV1MZZYivFUF3cp/67VQzmsAMtt+qwd0/0SePe6 AW3PBXyv72lNpQFrOxd8pxdP0NUXPOg= X-Google-Smtp-Source: ABdhPJyR1p/zQN7OaX5u2vuGvn9IFh2Rvjw1fv47lPv3m3LPNJcg2vGOzSD+i7Cl6hQwyYk2C2vb8A== X-Received: by 2002:a17:906:4788:: with SMTP id cw8mr44343287ejc.97.1635850744283; Tue, 02 Nov 2021 03:59:04 -0700 (PDT) Received: from lelap.lan (catv-89-132-208-37.catv.broadband.hu. [89.132.208.37]) by smtp.gmail.com with ESMTPSA id p6sm4453764edx.60.2021.11.02.03.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 03:59:03 -0700 (PDT) From: Attila Lendvai Date: Tue, 2 Nov 2021 11:57:29 +0100 Message-Id: <20211102105728.18771-1-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Add a comment that mentions "MIT" so that people who grep for MIT end up there. * guix/import/utils.scm (spdx-string->license): Identify more licenses (CC-BY-4.0, Freetype, HPND). --- i have deleted the problematic JSON license. i have also opened an issue at the problematic project: https://issues.apache.org/jira/browse/ARROW-14550 guix/import/utils.scm | 3 +++ guix/licenses.scm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index a180742ca3..dc89386ddb 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -152,6 +152,7 @@ (define (spdx-string->license str) ("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 @@ (define (spdx-string->license str) ("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 @@ (define (spdx-string->license str) ("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) diff --git a/guix/licenses.scm b/guix/licenses.scm index c071aae4a9..82ca44f42e 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -308,6 +308,8 @@ (define eupl1.2 "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"