From patchwork Sun May 22 22:28:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 39576 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 C551027BBEB; Sun, 22 May 2022 23:29:35 +0100 (BST) 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,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 80AA827BBEA for ; Sun, 22 May 2022 23:29:35 +0100 (BST) Received: from localhost ([::1]:48548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsu4s-0002XX-NJ for patchwork@mira.cbaines.net; Sun, 22 May 2022 18:29:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsu4M-0001vQ-TF for guix-patches@gnu.org; Sun, 22 May 2022 18:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52734) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nsu4M-0006nx-KW for guix-patches@gnu.org; Sun, 22 May 2022 18:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nsu4M-0008Ts-Hp for guix-patches@gnu.org; Sun, 22 May 2022 18:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH v6 1/4] licenses: Add Expat No Attribution license. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 May 2022 22:29: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: Ludovic =?utf-8?q?Court=C3=A8s?= , Xinglu Chen Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.165325852332546 (code B ref 48702); Sun, 22 May 2022 22:29:02 +0000 Received: (at 48702) by debbugs.gnu.org; 22 May 2022 22:28:43 +0000 Received: from localhost ([127.0.0.1]:46625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsu3y-0008Si-M4 for submit@debbugs.gnu.org; Sun, 22 May 2022 18:28:43 -0400 Received: from out0.migadu.com ([94.23.1.103]:46588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsu3m-0008Rr-8U for 48702@debbugs.gnu.org; Sun, 22 May 2022 18:28: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=1653258504; 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=TQKvFBBCsaNAAsfVxEp7sMW57lh1KnBiOTL2wB7ouEE=; b=to6Q5DXjRhuO6OPmXfRDJZE7PV35rcIILt2rflYjvmU3DX5wK54+6t5idCixmkmWfBLbqt 8KyiJdvrVvaddp5an+lHp7brcPnXqgJAw23X0Sj4YcuZUKidb46YOKT0Rp76Pp/iqyPlkL KcCf171dUm+yKlIcxk3LKGUW7ZiCyS2Dn9CiG/1YfWwUFURxOOOcC6qs5h8nj0CRvImxhP rkc96+7dQcrzLh6UFLjb4KfgOwVykl6t0YFEDAhF9IeWsUyHMY2spRxHVJ1EarSrqE9O1I bJ8LQKlE5JRWnrzA3UAy4epRxUro44pkI35bsVpyunxDgmAM1helcd2Vc+9CJw== From: Kyle Meyer Date: Sun, 22 May 2022 18:28:04 -0400 Message-Id: <20220522222807.332757-2-kyle@kyleam.com> In-Reply-To: <20220522222807.332757-1-kyle@kyleam.com> References: <20211218070648.278181-1-kyle@kyleam.com> <20220522222807.332757-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 9cadbb3d5f..810de4434c 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2022 Alice Brenon +;;; Copyright © 2022 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -167,6 +168,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"