From patchwork Sat Dec 18 07:06:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 35366 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 6B2A627BBEA; Sat, 18 Dec 2021 07:08:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 28A8427BBE9 for ; Sat, 18 Dec 2021 07:08:21 +0000 (GMT) Received: from localhost ([::1]:58808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myTpM-0007Yn-Aw for patchwork@mira.cbaines.net; Sat, 18 Dec 2021 02:08:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myTp5-0007Hv-AP for guix-patches@gnu.org; Sat, 18 Dec 2021 02:08:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myTp4-00076y-W4 for guix-patches@gnu.org; Sat, 18 Dec 2021 02:08:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myTp4-000880-RX for guix-patches@gnu.org; Sat, 18 Dec 2021 02:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH v5 1/3] licenses: Add Expat No Attribution license. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 07:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48702 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48702@debbugs.gnu.org Cc: Xinglu Chen , Aleksandr Vityazev Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.163981123431177 (code B ref 48702); Sat, 18 Dec 2021 07:08:02 +0000 Received: (at 48702) by debbugs.gnu.org; 18 Dec 2021 07:07:14 +0000 Received: from localhost ([127.0.0.1]:41160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myToF-00086k-BO for submit@debbugs.gnu.org; Sat, 18 Dec 2021 02:07:14 -0500 Received: from out1.migadu.com ([91.121.223.63]:45219) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myTo4-00085R-Ji for 48702@debbugs.gnu.org; Sat, 18 Dec 2021 02:07:07 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1639811219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TS7a5sK5L43xMg9bxghBSvJVu9t7uV/GbCLkFYiuwAM=; b=bM/nSEOKEMdL5Ytla+i4+8T3+t7mgSXVzYtk+AoS+CzFc2qEFsMb4sOzDkqLfSdkt6AVWp CRmHFUei5y7VawvydM5022nan22VQngPn2TbXPNm1uwGw6Aiv31MR6ZPS3Mbpbg29XyyZH RBQIpjeEgFWoDQRO2Yf9G3i7FPsekYcr239SM9Wz3hlL2XFnVMjRdd2vrQWQNxt+LymCeh CTg7ixdHHY2nT/gx4HXz+Qz0Y4WnRoDWFWouWwThCORu93WF+PGDf4L73GKejcEasuTXme xhMLawtrAA2JbxPW5103T52Qtzn6hQV0n8qKHk9+Py9brePIydGvUVevvotDCA== From: Kyle Meyer Date: Sat, 18 Dec 2021 02:06:46 -0500 Message-Id: <20211218070648.278181-2-kyle@kyleam.com> In-Reply-To: <20211218070648.278181-1-kyle@kyleam.com> References: <20210918162853.25997-1-kyle@kyleam.com> <20211218070648.278181-1-kyle@kyleam.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyleam.com 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 * guix/licenses.scm (expat-0): New variable. * guix/import/utils.scm (spdx-string->license): Add MIT-0. --- guix/import/utils.scm | 2 ++ guix/licenses.scm | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 1c3cfa3e0b..281258122e 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -165,6 +166,7 @@ (define (spdx-string->license str) ("CPL-1.0" 'license:cpl1.0) ("EPL-1.0" 'license:epl1.0) ("MIT" 'license:expat) + ("MIT-0" 'license:expat-0) ("FTL" 'license:freetype) ("Freetype" 'license:freetype) ("GFDL-1.1" 'license:fdl1.1+) diff --git a/guix/licenses.scm b/guix/licenses.scm index 82ca44f42e..3b820ae07e 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Noisytoot +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,7 @@ (define-module (guix licenses) epl1.0 epl2.0 eupl1.2 - expat + expat expat-0 freetype freebsd-doc giftware @@ -315,6 +316,13 @@ (define expat "http://directory.fsf.org/wiki/License:Expat" "https://www.gnu.org/licenses/license-list.html#Expat")) +(define expat-0 + (license "Expat No Attribution" + ;; Note: There is a later formulation of the same license at + ;; . + "https://romanrm.net/mit-zero" + "Expat license with the attribution paragraph removed.")) + (define freetype (license "Freetype" "http://directory.fsf.org/wiki/License:Freetype"