From unknown Tue Jun 17 22:24:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51566] [PATCH] guix: import: Add licences and their detection. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Nov 2021 10:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51566 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51566@debbugs.gnu.org Cc: Attila Lendvai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163584764714578 (code B ref -1); Tue, 02 Nov 2021 10:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Nov 2021 10:07:27 +0000 Received: from localhost ([127.0.0.1]:36779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhqhO-0003n0-R9 for submit@debbugs.gnu.org; Tue, 02 Nov 2021 06:07:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:49612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhqhJ-0003mp-9a for submit@debbugs.gnu.org; Tue, 02 Nov 2021 06:07:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhqhH-0006GP-Uq for guix-patches@gnu.org; Tue, 02 Nov 2021 06:07:17 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:37644) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhqhG-0000ix-1x for guix-patches@gnu.org; Tue, 02 Nov 2021 06:07:15 -0400 Received: by mail-ed1-x536.google.com with SMTP id f8so52436730edy.4 for ; Tue, 02 Nov 2021 03:07:12 -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=GXYfK0GjXIRc1FrQzMFm/Gz0JBMo1Bf+WNlH/8WL9oQ=; b=CxwotRC/AAdJb9WOcNOAoKn1CI4froLV5LmUsqjq3hdIoHmeyZese/uYHlgsULGyme dYqqNl8ipE5D/1dUHwRCdLXdo13yQwY5aM5VTsflGByGC84CoaxTYgSkomUCfYppDk1n niscy/KEfkLvUBWM8sg4DhqL8z+UqmSBg103UiKzw57pKdhQJ9EmD6QPfnpGdre5rxLj fuCf+567NckNrgoEeE8GIJAWPFqNtuj+vXsUwoWPSPyx9pRQzuYlmZQnIztzFYEsoaJN YYor7zPOOu0EfS38jwe/E4n+Crb724SXiW6n1NB/zPMapl89s6Rc89Dzy/mAV5sp3Uvg MBLA== 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=GXYfK0GjXIRc1FrQzMFm/Gz0JBMo1Bf+WNlH/8WL9oQ=; b=za9ml+RFFEmI1oZ6tgnhbJGMujiSSeijQN1cGGmiI5PpFilQerNiqZ1m3GaUJcSWJZ hgRB8UT8mM9rFG3cmw9cyZQ9QntSRxEnoZIuyBuUcRQGdHNAbLBpRoCfIgOGR2PZzs3g u06dSDerU0hTJOQS1HYNyWaH1gArzqMl38ajOCx/cIBrrjA49i+FHCAO8klj5DyaWvMk 1l/wPFRIDkTCuDspuJ901tz/R+H5XjPNVXvzPZ0yVabMokSMGfRTNY9qpffrMkvvYxAt LDTPqvG1WZHqbIlpoDDg0XkNCu59YjA7C0OLwtTGo7bFIsUX18txag7LSqVm2C52q2PT THyQ== X-Gm-Message-State: AOAM533sY2L+JcfvSyyq7r9m8+0vaNLdGcX77zUHV2Q93QkJDhSkLhq7 6Y8R8H4C0yA54m36jDtwbhtQ4jz7ljg= X-Google-Smtp-Source: ABdhPJzNAvJz1VODCWl9/l6r4V3TunqEUdJnsj9DCZiXdCL+MzuRvj2gdDKWbbA1RNlQ0j0riTK4QA== X-Received: by 2002:a17:907:e8b:: with SMTP id ho11mr25759108ejc.430.1635847631193; Tue, 02 Nov 2021 03:07:11 -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 z9sm11078576edb.70.2021.11.02.03.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 03:07:10 -0700 (PDT) From: Attila Lendvai Date: Tue, 2 Nov 2021 11:03:10 +0100 Message-Id: <20211102100315.2730-1-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * guix/licenses.scm (json): New variable. * guix/import/utils.scm (spdx-string->license): Identify more. --- the added comments deliberately mention the alternative names to help with grep'ping. guix/import/utils.scm | 4 ++++ guix/licenses.scm | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index a180742ca3..9ac3f3086d 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,11 +181,13 @@ (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) ("IPA" 'license:ipa) ("IPL-1.0" 'license:ibmpl1.0) + ("JSON" 'license:json) ("LAL-1.3" 'license:lal1.3) ("LGPL-2.0" 'license:lgpl2.0) ("LGPL-2.0-only" 'license:lgpl2.0) diff --git a/guix/licenses.scm b/guix/licenses.scm index c071aae4a9..ca0a1d8f6f 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -70,6 +70,7 @@ (define-module (guix licenses) ibmpl1.0 imlib2 ipa + json knuth lal1.3 lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+ llgpl @@ -308,6 +309,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" @@ -415,6 +418,13 @@ (define ipa "http://directory.fsf.org/wiki/License:IPA_Font_License" "https://www.gnu.org/licenses/license-list#IPAFONT")) +(define json + (license "JSON License" + "https://json.org/license.html" + "https://directory.fsf.org/wiki/License:JSON" + ;; "https://spdx.org/licenses/JSON.html" + )) + (define knuth (license "Donald Knuth's license for TeX" "http://www.ctan.org/license/knuth" -- 2.33.0 From unknown Tue Jun 17 22:24:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51566] json licence 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 10:21: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" <51566@debbugs.gnu.org> Reply-To: Attila Lendvai Received: via spool by 51566-submit@debbugs.gnu.org id=B51566.163584843915822 (code B ref 51566); Tue, 02 Nov 2021 10:21:02 +0000 Received: (at 51566) by debbugs.gnu.org; 2 Nov 2021 10:20:39 +0000 Received: from localhost ([127.0.0.1]:36795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhquE-000478-Ud for submit@debbugs.gnu.org; Tue, 02 Nov 2021 06:20:39 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:30254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhquB-00046s-AO for 51566@debbugs.gnu.org; Tue, 02 Nov 2021 06:20:36 -0400 Date: Tue, 02 Nov 2021 10:20:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail2; t=1635848427; bh=sRW//bzQMpjejfrbmg/YTSay0hIMQTQzo3Ut015Umts=; h=Date:To:From:Reply-To:Subject:From; b=l26i1nLjgvRMmHLBya9Fm693h18ibAsKTBQ93m+2AzUiuch3TRkXXmEBIAUNIropW 65rWr8BxHgl48iOMxPByo9mgKyrI9DUxS4PtcHI6nzcfx28KZOY38HegcHOTWRICv5 ajWuAZZmKfmtYs/jJ8Id+uKAOh7qJW8o8gn/vLJ+s2eOZSHo/LMfs0c+Cd6FmXZ4qj 6x3ixRjw18k0mvsC8gcUeRJ1gh9XTMn18b9PLnxFrFQd1GEyCYx12IbB+w+q5ugt3V 8yFlKQgRleEFIM9vc82/PU41ObWiQ0NNTmRd5tzyi+BD+ZYiWn11zV0p1JOzqDM9Zm rK2BW6vpWEUQw== From: Attila Lendvai Message-ID: MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="b1_6dayIjkdG5Ek8BUQJJY3Hyzbe7vMVG5l1eHPIgFZF0w" X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,HTML_MESSAGE shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --b1_6dayIjkdG5Ek8BUQJJY3Hyzbe7vMVG5l1eHPIgFZF0w Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 aSBoYXZlIGp1c3QgcmVhbGl6ZWQgdGhpcyByZWdhcmRpbmcgdGhlIGpzb24gbGljZW5jZToKCiJU aGlzIGxpY2Vuc2UgdXNlcyB0aGUgRXhwYXQgbGljZW5zZSBhcyBhIGJhc2UsIGJ1dCBhZGRzIGEg Y2xhdXNlIG1hbmRhdGluZzog4oCcVGhlIFNvZnR3YXJlIHNoYWxsIGJlIHVzZWQgZm9yIEdvb2Qs IG5vdCBFdmlsLuKAnSBUaGlzIGlzIGEgcmVzdHJpY3Rpb24gb24gdXNhZ2UgYW5kIHRodXMgY29u ZmxpY3RzIHdpdGggZnJlZWRvbSAwLiBUaGUgcmVzdHJpY3Rpb24gbWlnaHQgYmUgdW5lbmZvcmNp YmxlLCBidXQgd2UgY2Fubm90IHByZXN1bWUgdGhhdC4gVGh1cywgdGhlIGxpY2Vuc2UgaXMgbm9u ZnJlZS4iCgphcyBwZXI6IGh0dHBzOi8vZGlyZWN0b3J5LmZzZi5vcmcvd2lraS9MaWNlbnNlOkpT T04KCmlmIGpzb24gZG9lc24ndCBxdWFsaWZ5IGZvciBndWl4LCB0aGVuIGl0IG1lYW5zIHRoYXQg c3R1ZmYgbGlrZSB0aGUgZ28gZXRoZXJldW0gY2xpZW50IGRvZXNuJ3QgcXVhbGlmeS4KCmNvbnRl eHQ6IGknbSBzbWFydGVuaW5nIHVwIHRoZSBnbyBpbXBvcnRlciBhbmQgZ28tZXRoZXJldW0ncyB0 cmFuc2l0aXZlIGNsb3N1cmUgb2YgZG96ZW5zIG9mIGRlcGVuZGVuY2llcyBjb250YWlucyBwcm9q ZWN0cyB3aXRoIGpzb24gbGljZW5jZS4KCnBsZWFzZSBhZHZpc2UsCgotIGF0dGlsYQpQR1A6IDVE NUYgNDVDNyBERkNEIDBBMzk= --b1_6dayIjkdG5Ek8BUQJJY3Hyzbe7vMVG5l1eHPIgFZF0w Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: base64 PGRpdj5pIGhhdmUganVzdCByZWFsaXplZCB0aGlzIHJlZ2FyZGluZyB0aGUganNvbiBsaWNlbmNl Ojxicj48L2Rpdj48ZGl2Pjxicj48L2Rpdj48ZGl2PiJUaGlzIGxpY2Vuc2UgdXNlcyB0aGUgRXhw YXQgbGljZW5zZSBhcyBhIGJhc2UsIGJ1dCBhZGRzIGEgY2xhdXNlIG1hbmRhdGluZzog4oCcVGhl IFNvZnR3YXJlIHNoYWxsIGJlIHVzZWQgZm9yIEdvb2QsIG5vdCBFdmlsLuKAnSBUaGlzIGlzIGEg cmVzdHJpY3Rpb24gb24gdXNhZ2UgYW5kIHRodXMgY29uZmxpY3RzIHdpdGggZnJlZWRvbSAwLiBU aGUgcmVzdHJpY3Rpb24gbWlnaHQgYmUgdW5lbmZvcmNpYmxlLCBidXQgd2UgY2Fubm90IHByZXN1 bWUgdGhhdC4gVGh1cywgdGhlIGxpY2Vuc2UgaXMgbm9uZnJlZS4iPGJyPjwvZGl2PjxkaXY+PGJy PjwvZGl2PjxkaXY+YXMgcGVyOiZuYnNwOzxhIGhyZWY9Imh0dHBzOi8vZGlyZWN0b3J5LmZzZi5v cmcvd2lraS9MaWNlbnNlOkpTT04iPmh0dHBzOi8vZGlyZWN0b3J5LmZzZi5vcmcvd2lraS9MaWNl bnNlOkpTT048L2E+PGJyPjwvZGl2PjxkaXY+PGJyPjwvZGl2PjxkaXY+aWYganNvbiBkb2Vzbid0 IHF1YWxpZnkgZm9yIGd1aXgsIHRoZW4gaXQgbWVhbnMgdGhhdCBzdHVmZiBsaWtlIHRoZSBnbyBl dGhlcmV1bSBjbGllbnQgZG9lc24ndCBxdWFsaWZ5Ljxicj48L2Rpdj48ZGl2Pjxicj48L2Rpdj48 ZGl2PmNvbnRleHQ6IGknbSBzbWFydGVuaW5nIHVwIHRoZSBnbyBpbXBvcnRlciBhbmQgZ28tZXRo ZXJldW0ncyB0cmFuc2l0aXZlIGNsb3N1cmUgb2YgZG96ZW5zIG9mIGRlcGVuZGVuY2llcyBjb250 YWlucyBwcm9qZWN0cyB3aXRoIGpzb24gbGljZW5jZS48YnI+PC9kaXY+PGRpdj48YnI+PC9kaXY+ PGRpdj5wbGVhc2UgYWR2aXNlLDwvZGl2PjxkaXY+PGJyPjwvZGl2PjxkaXYgY2xhc3M9InByb3Rv bm1haWxfc2lnbmF0dXJlX2Jsb2NrIj48ZGl2IGNsYXNzPSJwcm90b25tYWlsX3NpZ25hdHVyZV9i bG9jay11c2VyIj48ZGl2Pi0gYXR0aWxhPGJyPjwvZGl2PjxkaXY+UEdQOiZuYnNwOzVENUYgNDVD NyBERkNEIDBBMzk8YnI+PC9kaXY+PC9kaXY+PGRpdiBjbGFzcz0icHJvdG9ubWFpbF9zaWduYXR1 cmVfYmxvY2stcHJvdG9uIHByb3Rvbm1haWxfc2lnbmF0dXJlX2Jsb2NrLWVtcHR5Ij48L2Rpdj48 L2Rpdj48ZGl2Pjxicj48L2Rpdj4= --b1_6dayIjkdG5Ek8BUQJJY3Hyzbe7vMVG5l1eHPIgFZF0w-- From unknown Tue Jun 17 22:24:32 2025 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) 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" -- 2.33.0 From unknown Tue Jun 17 22:24:32 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Attila Lendvai Subject: bug#51566: closed (Re: bug#51566: [PATCH] guix: import: Add licences and their detection.) Message-ID: References: <87bl2pdmtt.fsf_-_@gnu.org> <20211102100315.2730-1-attila@lendvai.name> X-Gnu-PR-Message: they-closed 51566 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 51566@debbugs.gnu.org Date: Fri, 12 Nov 2021 22:36:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1636756562-32133-1" This is a multi-part message in MIME format... ------------=_1636756562-32133-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #51566: [PATCH] guix: import: Add licences and their detection. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 51566@debbugs.gnu.org. --=20 51566: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D51566 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1636756562-32133-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 51566-done) by debbugs.gnu.org; 12 Nov 2021 22:35:37 +0000 Received: from localhost ([127.0.0.1]:46119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlf8y-0008La-PC for submit@debbugs.gnu.org; Fri, 12 Nov 2021 17:35:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlf8w-0008LL-9w for 51566-done@debbugs.gnu.org; Fri, 12 Nov 2021 17:35:35 -0500 Received: from [2001:470:142:3::e] (port=39650 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlf8q-0004Cd-Vy; Fri, 12 Nov 2021 17:35:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=vVMfEKu/L2C48ENYOpeDX/aKynq8I0Qx4NZupgvuyWY=; b=Hxzi3AbteOHZ40ukMOaK dSyTbpXu4si8DkPP+cQkhB0oklkFDH0ROK2m/DIxLIXWM5iiKSSEU1Ru8t2LXRveBlzx9MyGabGyn 1ferDMCwoYQ1DaYaqtXfgfSLL2eHnVVI/lJT452U93fKyHK7B4sN/XLPv/5AXfemUl5dzthCxaIrs qSGGpJMPi6ogkLDU+ovFEJQYKVsgg4WQMGE/ggNJvmiokcwJ2HEKB+s7OejgFx5ArqTRO7OPdlGV0 ckYgZ6QSR7s6mdYgIgCI179eEBCztU2t5spNyUggs5C4CslxIJe17er5TSZJy4TvE8AJvRNUSk9mo R+J2tA805iRxzw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:63889 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlf8q-00086m-LT; Fri, 12 Nov 2021 17:35:28 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Attila Lendvai Subject: Re: bug#51566: [PATCH] guix: import: Add licences and their detection. References: <20211102100315.2730-1-attila@lendvai.name> <20211102105728.18771-1-attila@lendvai.name> Date: Fri, 12 Nov 2021 23:35:26 +0100 In-Reply-To: <20211102105728.18771-1-attila@lendvai.name> (Attila Lendvai's message of "Tue, 2 Nov 2021 11:57:29 +0100") Message-ID: <87bl2pdmtt.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 51566-done Cc: 51566-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Attila Lendvai skribis: > 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 tweaked the commit log and applied. > i have deleted the problematic JSON license. You did well! > i have also opened an issue at the problematic project: > https://issues.apache.org/jira/browse/ARROW-14550 Perfect. Thank you, Ludo=E2=80=99. ------------=_1636756562-32133-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 2 Nov 2021 10:07:27 +0000 Received: from localhost ([127.0.0.1]:36779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhqhO-0003n0-R9 for submit@debbugs.gnu.org; Tue, 02 Nov 2021 06:07:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:49612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhqhJ-0003mp-9a for submit@debbugs.gnu.org; Tue, 02 Nov 2021 06:07:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhqhH-0006GP-Uq for guix-patches@gnu.org; Tue, 02 Nov 2021 06:07:17 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:37644) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhqhG-0000ix-1x for guix-patches@gnu.org; Tue, 02 Nov 2021 06:07:15 -0400 Received: by mail-ed1-x536.google.com with SMTP id f8so52436730edy.4 for ; Tue, 02 Nov 2021 03:07:12 -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=GXYfK0GjXIRc1FrQzMFm/Gz0JBMo1Bf+WNlH/8WL9oQ=; b=CxwotRC/AAdJb9WOcNOAoKn1CI4froLV5LmUsqjq3hdIoHmeyZese/uYHlgsULGyme dYqqNl8ipE5D/1dUHwRCdLXdo13yQwY5aM5VTsflGByGC84CoaxTYgSkomUCfYppDk1n niscy/KEfkLvUBWM8sg4DhqL8z+UqmSBg103UiKzw57pKdhQJ9EmD6QPfnpGdre5rxLj fuCf+567NckNrgoEeE8GIJAWPFqNtuj+vXsUwoWPSPyx9pRQzuYlmZQnIztzFYEsoaJN YYor7zPOOu0EfS38jwe/E4n+Crb724SXiW6n1NB/zPMapl89s6Rc89Dzy/mAV5sp3Uvg MBLA== 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=GXYfK0GjXIRc1FrQzMFm/Gz0JBMo1Bf+WNlH/8WL9oQ=; b=za9ml+RFFEmI1oZ6tgnhbJGMujiSSeijQN1cGGmiI5PpFilQerNiqZ1m3GaUJcSWJZ hgRB8UT8mM9rFG3cmw9cyZQ9QntSRxEnoZIuyBuUcRQGdHNAbLBpRoCfIgOGR2PZzs3g u06dSDerU0hTJOQS1HYNyWaH1gArzqMl38ajOCx/cIBrrjA49i+FHCAO8klj5DyaWvMk 1l/wPFRIDkTCuDspuJ901tz/R+H5XjPNVXvzPZ0yVabMokSMGfRTNY9qpffrMkvvYxAt LDTPqvG1WZHqbIlpoDDg0XkNCu59YjA7C0OLwtTGo7bFIsUX18txag7LSqVm2C52q2PT THyQ== X-Gm-Message-State: AOAM533sY2L+JcfvSyyq7r9m8+0vaNLdGcX77zUHV2Q93QkJDhSkLhq7 6Y8R8H4C0yA54m36jDtwbhtQ4jz7ljg= X-Google-Smtp-Source: ABdhPJzNAvJz1VODCWl9/l6r4V3TunqEUdJnsj9DCZiXdCL+MzuRvj2gdDKWbbA1RNlQ0j0riTK4QA== X-Received: by 2002:a17:907:e8b:: with SMTP id ho11mr25759108ejc.430.1635847631193; Tue, 02 Nov 2021 03:07:11 -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 z9sm11078576edb.70.2021.11.02.03.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 03:07:10 -0700 (PDT) From: Attila Lendvai To: guix-patches@gnu.org Subject: [PATCH] guix: import: Add licences and their detection. Date: Tue, 2 Nov 2021 11:03:10 +0100 Message-Id: <20211102100315.2730-1-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.8 (-) X-Debbugs-Envelope-To: submit Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * guix/licenses.scm (json): New variable. * guix/import/utils.scm (spdx-string->license): Identify more. --- the added comments deliberately mention the alternative names to help with grep'ping. guix/import/utils.scm | 4 ++++ guix/licenses.scm | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index a180742ca3..9ac3f3086d 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,11 +181,13 @@ (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) ("IPA" 'license:ipa) ("IPL-1.0" 'license:ibmpl1.0) + ("JSON" 'license:json) ("LAL-1.3" 'license:lal1.3) ("LGPL-2.0" 'license:lgpl2.0) ("LGPL-2.0-only" 'license:lgpl2.0) diff --git a/guix/licenses.scm b/guix/licenses.scm index c071aae4a9..ca0a1d8f6f 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -70,6 +70,7 @@ (define-module (guix licenses) ibmpl1.0 imlib2 ipa + json knuth lal1.3 lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+ llgpl @@ -308,6 +309,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" @@ -415,6 +418,13 @@ (define ipa "http://directory.fsf.org/wiki/License:IPA_Font_License" "https://www.gnu.org/licenses/license-list#IPAFONT")) +(define json + (license "JSON License" + "https://json.org/license.html" + "https://directory.fsf.org/wiki/License:JSON" + ;; "https://spdx.org/licenses/JSON.html" + )) + (define knuth (license "Donald Knuth's license for TeX" "http://www.ctan.org/license/knuth" -- 2.33.0 ------------=_1636756562-32133-1--