From patchwork Thu Jun 3 06:40:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 29818 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 C38AB27BC81; Thu, 3 Jun 2021 07:41:24 +0100 (BST) 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_H4,RCVD_IN_MSPIKE_WL,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 78C0A27BC78 for ; Thu, 3 Jun 2021 07:41:24 +0100 (BST) Received: from localhost ([::1]:59032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loh2h-0006ct-K5 for patchwork@mira.cbaines.net; Thu, 03 Jun 2021 02:41:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loh2N-000661-93 for guix-patches@gnu.org; Thu, 03 Jun 2021 02:41:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58602) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loh2N-0000js-14 for guix-patches@gnu.org; Thu, 03 Jun 2021 02:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loh2M-0006L7-VQ for guix-patches@gnu.org; Thu, 03 Jun 2021 02:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH v2 1/3] licenses: Add Expat No Attribution license. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 06:41: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, Xinglu Chen Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.162270244324307 (code B ref 48702); Thu, 03 Jun 2021 06:41:02 +0000 Received: (at 48702) by debbugs.gnu.org; 3 Jun 2021 06:40:43 +0000 Received: from localhost ([127.0.0.1]:41905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loh1y-0006Jd-2s for submit@debbugs.gnu.org; Thu, 03 Jun 2021 02:40:43 -0400 Received: from out1.migadu.com ([91.121.223.63]:52466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loh1w-0006JS-MS for 48702@debbugs.gnu.org; Thu, 03 Jun 2021 02:40:37 -0400 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=1622702435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DqB/JGPx4Ra52UJ9ZJfjAd4muV1DYooJJ44eBmvcRjM=; b=YIppSFzHEsN2RqD+kldoOR8egIBIqwx54QLEu/474QWbHVubPuIR0Qw/cVo31JsY44WrSf zAA2/ThDwT5ICRMUzvaj9+CowT6YgCx9LoWyP/zhmO5+bhBIfYwZ9lcgIAPqGZsGDcZfGq wn89aEvkn01qwTE59qoE4qf3tpcCW+9pcUtayqWOikk/HtxxgO3rVkqMfvdJXqVQpiWJ8x zZWBkfE6K4+r04ZdY/seuInLQVswk8t+7dbq5MUHXlyL5dr6C/Dj810byemxvP3an//9wF FTQc9FEbmMJ0DeZw2wOmqry6MZtiO2y5l4CyLtzLiUJgbV4vU5GjfxuJS2easQ== From: Kyle Meyer Date: Thu, 3 Jun 2021 02:40:07 -0400 Message-Id: <20210603064009.18820-2-kyle@kyleam.com> In-Reply-To: <20210603064009.18820-1-kyle@kyleam.com> References: <20210527145046.11773-1-kyle@kyleam.com> <20210603064009.18820-1-kyle@kyleam.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyle@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 d817318a91..22d558cf09 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -155,6 +156,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) ("GFDL-1.1" 'license:fdl1.1+) ("GFDL-1.2" 'license:fdl1.2+) diff --git a/guix/licenses.scm b/guix/licenses.scm index 4718ccf83f..6e3bc5f488 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 André Batista ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,7 +56,7 @@ (define-module (guix licenses) edl1.0 epl1.0 epl2.0 - expat + expat expat-0 freetype freebsd-doc giftware @@ -306,6 +307,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"