From patchwork Fri Feb 24 03:22:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 47249 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 A732316BBC; Fri, 24 Feb 2023 03:23:29 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 9B59D16B9D for ; Fri, 24 Feb 2023 03:23:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVOfo-00030B-Gb; Thu, 23 Feb 2023 22:23:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVOfm-0002zm-Nl for guix-patches@gnu.org; Thu, 23 Feb 2023 22:23:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVOfm-00065H-FT for guix-patches@gnu.org; Thu, 23 Feb 2023 22:23:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVOfm-0004zk-2w for guix-patches@gnu.org; Thu, 23 Feb 2023 22:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61745] [PATCH 1/5] licenses: Add LPL 1.02 (Lucent Public Licence). References: <20230224031803.14689-1-antero@mailbox.org> In-Reply-To: <20230224031803.14689-1-antero@mailbox.org> Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2023 03:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61745@debbugs.gnu.org Cc: Antero Mejr Received: via spool by 61745-submit@debbugs.gnu.org id=B61745.167720896219134 (code B ref 61745); Fri, 24 Feb 2023 03:23:02 +0000 Received: (at 61745) by debbugs.gnu.org; 24 Feb 2023 03:22:42 +0000 Received: from localhost ([127.0.0.1]:35702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfS-0004yY-0T for submit@debbugs.gnu.org; Thu, 23 Feb 2023 22:22:42 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:53118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfP-0004yI-4p for 61745@debbugs.gnu.org; Thu, 23 Feb 2023 22:22:40 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4PNFZH1S3xz9sVv for <61745@debbugs.gnu.org>; Fri, 24 Feb 2023 04:22:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JXLdidugsTh+Qs+UHFnvNMO0pyeNVb1vArFqfKpShYI=; b=aKUgrQO5RFfgDXF/45wvFkwxHN5u5doEbmRZ0qEhLSlhQli1Cjrx9E5DvKbbaUaCR9628r 8EGeMsd5+PWJt/KMu8PTJX3C0+X/pZ8o91Wvd+49CSLvF8IMEu6w/r79iO/4B6JkNOWZXS s2VH/J0cslohmQyWVJgYrV2g8vdGKmSbCptOr36W/fw+3DEx81LAd7CozU0klfz9viQ8/s fDeCV3WOe9421iOXhDchXCEB6lBlyi4GlBdjajrQvPlreXVw2YJlGo8Ik+n4LilAYdMsKh 0NXxK8oQdE1fJJI2tOmCfLDVU1RyWvuypoHn3zbpjFOwJz8UYJlY7RD3vGCaBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JXLdidugsTh+Qs+UHFnvNMO0pyeNVb1vArFqfKpShYI=; b=h7yxFd9HsS3ice/xzPOQ1UKfc6trYLC4Dse35N1r8dH4MvutCdsZ72CseNHo3Ab6R9WJqa WxjCTF8xYUJ0t/dADT3LZOkeNRniy3EThWa+qUclImcqWDIS2viImOLlFqI2RJsPWvEv1t j+7b4Nn8+4yA45+fhcrLhlVkrqxbl9rP7XDUVS8G8gk4xP+l2dVbfQ7zb0K2+QrnXvpAga DNYOPmxGGmlAuRMr8mp05e3S1Ziys8reeetqZxI+19WvANHOLKqBVbTjgHZKR8RPMK33Hv lMMyoYqGyhwFTHX8a1gId/LKBK1IS9aOlYEtA7E9dIV/gV4DWCA4JCYviVp6Aw== Date: Fri, 24 Feb 2023 03:22:16 +0000 Message-Id: <20230224032220.14820-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 54e3b8b3f209220016e X-MBO-RS-META: j9tmnxb5i1zubj5daa65xy7bh3hxuxoz X-Rspamd-Queue-Id: 4PNFZH1S3xz9sVv 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: , Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/licenses.scm (lpl1.02): New variable. * guix/import/utils.scm (spdx-string->license): Add LPL-1.02 identifier. --- Sorry about the ordering, please apply the 9base patch last. guix/import/utils.scm | 1 + guix/licenses.scm | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 72795d2c61..ee64faa886 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -244,6 +244,7 @@ (define %spdx-license-identifiers ("LGPL-3.0-only" . license:lgpl3) ("LGPL-3.0+" . license:lgpl3+) ("LGPL-3.0-or-later" . license:lgpl3+) + ("LPL-1.02" . license:lpl1.02) ("LPPL-1.0" . license:lppl) ("LPPL-1.1" . license:lppl) ("LPPL-1.2" . license:lppl1.2) diff --git a/guix/licenses.scm b/guix/licenses.scm index f7df5826bf..e7e6ef3545 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -75,6 +75,7 @@ (define-module (guix licenses) knuth lal1.3 lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+ llgpl + lpl1.02 lppl lppl1.0+ lppl1.1+ lppl1.2 lppl1.2+ lppl1.3 lppl1.3+ lppl1.3a lppl1.3a+ @@ -516,6 +517,11 @@ (define llgpl "https://opensource.franz.com/preamble.html" "Lisp Lesser General Public License")) +(define lpl1.02 ;Lucent + (license "LPL 1.02" + "https://directory.fsf.org/wiki/License:LPL-1.02" + "https://www.gnu.org/licenses/license-list.html#lucent102")) + (define lppl (license "LPPL (any version)" "https://www.latex-project.org/lppl/lppl-1-0/" From patchwork Fri Feb 24 03:22:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 47250 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 A5C8116BBC; Fri, 24 Feb 2023 03:23:32 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 39FF716B9D for ; Fri, 24 Feb 2023 03:23:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVOfo-00030D-RX; Thu, 23 Feb 2023 22:23:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVOfm-0002zn-Pv for guix-patches@gnu.org; Thu, 23 Feb 2023 22:23:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVOfm-00065M-Hu for guix-patches@gnu.org; Thu, 23 Feb 2023 22:23:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVOfm-0004zr-E5 for guix-patches@gnu.org; Thu, 23 Feb 2023 22:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61745] [PATCH 2/5] import: Add EUPL 1.1 to the SPDX license name converter. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2023 03:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61745@debbugs.gnu.org Cc: Antero Mejr Received: via spool by 61745-submit@debbugs.gnu.org id=B61745.167720896919153 (code B ref 61745); Fri, 24 Feb 2023 03:23:02 +0000 Received: (at 61745) by debbugs.gnu.org; 24 Feb 2023 03:22:49 +0000 Received: from localhost ([127.0.0.1]:35707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfZ-0004yr-Bf for submit@debbugs.gnu.org; Thu, 23 Feb 2023 22:22:49 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:49422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfW-0004yW-O2 for 61745@debbugs.gnu.org; Thu, 23 Feb 2023 22:22:47 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4PNFZR0NtDz9sw4 for <61745@debbugs.gnu.org>; Fri, 24 Feb 2023 04:22:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PxeFOOtJD/XplnQ3lXmFgMbASbIGifnvStwwDqSWzwU=; b=LDHi2ilo5tN2B35ghAI+aTLvpaXeRdms3qWhys5ImwIePrsv7/gzeY5mfrOi1/gfzuOsVt /YlxsXKuHfuOuN5/Bd5gXZXO9lLFCQ7o+tiUGnDa4pzAXMUHIRyHYTiLNO050gi0h6JzNm Kgxc+zBBi+qKfay+MuVzjtA3HVYj82apPHMjPd0h1vJ3tZouu8ssymABU+RnVjupQCKDCz nGLyZXxOakWUbK14Ku1/lv6g2tua7PB1UXIYEU8exCfm9Gncb9JSD1CEJduP5Bx7EgjUyk URSOB31lLYJzg/Vaa4FXfQzq/P6lMRjoctMya0Yg5eQ2ufYYCIfQYeygly1mkQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PxeFOOtJD/XplnQ3lXmFgMbASbIGifnvStwwDqSWzwU=; b=VwQfZr2pXdopHKuU79IxZNzulBLiDG9LDOZDiF/ubB35R1f6lvSzwUVMbADOAJKYA+ILkn wqW61EZO6+6rQDhwIYifOXliRZnarK6ngqqJo/4jHaz3F2C9Yv9cbDT6pTCFd2++iFSbYh Mafe9PIE4ZGfjrYSp/ZRTHP35rRn++yZQFNA6AOi4e6G3PKsMeMHVcnM02HN66SnIo0mSI IZQJ+Og3vPPVg3pZMslv7hxp4tz6lmi5dYahx8HmRRBM9+5uUGtDTCUp3/kEF0hK5U69SC QFR+6/+yjQQKqg3sRMnmLf7mKe4547T55e2MYncnAPZ5ECVoE/ZAG2TrwcMCwA== Date: Fri, 24 Feb 2023 03:22:17 +0000 Message-Id: <20230224032220.14820-2-antero@mailbox.org> In-Reply-To: <20230224032220.14820-1-antero@mailbox.org> References: <20230224032220.14820-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 5d7f647686fd10bd611 X-MBO-RS-META: bqxwyn43dgd3dnqwzxug7uss8xd4eqqw X-Rspamd-Queue-Id: 4PNFZR0NtDz9sw4 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: , Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/utils.scm (spdx-string->license): Add EUPL-1.1 identifier. --- guix/import/utils.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index ee64faa886..2da5d93a67 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -198,6 +198,7 @@ (define %spdx-license-identifiers ("CPL-1.0" . license:cpl1.0) ("EPL-1.0" . license:epl1.0) ("EPL-2.0" . license:epl2.0) + ("EUPL-1.1" . license:eupl1.1) ("EUPL-1.2" . license:eupl1.2) ("MIT" . license:expat) ("MIT-0" . license:expat-0) From patchwork Fri Feb 24 03:22:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 47251 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 A498616BA8; Fri, 24 Feb 2023 03:23:36 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 C89EE16B9D for ; Fri, 24 Feb 2023 03:23:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVOfo-00030C-I0; Thu, 23 Feb 2023 22:23:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVOfn-000302-5M for guix-patches@gnu.org; Thu, 23 Feb 2023 22:23:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVOfm-00065Y-TH for guix-patches@gnu.org; Thu, 23 Feb 2023 22:23:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVOfm-0004zy-Pd for guix-patches@gnu.org; Thu, 23 Feb 2023 22:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61745] [PATCH 3/5] gnu: r-mapproj: Correct license field to lpl1.02. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2023 03:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61745@debbugs.gnu.org Cc: Antero Mejr Received: via spool by 61745-submit@debbugs.gnu.org id=B61745.167720898019178 (code B ref 61745); Fri, 24 Feb 2023 03:23:02 +0000 Received: (at 61745) by debbugs.gnu.org; 24 Feb 2023 03:23:00 +0000 Received: from localhost ([127.0.0.1]:35712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfj-0004zF-LF for submit@debbugs.gnu.org; Thu, 23 Feb 2023 22:22:59 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:36646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfi-0004z1-1x for 61745@debbugs.gnu.org; Thu, 23 Feb 2023 22:22:58 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4PNFZf1YlHz9shY for <61745@debbugs.gnu.org>; Fri, 24 Feb 2023 04:22:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o5Bz5M1i7YPu1nnx2/7e/UoQoOThYPOQA/dKaIpuHFk=; b=ddcVMbMA78FZjpXoMgpwjgr2XJOrX6jES6mWrjFgYJDWFBfhOvklWU85uonI9sWf6bucjN G9PXfM5o6LfspoABItjqZJJyKjjlGPvg462fs+4TyRDKpx8jUTxE/7+QjDqic/2DVc+q3Y mjOSJVpftP4l18anL4F6Zcv5AKSRxt6g7bedMLWhAF3bbGKGTCKw1Tr707aEOWw/sciDs5 UK3vSivcjkmsZOT95x5sfKfpf8SM71SBLmIQi7PQGFyv+/GwDhz2sLgdpp4ksU/rVwVoyL jJ6qpcTZJT2MD491FuyqV9ajZVCamYnU7dGzB2ms0Ee8mx3el2DECQ9JU41K6A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o5Bz5M1i7YPu1nnx2/7e/UoQoOThYPOQA/dKaIpuHFk=; b=iDR9BMuSdv0M2xEDFQvG99ttybR/2puzLTTufE6gCNzZKmedrlU8E6XH8dQQ7XcIwvsT0a EfDuM+OKSFfvwRkHN3skPxvDCuf0KGO76dDVEKTr4T5LgR+2ZAJdnMVsmAHc5A+JxPnRCO lXTDYBWh0bf7Oafrx8CXekkJrOTQSs9Wi/i0Kq5xG7E9jmTq+y4WPpteAWj1NH3CpPia/H +HKk9IHHPO196cwdZjkMx5iGwBvVWbX7j9Y1ZRNGdJdmxprLmuyVlgaToMRL7IrnoZnzLb yweuc4z6oa8cRC70UitPjm68yVV1xJ40QHgfiXftR7mHnbAk5XNhXwsjgWjrmw== Date: Fri, 24 Feb 2023 03:22:18 +0000 Message-Id: <20230224032220.14820-3-antero@mailbox.org> In-Reply-To: <20230224032220.14820-1-antero@mailbox.org> References: <20230224032220.14820-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: bcc8cd16c766c46c7d7 X-MBO-RS-META: kmyudxfgkj6f1r1nhodbew7o6id9kmtn X-Rspamd-Queue-Id: 4PNFZf1YlHz9shY 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: , Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cran.scm (r-mapproj): Correct license. [license]: Change to lpl1.02. --- gnu/packages/cran.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c7a81b96eb..4fac45a91d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4360,9 +4360,7 @@ (define-public r-mapproj (description "This package converts latitude/longitude into projected coordinates.") (license (list license:gpl2 ; The R interface - (license:non-copyleft ; The C code - "https://www.gnu.org/licenses/license-list.en.html#lucent102" - "Lucent Public License Version 1.02"))))) + license:lpl1.02)))) ; The C code (define-public r-rgooglemaps (package From patchwork Fri Feb 24 03:22:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 47253 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 16AF416BA8; Fri, 24 Feb 2023 03:24:23 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 BDC8616B9D for ; Fri, 24 Feb 2023 03:24:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVOgo-0003GI-1w; Thu, 23 Feb 2023 22:24:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVOgk-0003G2-OS for guix-patches@gnu.org; Thu, 23 Feb 2023 22:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVOgk-0006Bm-DR for guix-patches@gnu.org; Thu, 23 Feb 2023 22:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVOgk-00051m-9L for guix-patches@gnu.org; Thu, 23 Feb 2023 22:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61745] [PATCH 4/5] gnu: Add lib9. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2023 03:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61745@debbugs.gnu.org Cc: Antero Mejr Received: via spool by 61745-submit@debbugs.gnu.org id=B61745.167720898519248 (code B ref 61745); Fri, 24 Feb 2023 03:24:02 +0000 Received: (at 61745) by debbugs.gnu.org; 24 Feb 2023 03:23:05 +0000 Received: from localhost ([127.0.0.1]:35720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfp-00050N-4Y for submit@debbugs.gnu.org; Thu, 23 Feb 2023 22:23:05 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:39646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfn-0004z7-1E for 61745@debbugs.gnu.org; Thu, 23 Feb 2023 22:23:04 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4PNFZl2bzMz9slk for <61745@debbugs.gnu.org>; Fri, 24 Feb 2023 04:22:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vgetSH48vQGAkNebe8jmBtOpjitwBoFE0W/EOhPLk0E=; b=VoMdoyk8z2fhPK9f1YmU72AJsOrtZChTk1sfzgtvRjrW8CLOzwgBeblZGZ1oaMoaVobq7G AphgVCW5E+8W4vVD+px0XLtg+31JCUXx2UExMra5xMF8gIUy3Nab9d6GyJ1291ACBEk1oW VsbOG7i/koA0/6osP9rStrS2W4GAV4/v+egBRBdhYug/y4vxV2IWirAGZjQdleX3v4bqf5 a0wu+ithXa4rUHk6oF4WBgUfx/9KU9Blbqafy65mExM1ZqqHeAYlJbI3euMV23Yla/ZgRH 0it+7CfnfiEIdp2KZ5hc8JDQ5ag9dLIkhN/S3HmkkFAbejQQQAKxgNtioYErxQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vgetSH48vQGAkNebe8jmBtOpjitwBoFE0W/EOhPLk0E=; b=CVwC2lUyPUuvPBZB0lwQ25oZbs+oE/PyFQRylkvqakjOz944/rbOp2ULxNCnREbV52Amni UrkeN+wB5m6T9OPAhmqPw+x6Ssc8j9yalSeCnY+2QRUF0JFSGAbDRHShvvvyOS46KLiINc 1D6hPsFqTPs0uJGznHpMlQEsaRNjuZeq8CxUBDbmPBiXQWTpZG8IcXcmO0WRqubGNkPNZI Gz4rnHjiyxGHvfyhnHhk7avgFnTcQbbGACd1dC+HGTrCqbh1PZcfpVQatjANpmIEm3Q6lC fHEFIiH4xEtFe5kydTrE2N4/4304wUJeVZ6wvyoummcYWDxdRXl5jKZ4qaIsUw== Date: Fri, 24 Feb 2023 03:22:19 +0000 Message-Id: <20230224032220.14820-4-antero@mailbox.org> In-Reply-To: <20230224032220.14820-1-antero@mailbox.org> References: <20230224032220.14820-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: io7mo3i43arniccoegdr5sgjmqgkj7is X-MBO-RS-ID: ffe00867362e66bfa18 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: , Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/suckless.scm (lib9): New variable. --- gnu/packages/suckless.scm | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 8844482cc9..7f79e9d7e9 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -1252,3 +1252,75 @@ (define-public svkbd (description "svkbd is a simple virtual keyboard, intended to be used in environments, where no keyboard is available.") (license license:expat))) + +(define-public lib9 + ;; no release since 2010 + (let ((commit "63916da7bd6d73d9a405ce83fc4ca34845667cce") + (revision "0")) + (package + (name "lib9") + (version (git-version "7" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.suckless.org/9base/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04j8js4s3jmlzi3m46q81bq76rn41an58ffhkbj9p5wwr5hvplh8")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;no tests + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "config.mk" + (("^PREFIX.*=.*$") + (string-append "PREFIX=\"" #$output "\"\n")) + (("^OBJTYPE.*=.*$") + #$@(cond + ((target-x86-64?) + #~(string-append "OBJTYPE=x86_64\n")) + ((target-x86?) + #~(string-append "OBJTYPE=386\n")) + ((target-powerpc?) + #~(string-append "OBJTYPE=power\n")) + ((target-arm32?) + #~(string-append "OBJTYPE=arm\n")))) + (("^CFLAGS.*+=.*$") + (string-append + "CFLAGS+=-O2 -g -I. -fPIC -c -DPLAN9PORT " + "-DPREFIX=\\\"" #$output "\\\"\n")) + (("^LDFLAGS.*+=.*$") + "LDFLAGS+=\n") + (("^CC.*=.*$") + (string-append "CC=" #$(cc-for-target) "\n"))) + (substitute* "lib9/libc.h" + (("#define main.*p9main") + "")) + (substitute* "lib9/main.c" + (("p9main\\(argc, argv\\);") + "") + (("extern void p9main\\(int, char\\*\\*\\);") + "")) + (substitute* "lib9/Makefile" + (("lib9.a") + "lib9.so") + (("LIB9OFILES=\\\\") + "LIB9OFILES=convM2D.o \\") + (("@\\$\\{AR\\} \\$\\{LIB\\} \\$\\{OFILES\\}") + "gcc -shared ${OFILES} -o lib9.so")))) + (add-after 'patch 'chdir + (lambda _ + (chdir "lib9"))) + (delete 'configure)))) ;no configure script + (home-page "https://tools.suckless.org/9base/") + (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" + "powerpc-linux")) + (synopsis "Unix port of Plan 9's formatted I/O C library") + (description + "This package provides a ported version of the Plan 9 lib9 C library. +It also contains the Plan 9 libbio, libregexp, libfmt and libutf libraries.") + (license (list license:expat ;modifications + license:lpl1.02))))) ;original plan9 code From patchwork Fri Feb 24 03:22:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 47252 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 9E48A16BBC; Fri, 24 Feb 2023 03:24:11 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 AAB4A16B9D for ; Fri, 24 Feb 2023 03:24:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVOgr-0003H3-3d; Thu, 23 Feb 2023 22:24:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVOgl-0003G9-3Q for guix-patches@gnu.org; Thu, 23 Feb 2023 22:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVOgk-0006Bs-Ro for guix-patches@gnu.org; Thu, 23 Feb 2023 22:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVOgk-00051u-OK for guix-patches@gnu.org; Thu, 23 Feb 2023 22:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61745] [PATCH 5/5] gnu: Add 9yacc. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2023 03:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61745@debbugs.gnu.org Cc: Antero Mejr Received: via spool by 61745-submit@debbugs.gnu.org id=B61745.167720899119266 (code B ref 61745); Fri, 24 Feb 2023 03:24:02 +0000 Received: (at 61745) by debbugs.gnu.org; 24 Feb 2023 03:23:11 +0000 Received: from localhost ([127.0.0.1]:35725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfu-00050g-GO for submit@debbugs.gnu.org; Thu, 23 Feb 2023 22:23:10 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:33136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVOfs-00050G-QJ for 61745@debbugs.gnu.org; Thu, 23 Feb 2023 22:23:09 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4PNFZs1fbFz9sLy for <61745@debbugs.gnu.org>; Fri, 24 Feb 2023 04:23:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZB/LaOlCxwQm1QfZgFsuLwrqXoQjrwtvEjbj+W96XGE=; b=eilwiDhUXjz7+59Z5K4CKpDYNOruI39ZNJWwimcPO0ryND10rfz4ftehDxuoacwXowRs+l yevV7iP7FNwB4qXz+wFDoIhux8fKipH9O0faL40cxpSgNrW7/aUa4/N8QoyORj426cZhUV DQyShXIljgOW1ogQMtq0afUwbZDjKBuJKwVmf162Ua7QC7eihxpTIj67lKUI+XR3jC/cCX Q5ShE7VtOdChsKW9U3c0uAq9vFbbTOa0R45YlM2oYGKbZustVCRNyj8YegaN2lNYrAK8hM t5yrSRBZ5VZO9JnHJqtPLO9S7CsWr0YnwxYQ4GDY51GDbu7zZqeYUCvUuIZxow== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1677208979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZB/LaOlCxwQm1QfZgFsuLwrqXoQjrwtvEjbj+W96XGE=; b=ypfa5QMa2fqwY7QeLPQj/VotIE1u6ZlqcO2TbiYGTij9GFy4lHse+hRooIF56QFAOGQDyb DrKdM+VH9/QVB/9aRApEtL5OSit9wVdQ0RuCq7f6RIDqCMzjl4FIPwUCy3aOq5dXV+8c3f 3yXxLjPBB/J4pQQtGIwBrYwCdMVowclnh2cJRQHWGZcbHWhuUMLn/nIhxuJISyaXxJ6vsC FlYemDX+ttZhPvfM3vY4ZWDj0jWg+O8Xxt/DsPASr5UQvZqi1O7LzB9MDhcr2SL78FDPsu rRXm34rk+Z+bt2odmI6B4c+l7v3B9XanPivZD5HN95a2S1vTmFhFNN7pOriIbQ== Date: Fri, 24 Feb 2023 03:22:20 +0000 Message-Id: <20230224032220.14820-5-antero@mailbox.org> In-Reply-To: <20230224032220.14820-1-antero@mailbox.org> References: <20230224032220.14820-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: nenwahz35g7bznam5cett5trrocsdh1e X-MBO-RS-ID: ed105b0ce2fa4903a21 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: , Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/suckless.scm (9yacc): New variable. --- gnu/packages/suckless.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 7f79e9d7e9..cfd70df027 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -1324,3 +1324,34 @@ (define-public lib9 It also contains the Plan 9 libbio, libregexp, libfmt and libutf libraries.") (license (list license:expat ;modifications license:lpl1.02))))) ;original plan9 code + +(define-public 9yacc + (package + (inherit lib9) + (name "9yacc") + (arguments + (substitute-keyword-arguments (package-arguments lib9) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'patch 'patch-for-9yacc + (lambda _ + (substitute* "yacc/yacc.c" + (("#9/yacc") + (string-append #$output "/lib"))) + (substitute* "config.mk" + (("^CFLAGS.*+=.*$") + (string-append "CFLAGS+=-O2 -g -c -DPLAN9PORT " + "-DPREFIX=\\\"" #$output "\\\"\n"))))) + (replace 'chdir + (lambda _ + (chdir "yacc"))) + (delete 'install-include) + (add-after 'install 'install-yaccpar + (lambda _ + (install-file "yaccpar" (string-append #$output "/lib")) + (install-file "yaccpars" (string-append #$output "/lib")))))))) + (inputs (list lib9)) + (synopsis "Port of Plan 9's yacc parser generator for Unix") + (description + "This package provides a ported version of the Plan 9 yacc parser +generator.")))