From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2LIvDsbXaGK5ywAAbAwnHQ (envelope-from ) for ; Wed, 27 Apr 2022 07:42:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id QNBQDcbXaGIRfAAAG6o9tA (envelope-from ) for ; Wed, 27 Apr 2022 07:42:30 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3CFBCAE9D for ; Wed, 27 Apr 2022 07:42:29 +0200 (CEST) Received: from localhost ([::1]:43194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njaRX-0004HQ-FY for larch@yhetil.org; Wed, 27 Apr 2022 01:42:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njaQJ-0004BP-8K for guix-patches@gnu.org; Wed, 27 Apr 2022 01:41:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47132) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njaQA-00077X-Hn for guix-patches@gnu.org; Wed, 27 Apr 2022 01:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1njaQA-0005fO-Fj for guix-patches@gnu.org; Wed, 27 Apr 2022 01:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55142] [PATCH] gnu: spdx licenses list update. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Apr 2022 05:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55142 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55142@debbugs.gnu.org Cc: Nicolas Graves X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165103804621747 (code B ref -1); Wed, 27 Apr 2022 05:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Apr 2022 05:40:46 +0000 Received: from localhost ([127.0.0.1]:41029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njaPt-0005eg-UJ for submit@debbugs.gnu.org; Wed, 27 Apr 2022 01:40:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:52260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njaPs-0005eZ-Hg for submit@debbugs.gnu.org; Wed, 27 Apr 2022 01:40:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njaPs-000495-9X for guix-patches@gnu.org; Wed, 27 Apr 2022 01:40:44 -0400 Received: from 15.mo582.mail-out.ovh.net ([188.165.39.161]:40771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njaPp-00076i-E2 for guix-patches@gnu.org; Wed, 27 Apr 2022 01:40:43 -0400 Received: from player755.ha.ovh.net (unknown [10.108.4.105]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 3DBB92307F for ; Wed, 27 Apr 2022 05:40:37 +0000 (UTC) Received: from ngraves.fr (unknown [176.166.159.77]) (Authenticated sender: ngraves@ngraves.fr) by player755.ha.ovh.net (Postfix) with ESMTPSA id AFAD529EF9B5B; Wed, 27 Apr 2022 05:40:35 +0000 (UTC) X-OVh-ClientIp: 176.166.159.77 Date: Wed, 27 Apr 2022 07:39:27 +0200 Message-Id: <20220427053927.7655-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 15516026619964351202 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrudeggdelhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeejheeufefgkeeuteejtdetudevleeujedukeekvdefjeejfeelvdekhfeijeefieenucffohhmrghinhepshhpugigrdhorhhgnecukfhppedtrddtrddtrddtpddujeeirdduieeirdduheelrdejjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepphhlrgihvghrjeehhedrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrgh Received-SPF: pass client-ip=188.165.39.161; envelope-from=ngraves@ngraves.fr; helo=15.mo582.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651038149; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bblku+118ziU3joN/m4+Iu1asc7amJyfgoMvKHJaUa0=; b=qf81UenuJMRAwCL3Ydubyd8Du0CZxuf2axuLuAdRg8EoxzvIPbj43QRrURqMzUqpi6fHOq 6TMmLR7nno1ymkL9/AN4aqQ1daqeE6Rlr6GJNMq7fs4lu355WGpJj/b9XOZP0wSDrdWEpk PjamnkgdIjbRFuRLnDdaiSJ3/9mG7pYeNFQBS1LzrXO6R5DEFIS5ucmf/CIF3uc3r6qjUI 2EyhW58bECZuzQWMx1FerepBtloBDbzbOXpwDa/H7MKBYEiqre9H9L07jbmENea2mThXjU B8qxSeCk1rREmjP5O9AJA1U+wddO1QLTU8zcJI8iNxzRSqXpc8GVE3vK5AxJCw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651038149; a=rsa-sha256; cv=none; b=omJt/REvReEhCBLZ8bnYHZA7WHws2eVYxhkRQxwDbyeAeq8WfAoNXTtmNkwQKkaTqS+pd8 I4RIqw8a836oOznrXQ+QTewDa834gH83lyiQhz8ZvfZDJdE6IXW/Pnx88liuRpdvwdCLPL YD8FqsyGxw2NyjA7ID+K0zRN8GtgXJq+rN+q8yLhd/FIwqXhdH9uACuB1DL6gLPkipdI2Y qPCfORuV2SdIk+BdXSAqiyeK5goaE2ZaDb0zq3OrZKv/+wUERT0ahLwr3y4bfSWoXtcMXT gsPiCFeCUTfjVKeYPj9XuJ14SlNpcWZmdhVuBg/O6PTlrNA9T13TZtZBKZarag== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.20 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 3CFBCAE9D X-Spam-Score: -3.20 X-Migadu-Scanner: scn1.migadu.com X-TUID: 5Xyh0EeeD8BM * guix/import/utils.scm (spdx licenses list): Update. --- guix/import/utils.scm | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 9cadbb3d5f..646921c73b 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -132,7 +132,7 @@ (define (spdx-string->license str) "Convert STR, a SPDX formatted license identifier, to a license object. Return #f if STR does not match any known identifiers." ;; https://spdx.org/licenses/ - ;; The psfl, gfl1.0, nmap, repoze + ;; The gfl1.0, nmap, repoze ;; licenses doesn't have SPDX identifiers ;; ;; Please update guix/licenses.scm when modifying @@ -143,14 +143,17 @@ (define (spdx-string->license str) ;; or "GPL-N-or-later" as appropriate. Likewise for LGPL ;; and AGPL ("AGPL-1.0" 'license:agpl1) + ("AGPL-1.0-only" 'license:agpl1) ("AGPL-3.0" 'license:agpl3) ("AGPL-3.0-only" 'license:agpl3) ("AGPL-3.0-or-later" 'license:agpl3+) ("Apache-1.1" 'license:asl1.1) ("Apache-2.0" 'license:asl2.0) + ("APSL-2.0" 'license:apsl2) ("BSL-1.0" 'license:boost1.0) ("0BSD" 'license:bsd-0) - ("BSD-2-Clause-FreeBSD" 'license:bsd-2) + ("BSD-2-Clause" 'license:bsd-2) + ("BSD-2-Clause-FreeBSD" 'license:bsd-2) ;flagged as deprecated on spdx ("BSD-3-Clause" 'license:bsd-3) ("BSD-4-Clause" 'license:bsd-4) ("CC0-1.0" 'license:cc0) @@ -161,17 +164,29 @@ (define (spdx-string->license str) ("CC-BY-SA-3.0" 'license:cc-by-sa3.0) ("CC-BY-SA-4.0" 'license:cc-by-sa4.0) ("CDDL-1.0" 'license:cddl1.0) + ("CDDL-1.1" 'license:cddl1.1) + ("CECILL-2.1" 'license:cecill) + ("CECILL-B" 'license:cecill-b) ("CECILL-C" 'license:cecill-c) ("Artistic-2.0" 'license:artistic2.0) ("ClArtistic" 'license:clarified-artistic) + ("copyleft-next-0.3.0" 'license:copyleft-next) ("CPL-1.0" 'license:cpl1.0) ("EPL-1.0" 'license:epl1.0) + ("EPL-2.0" 'license:epl2.0) + ("EUPL-1.2" 'license:eupl1.2) ("MIT" 'license:expat) ("FTL" 'license:freetype) + ("FreeBSD-DOC" 'license:freebsd-doc) ("Freetype" 'license:freetype) + ("FSFAP" 'license:fsf-free) + ("FSFUL" 'license:fsf-free) ("GFDL-1.1" 'license:fdl1.1+) + ("GFDL-1.1-or-later" 'license:fdl1.1+) ("GFDL-1.2" 'license:fdl1.2+) + ("GFDL-1.2-or-later" 'license:fdl1.2+) ("GFDL-1.3" 'license:fdl1.3+) + ("GFDL-1.3-or-later" 'license:fdl1.3+) ("Giftware" 'license:giftware) ("GPL-1.0" 'license:gpl1) ("GPL-1.0-only" 'license:gpl1) @@ -204,14 +219,24 @@ (define (spdx-string->license str) ("LGPL-3.0-only" 'license:lgpl3) ("LGPL-3.0+" 'license:lgpl3+) ("LGPL-3.0-or-later" 'license:lgpl3+) + ("LPPL-1.0" 'license:lppl) + ("LPPL-1.1" 'license:lppl) + ("LPPL-1.2" 'license:lppl1.2) + ("LPPL-1.3a" 'license:lppl1.3a) + ("LPPL-1.3c" 'license:lppl1.3c) + ("MirOS" 'license:miros) ("MPL-1.0" 'license:mpl1.0) ("MPL-1.1" 'license:mpl1.1) ("MPL-2.0" 'license:mpl2.0) ("MS-PL" 'license:ms-pl) ("NCSA" 'license:ncsa) + ("OGL-UK-1.0" 'license:ogl-psi1.0) ("OpenSSL" 'license:openssl) ("OLDAP-2.8" 'license:openldap2.8) + ("OPL-1.0" 'license:opl1.0+) ("CUA-OPL-1.0" 'license:cua-opl1.0) + ("PSF-2.0" 'license:psfl) + ("OSL-2.1" 'license:osl2.1) ("QPL-1.0" 'license:qpl) ("Ruby" 'license:ruby) ("SGI-B-2.0" 'license:sgifreeb2.0) @@ -220,6 +245,9 @@ (define (spdx-string->license str) ("TCL" 'license:tcl/tk) ("Unlicense" 'license:unlicense) ("Vim" 'license:vim) + ("W3C" 'license:w3c) + ("WTFPL" 'license:wtfpl2) + ("wxWindow" 'license:wxwindows3.1+) ;flagged as deprecated on spdx ("X11" 'license:x11) ("ZPL-2.1" 'license:zpl2.1) ("Zlib" 'license:zlib) -- 2.35.1