From patchwork Sun Jan 9 19:10:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 36186 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 C5F1827BBEA; Sun, 9 Jan 2022 19:11:51 +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,FREEMAIL_FROM,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 7277D27BBE9 for ; Sun, 9 Jan 2022 19:11:51 +0000 (GMT) Received: from localhost ([::1]:40082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dbZ-00028c-12 for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:11:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6dao-0001Zy-7I for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6dan-00068A-V6 for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6dan-0007lu-QV for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 01/13] doc: Give some tips on Minetest packaging. References: <0498a1400cfa72db28da35e46d64bf6e1267b3d7.camel@telenet.be> In-Reply-To: <0498a1400cfa72db28da35e46d64bf6e1267b3d7.camel@telenet.be> Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175542029682 (code B ref 53144); Sun, 09 Jan 2022 19:11:01 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:20 +0000 Received: from localhost ([127.0.0.1]:51286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6da7-0007ib-Jw for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:19 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6da6-0007iQ-Ih for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:19 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jAHrm; Sun, 09 Jan 2022 20:10:17 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:03 +0000 Message-Id: <20220109191015.33058-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755417; bh=e71yQUMfNEbdomYy27kIuF7SCJpK6wgxM+AZ31AwVgE=; h=From:To:Cc:Subject:Date; b=oUUN2HaU441kfjTPWwqI26E8fLlQ93uPORSzg6VBI8AoV3TU6G7Y5C9WFaFPrGugl c6/sSjX5OUaeqvtSYXTrdzB9mIo9O756aAbNS8dLU8Sm4ZdjCfpbwBSEnz/99mZ0fm fITtK00L4iVrVo+WlVz/8ozc6+FkJidAxFQ2Wa3du1oKUm55NVatsULHIoBfXuGHAP E6Y7JF71RsXa0wfpG7EiqOig9eQsZr1KXKUjHR+V9oru/2Mygl04CSMAjtOcrezDGR 5r84atigyj1BkBrl6Thtf7tN36HCqHHcJAnaGcWJwwety41c0bCa8nVX5fQnbFbdwK LrmHQzl57aQQQ== 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 * doc/contributing.texi (Minetest Packages): New section. * doc/guix.texi: Copyright update. --- doc/contributing.texi | 42 ++++++++++++++++++++++++++++++++++++++++++ doc/guix.texi | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) base-commit: 9fd4f4b09cc0495d6b1418f171ff738a1086cc00 diff --git a/doc/contributing.texi b/doc/contributing.texi index 72f5ce1e0e..5b91fc7867 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -394,6 +394,7 @@ needed is to review and apply the patch. * Synopses and Descriptions:: Helping users find the right package. * Snippets versus Phases:: Whether to use a snippet, or a build phase. * Emacs Packages:: Your Elisp fix. +* Minetest Packages:: Building blocks. * Python Modules:: A touch of British comedy. * Perl Modules:: Little pearls. * Java Packages:: Coffee break. @@ -703,6 +704,47 @@ When encountering problems, it is wise to check for the presence of the file, and whether any dependencies and their versions listed therein are satisfied. +@node Minetest Packages +@subsection Minetest Packages +@cindex minetest, packaging + +A Minetest mod @code{foo} is named @code{minetest-foo} -- the author +name from ContentDB is not included, unless required to resolve a name +collision. + +Sometimes, it might be unclear what the version of a Minetest mod is. +For example, ContentDB and the importer reports 2020-01-01, but +according to the forums the version is 2.1. Usually, in these cases the +version on ContentDB is the newest and intended for distribution. As +such, you can use the version from ContentDB without any special +comments. + +@c Currently it's always checked out from git, but in principle +@c tarballs could be used. + +Even though the source code is often checked out from version control, +it is not necessary to use @code{git-version} or @code{hg-version}: the +releases on ContentDB are formal releases; in fact they are upstream's +official source of Minetest packages and they are not mutated in-place. + +@c Example (zip): mods by TenPlus1 +@c Example (git): basic_materials, ethereal +While ContentDB provides the source code of packages in zip form, it is +recommended not to use these, because users can and do delete old +versions. Likewise, sometimes the maintainer initially did tag versions +but later stops doing so, breaking @command{guix refresh -u}. As such, +it is recommended not to use git tags in @code{origin} records and +instead refer to the commit directly. + +The dependency information from ContentDB is usually correct. However, +sometimes to actually use a Minetest mod, an additional non-declared +Minetest mod is required. For example, to craft an item from a mod +@code{minetest-basic-materials} in non-creative mode, an item from the +mod @code{minetest-moreores} is required. In such situations, it is +recommended to add @code{minetest-moreores} to the inputs of +@code{minetest-basic-materials}. The dependencies go into +@code{propagated-inputs}. + @node Python Modules @subsection Python Modules diff --git a/doc/guix.texi b/doc/guix.texi index 08e5bfa111..0e19285c1c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -88,7 +88,7 @@ Copyright @copyright{} 2020 Daniel Brooks@* Copyright @copyright{} 2020 John Soo@* Copyright @copyright{} 2020 Jonathan Brielmaier@* Copyright @copyright{} 2020 Edgar Vincent@* -Copyright @copyright{} 2021 Maxime Devos@* +Copyright @copyright{} 2021, 2022 Maxime Devos@* Copyright @copyright{} 2021 B. Wilson@* Copyright @copyright{} 2021 Xinglu Chen@* Copyright @copyright{} 2021 Raghav Gururajan@* From patchwork Sun Jan 9 19:10:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 36183 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 CCF0A27BBEA; Sun, 9 Jan 2022 19:11:41 +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,FREEMAIL_FROM,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 7723E27BBE9 for ; Sun, 9 Jan 2022 19:11:41 +0000 (GMT) Received: from localhost ([::1]:39380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dbQ-0001cg-IQ for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:11:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6dao-0001a2-Ir for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58430) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6dao-00068G-Au for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6dao-0007m1-6d for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 02/13] gnu: minetest-ethereal: Follow new versioning conventions. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175542529734 (code B ref 53144); Sun, 09 Jan 2022 19:11:02 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:25 +0000 Received: from localhost ([127.0.0.1]:51304 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daB-0007jM-17 for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:24 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6da7-0007iS-84 for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:19 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jAJrr; Sun, 09 Jan 2022 20:10:18 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:04 +0000 Message-Id: <20220109191015.33058-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755418; bh=l2Vkk6GgmcJN0O3aAtrN/zl32DbHgOtMpY4LTFN1Ma8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AiuZl2D9yd2tI0NjGYiluxEK9zD6RyZtclVbnRhYFvUZkOf8Y4R9kgK/8HxdOUVb1 GojNujX96LsH7EYmCQ9iReOGzjpI6xfFZmkxxOU8m5O4KRD+lEH6NlaEH0KDEI/Vvo 7GYoqwTbMVCW9h9nesTQp9Tami0xDVCKuI/i09s6fdfIRvftMt9jxLC4KUbZcl4DTZ CMrPdNiJxbY8C18C+SHw/G62y2kOkN8GmnZTpNFaq9Sb3LfY78ObGXugVGPrZpFq4q YZGkEMNsQRuZPlDxzS2jYMuDo/oIeyrjJYSU+lq3l+VK72NMh2qqwyDxQzNztQomwu 0LAn6pqx44EyA== 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 * gnu/packages/minetest.scm (minetest-ethereal): Use version from ContentDB. --- gnu/packages/minetest.scm | 45 +++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index c431942473..56892a5aff 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -266,33 +266,28 @@ (define-public minetest-coloredwood (properties `((upstream-name . "VanessaE/coloredwood"))))) (define-public minetest-ethereal - ;; ContentDB release 2021-07-28 is slightly ahead of the - ;; initial version 1.29 -- i.e., some released changes have been - ;; made to version 1.29 without a corresponding version bump. - (let ((commit "7670c1da9274901f57f6682384af2b3bae005a86") - (revision "0")) - (package - (name "minetest-ethereal") - (version (git-version "1.29" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://notabug.org/TenPlus1/ethereal") - (commit commit))) - (sha256 - (base32 "1hal8bq4fydsip7s8rqz4vlaaqy9rhzxmryd0j2qnqm9286yjgkk")) - (file-name (git-file-name name version)))) - (build-system minetest-mod-build-system) - (home-page (minetest-topic 14638)) - (synopsis "The Ethereal mod adds many new biomes to Minetest") - (description - "The Ethereal Minetest mod uses the v7 map generator to add many new + (package + (name "minetest-ethereal") + (version "2021-07-28") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/TenPlus1/ethereal") + (commit "7670c1da9274901f57f6682384af2b3bae005a86"))) + (sha256 + (base32 "1hal8bq4fydsip7s8rqz4vlaaqy9rhzxmryd0j2qnqm9286yjgkk")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (home-page (minetest-topic 14638)) + (synopsis "The Ethereal mod adds many new biomes to Minetest") + (description + "The Ethereal Minetest mod uses the v7 map generator to add many new biomes to the world. It adds new trees, plants, food items, tweaks and some special items, intending to make an interesting adventure.") - ;; CC0: some textures - (license (list license:cc0 license:expat)) - (properties `((upstream-name . "TenPlus1/ethereal")))))) + ;; CC0: some textures + (license (list license:cc0 license:expat)) + (properties `((upstream-name . "TenPlus1/ethereal"))))) (define-public minetest-homedecor-modpack (package From patchwork Sun Jan 9 19:10:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 36192 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 B4B0127BBEA; Sun, 9 Jan 2022 19:12:22 +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,FREEMAIL_FROM,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 5BC7027BBE9 for ; Sun, 9 Jan 2022 19:12:22 +0000 (GMT) Received: from localhost ([::1]:41378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dc5-00032F-IZ for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:12:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6dao-0001ag-Vp for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6dao-00068L-Np for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6dao-0007m8-JG for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 03/13] gnu: minetest-mesecons: Follow new versioning conventions. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175542629753 (code B ref 53144); Sun, 09 Jan 2022 19:11:02 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:26 +0000 Received: from localhost ([127.0.0.1]:51312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daC-0007jX-MO for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:25 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6da7-0007iQ-Kt for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:20 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jAKrv; Sun, 09 Jan 2022 20:10:19 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:05 +0000 Message-Id: <20220109191015.33058-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755419; bh=m8pqHuzwGVriuXuQlcUulFf+k9u/2T06fPj5IOsQ9VI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KcWY8XPvSq/GDMXQ5OiGePtFeiMrxpkhUkdKuBpAsLhnMYjly8b3g7WXgBXVz/T5z otqTHTbORQIo91tP+/338hFvDMlsGj7aGMsZuPa6plITEl6ZqCSGjeNq12/4Vq3jW0 gJKVF1JfDiJh3SN/XtaOXB3DNQB3Ac45eFqKLM7GBuCvHXXJ2zhmjMhY8H7/JEzu2H sCZpjrIhuwnbBNd0+AEZKqLwOwffqBIepFiZtF5x2JwVVIJTPNACUlycz3JpBHIWUg 4xibwp6cUyo6lmPBprW1Vh/8TFDvDGkC1Z1VgwFo2XevnAIbkJZLrPeIEoDrklB04U NICKjEmMs9p8A== 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 * gnu/packages/minetest.scm (minetest-mesecons): Use version from ContentDB. --- gnu/packages/minetest.scm | 53 ++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 56892a5aff..fd68877330 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -320,40 +320,37 @@ (define-public minetest-homedecor-modpack (properties `((upstream-name . "VanessaE/homedecor_modpack"))))) (define-public minetest-mesecons - ;; The release on ContentDB does not have its own version number. - (let ((commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7") - (revision "0")) - (package - (name "minetest-mesecons") - (version (git-version "1.2.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest-mods/mesecons") - (commit commit))) - (sha256 - (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645")) - (file-name (git-file-name name version)))) - (build-system minetest-mod-build-system) - (home-page "https://mesecons.net") - (synopsis - "Digital circuitry for Minetest, including wires, buttons and lights") - (description - "Mesecons is a mod for Minetest implementing various items related + (package + (name "minetest-mesecons") + (version "2021-07-25") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest-mods/mesecons") + (commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7"))) + (sha256 + (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (home-page "https://mesecons.net") + (synopsis + "Digital circuitry for Minetest, including wires, buttons and lights") + (description + "Mesecons is a mod for Minetest implementing various items related to digital circuitry, such as wires, buttons, lights and programmable controllers. Among other things, there are also pistons, solar panels, pressure plates and note blocks. Mesecons has a similar goal to Redstone in Minecraft, but works in its own way, with different rules and mechanics.") - ;; LGPL for code, CC-BY-SA for textures. - ;; The README.md and COPYING.txt disagree about the "+" in license:lgpl3+. - ;; For now, assume README.md is correct. Upstream has been asked to - ;; correct the inconsistency: - ;; . - (license (list license:lgpl3+ license:cc-by-sa3.0)) - (properties `((upstream-name . "Jeija/mesecons")))))) + ;; LGPL for code, CC-BY-SA for textures. + ;; The README.md and COPYING.txt disagree about the "+" in license:lgpl3+. + ;; For now, assume README.md is correct. Upstream has been asked to + ;; correct the inconsistency: + ;; . + (license (list license:lgpl3+ license:cc-by-sa3.0)) + (properties `((upstream-name . "Jeija/mesecons"))))) (define-public minetest-mineclone (package From patchwork Sun Jan 9 19:10:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 36185 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 7DF9727BBEB; Sun, 9 Jan 2022 19:11:49 +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,FREEMAIL_FROM,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 3E6CE27BBEA for ; Sun, 9 Jan 2022 19:11:49 +0000 (GMT) Received: from localhost ([::1]:40030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dbY-00026h-D6 for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:11:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6dap-0001aj-Cb for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58432) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6dap-00068T-48 for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6dao-0007mG-W0 for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 04/13] gnu: minetest-throwing: Follow new versioning conventions. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175542629766 (code B ref 53144); Sun, 09 Jan 2022 19:11:02 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:26 +0000 Received: from localhost ([127.0.0.1]:51314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daD-0007jq-TR for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:26 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6da8-0007iS-2z for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:20 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jAKs3; Sun, 09 Jan 2022 20:10:19 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:06 +0000 Message-Id: <20220109191015.33058-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755419; bh=KwXafmh0LuiycLQJblB/ILVKEVT9pEMiraf5feWZsnU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gjXfuJ2/ST3KXM2nMudyNxnsc1bT8EuCospPbhddkiu2KdK/vkd3ZrVOaHIjPd5ss L6f2IKKCdluoYEqaCs7Nlp1QObkF3/VO//dPuF9u6AITQNYIoXbfUenJ9f5hizqcSR Rwm+lSdNAn8JVcQld+ZK085kc2l+2nG+f9m1SAJ4Quv+2/VlSUxp50TOJ5xmzdw6yN wIHnuSVcBCoeahQUxbN89ZuKWRilat2PWAiT1xSyES/AJG0dhvuOiz0HeshFXyL9YC zzjQIf7eqheP3TnsQjGxB3yY38LtDdIfXUMtrzpusgg3TZL3qbhriv7z3IUQzgmbfo MKfdV0sb0U0Xw== 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 * gnu/packages/minetest.scm (minetest-throwing): Use version from ContentDB. --- gnu/packages/minetest.scm | 42 ++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index fd68877330..cdf862e189 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -498,31 +498,27 @@ (define-public minetest-technic (properties `((upstream-name . "RealBadAngel/technic"))))) (define-public minetest-throwing - ;; The latest release on ContentDB is ahead of the latet - ;; tagged commit. - (let ((commit "31f0cf5f868673dc82f24ddc432b45c9cd282d27") - (revision "0")) - (package - (name "minetest-throwing") - (version (git-version "1.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest-mods/throwing") - (commit commit))) - (sha256 - (base32 "1s5kkr6rxxv2dhbbjzv62gw1s617hnpjavw1v9fv11v3mgigdfjb")) - (file-name (git-file-name name version)))) - (build-system minetest-mod-build-system) - (home-page (minetest-topic 16365)) - (synopsis "API for throwing things in Minetest") - (description - "This Minetest mod provides an API for registering throwable things and + (package + (name "minetest-throwing") + (version "2020-08-14") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest-mods/throwing") + (commit "31f0cf5f868673dc82f24ddc432b45c9cd282d27"))) + (sha256 + (base32 "1s5kkr6rxxv2dhbbjzv62gw1s617hnpjavw1v9fv11v3mgigdfjb")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (home-page (minetest-topic 16365)) + (synopsis "API for throwing things in Minetest") + (description + "This Minetest mod provides an API for registering throwable things and throwing things like arrows. However, this mod does not provide an actual arrow and bow, but @code{minetest-throwing-arrows} does.") - (license license:mpl2.0) - (properties `((upstream-name . "Palige/throwing")))))) + (license license:mpl2.0) + (properties `((upstream-name . "Palige/throwing"))))) (define-public minetest-throwing-arrows ;; There is only one tagged commit (version 1.1), From patchwork Sun Jan 9 19:10:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 36193 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 BF2FD27BBEB; Sun, 9 Jan 2022 19:12:53 +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,FREEMAIL_FROM,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 462EC27BBEA for ; Sun, 9 Jan 2022 19:12:53 +0000 (GMT) Received: from localhost ([::1]:41838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dca-0003ee-CF for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:12:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6daq-0001ao-4g for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58434) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6dap-00068e-S4 for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6dap-0007mU-Nv for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 05/13] gnu: minetest: Remove obsolete comments about version numbers. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175542729786 (code B ref 53144); Sun, 09 Jan 2022 19:11:03 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:27 +0000 Received: from localhost ([127.0.0.1]:51318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daF-0007kF-3h for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:27 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6da8-0007it-SY for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:21 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jALs6; Sun, 09 Jan 2022 20:10:20 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:07 +0000 Message-Id: <20220109191015.33058-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755420; bh=akShKiKeJVYor+cVZlWGWSD46OgebaZ0itUXSJ/Ofe0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=c4wty2R9axdCxcGaX1PR5j74XvwJj+VlfuTdEG2TNmttplsPjhsNJKj3KLHedGIji jVuxv1AXpZHeAdrVTviylHFUA2JIkR9zk2eP0qqSnVxJaV+ayMhljDiOIkpSlnUMAu EG52rl9mJDOQvs/cUGSCyadn1GmGdsoYuBTI0ixodp+7bC6/WPfb6hw27zPXwxBTtE U49fBAT0OBZs1Wa5iwL0D5CJBVgrIUt1CB9FNCmQbeR7fe9CKwMxCc0asTu2Nw0yEf UTDa+TnhwwcmsU7Cbtv2nPsHUxUZRVx6bGWL669qiZM6k/cR2cktBPiBZBWLrtpCXH SDryxsKPhc3mg== 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 According to the new contributing documentation about Minetest, the release titles from ContentDB are acceptable. * gnu/packages/minetest.scm (minetest-basic-materials,minetest-coloredwood,minetest-homedecor-modpack) (minetest-mobs,minetest-mobs-animal,minetest-pipeworks,minetest-technic): Remove comments about version numbers / dates. --- gnu/packages/minetest.scm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index cdf862e189..8ade7bb966 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -211,7 +211,6 @@ (define-public minetest-moreores (define-public minetest-basic-materials (package (name "minetest-basic-materials") - ;; Upstream uses dates as version numbers. (version "2021-12-26") (source (origin @@ -240,7 +239,6 @@ (define-public minetest-basic-materials (define-public minetest-coloredwood (package (name "minetest-coloredwood") - ;; Upstream uses dates as version numbers. (version "2021-04-14-1") (source (origin @@ -292,8 +290,6 @@ (define-public minetest-ethereal (define-public minetest-homedecor-modpack (package (name "minetest-homedecor-modpack") - ;; Upstream doesn't tag releases, so use the release title from - ;; ContentDB as version. (version "2021-12-26") (source (origin @@ -379,8 +375,6 @@ (define-public minetest-mineclone (define-public minetest-mobs (package (name "minetest-mobs") - ;; Upstream does not tag release, so use the ContentDB release - ;; title instead. (version "2021-12-12") (source (origin @@ -408,8 +402,6 @@ (define-public minetest-mobs (define-public minetest-mobs-animal (package (name "minetest-mobs-animal") - ;; Upstream does not use version numbers, so use the release title - ;; from ContentDB instead; (version "2021-11-14") (source (origin @@ -435,7 +427,6 @@ (define-public minetest-mobs-animal (define-public minetest-pipeworks (package (name "minetest-pipeworks") - ;; Upstream uses dates as version numbers. (version "2021-04-14-1") (source (origin @@ -466,8 +457,6 @@ (define-public minetest-pipeworks (define-public minetest-technic (package (name "minetest-technic") - ;; Upstream doesn't keep version numbers, so use the release - ;; date on ContentDB instead. (version "2021-09-11") (source (origin @@ -604,8 +593,6 @@ (define-public minetest-unifieddyes (define-public minetest-unified-inventory (package (name "minetest-unified-inventory") - ;; Upstream doesn't keep version numbers, so use the release title - ;; on ContentDB instead. (version "2021-12-26") (source (origin From patchwork Sun Jan 9 19:10:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 36189 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 5F46227BBEA; Sun, 9 Jan 2022 19:12:08 +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,FREEMAIL_FROM,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 2481927BBE9 for ; Sun, 9 Jan 2022 19:12:08 +0000 (GMT) Received: from localhost ([::1]:40740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dbr-0002cW-9X for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:12:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6dap-0001an-Ov for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6dap-00068Y-GE for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6dap-0007mN-Bd for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 06/13] gnu: minetest-ethereal: Update to 2022-01-05. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175542729779 (code B ref 53144); Sun, 09 Jan 2022 19:11:03 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:27 +0000 Received: from localhost ([127.0.0.1]:51316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daE-0007k3-Hw for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:27 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6da8-0007iQ-Tr for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:21 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jALs8; Sun, 09 Jan 2022 20:10:20 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:08 +0000 Message-Id: <20220109191015.33058-6-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755420; bh=k8p13aMiTaiLFT1RSdFyNXwO8UZqd/omk/EYV0OKFvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CJVVSn6lqlyQwoZ19E3d+bmAuyIQA4j+M01hSjkx3/+mazId9hf8A5vL8tbW6mOlf 0nYJeZk+LuRvSqTGOATnwkdR/vfo9m7Q/1/STduj2w8iH908hRNk139QQEjQfTwkh8 DjWLEwPag8Va/AgyPlPHQgaBPzK9Rg7uWEcXBj6DH0S/Ux8f7/q5ybPEqtMhq02CZI yO/xc6kiQ4mIpJQUKoPW7W0GTOaEaazY9y6+2fesSTaLcX1Ue0oQz7Ozj89o9iCddD IojkscNzQhujveZG7wyya+9SuEKyX3rLsgxJtvC209OYBNT6lM1MYKz62/Jtr8AKei zSAlfRxBJ+zNA== 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 * gnu/packages/minetest.scm (minetest-ethereal): Update to 2022-01-05. --- gnu/packages/minetest.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 8ade7bb966..40c658fdb3 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -266,15 +266,15 @@ (define-public minetest-coloredwood (define-public minetest-ethereal (package (name "minetest-ethereal") - (version "2021-07-28") + (version "2022-01-05") (source (origin (method git-fetch) (uri (git-reference (url "https://notabug.org/TenPlus1/ethereal") - (commit "7670c1da9274901f57f6682384af2b3bae005a86"))) + (commit "fefa1b76fb04331dbde59dd745d120c1c728e9f7"))) (sha256 - (base32 "1hal8bq4fydsip7s8rqz4vlaaqy9rhzxmryd0j2qnqm9286yjgkk")) + (base32 "1hs1xrxb99kcrq03yl1bkbr0hnql9n0wblqn5sirs6wb3qshx9zd")) (file-name (git-file-name name version)))) (build-system minetest-mod-build-system) (home-page (minetest-topic 14638)) From patchwork Sun Jan 9 19:10:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 36188 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 E97C927BBEA; Sun, 9 Jan 2022 19:12:07 +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,FREEMAIL_FROM,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 A5E0127BBE9 for ; Sun, 9 Jan 2022 19:12:07 +0000 (GMT) Received: from localhost ([::1]:40676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dbq-0002Zm-RM for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:12:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6daq-0001ar-S9 for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6daq-00068k-8Y for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6daq-0007mc-47 for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 07/13] gnu: minetest-mesecons: Update to 2021-11-28. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175542829793 (code B ref 53144); Sun, 09 Jan 2022 19:11:04 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:28 +0000 Received: from localhost ([127.0.0.1]:51320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daF-0007kN-JY for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:27 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6da9-0007iS-7r for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:21 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jALsC; Sun, 09 Jan 2022 20:10:21 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:09 +0000 Message-Id: <20220109191015.33058-7-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755421; bh=z5QDQxqb8fdrzOyWSFnVkmjWZqzjamqwWAVgABzFOyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nVIxUIuki2V78N5ZhmKtuM10DmcP2hkcNxYvcn4eMa39mSsRoZ5BJUtFUYqOzgCci BAbv6q7ZxyLl1+sfgMk8OENlmE1/FYTA9E3ra/slMJ3yPLGj4eL89sMzd9G58wrPYm rofiWT5lC71zMDsRQ8zVrebrn3VgHJiOP/RQ6+oTj+XunBIczGG94SyW/hsbz72hEm dCon4WbSjRmsnA7BIR6uLcjoyo5I0yLZlq3MDkIcxCYMW8+5jriP00tG8a6DfC7Pfz L7GYFd++UWDyVu6RheqFcyfKUDvn2vDfYvxH3aEnCK3mFOIp5wcFRliHfvxppWUBU2 4ndlgkrDBpEAQ== 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 * gnu/packages/minetest.scm (minetest-mesecons): Update to 2021-11-28. --- gnu/packages/minetest.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 40c658fdb3..8940672e33 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -318,15 +318,15 @@ (define-public minetest-homedecor-modpack (define-public minetest-mesecons (package (name "minetest-mesecons") - (version "2021-07-25") + (version "2021-11-28") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/minetest-mods/mesecons") - (commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7"))) + (commit "ecea0a2896d488f82f34505eb608ab5f527f50ec"))) (sha256 - (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645")) + (base32 "14v4vfwlk7dg5lk93sjdjg7n8amw0qlcxdn3d0gdfwvx8305vn5r")) (file-name (git-file-name name version)))) (build-system minetest-mod-build-system) (home-page "https://mesecons.net") From patchwork Sun Jan 9 19:10:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 36184 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 3D98427BBEA; Sun, 9 Jan 2022 19:11:42 +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,FREEMAIL_FROM,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 084A227BBE9 for ; Sun, 9 Jan 2022 19:11:42 +0000 (GMT) Received: from localhost ([::1]:39440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dbR-0001fl-5q for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:11:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6daq-0001at-Sq for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58436) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6daq-00068m-Jk for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6daq-0007mj-FT for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 08/13] gnu: minetest-mobs: Update to 2022-01-03. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175542829800 (code B ref 53144); Sun, 09 Jan 2022 19:11:04 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:28 +0000 Received: from localhost ([127.0.0.1]:51322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daF-0007kU-W2 for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:28 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6da9-0007iQ-LG for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:21 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jAMsG; Sun, 09 Jan 2022 20:10:21 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:10 +0000 Message-Id: <20220109191015.33058-8-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755421; bh=IZR+URTHfEHVCxQpLjYJmh1ajDFltsFFFaIMGddDOJI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Edq3OXi7J0N0nA4U48xTpOdhfB5oTFCXS17GsVru2swVj1U+lmJsyqytxKxCGvdMd LFCOtc9qd/jyTCR5McEitRtTSCCm3c94WsuwvIpmQgjJe45SB29zqPuZA7ejrbE1fc u4sPBpK9rz+le99u3v3fA9/VB01S9L1+v07g5CirgAZ4X4Kf4NsBwIsfILWpI87K4h JJw6v2PA2Km3Rm4IJxDUvBfLvN3EVf+T2CNwB4Daa51Swmaa6XXhQ8zOW2ljjzPXU2 UukpIEbun3Z+iWki7EyeGe0yu7bMtRjXG89xSTfhDm3whmP4X2Wu6hceSMW9sSJ9hl VMdCwVaRBUpsg== 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 * gnu/packages/minetest.scm (minetest-mobs): Update to 2022-01-03. --- gnu/packages/minetest.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 8940672e33..9122e01463 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -375,15 +375,15 @@ (define-public minetest-mineclone (define-public minetest-mobs (package (name "minetest-mobs") - (version "2021-12-12") + (version "2022-01-03") (source (origin (method git-fetch) (uri (git-reference (url "https://notabug.org/TenPlus1/mobs_redo") - (commit "6a4a02f3fbf1038c69e72aaafa52a1e7d6106da8"))) + (commit "e5d1958e16fa9df1b0b8cfcd425fb82981a29370"))) (sha256 - (base32 "0vgv7jpm9v3dwq4l9jxdd5z14yq164w8kin1d05jfv3ck4hwlwvr")) + (base32 "1pj08750m9123z0r5yxwcp5ncdml9c9rfv4sv45rvhq8npk5hvcw")) (file-name (git-file-name name version)))) (build-system minetest-mod-build-system) (home-page (minetest-topic 9917)) From patchwork Sun Jan 9 19:10:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 36187 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 E7DA427BBEA; Sun, 9 Jan 2022 19:11:55 +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,FREEMAIL_FROM,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 656F927BBE9 for ; Sun, 9 Jan 2022 19:11:55 +0000 (GMT) Received: from localhost ([::1]:40140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dbe-0002Ay-Ik for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:11:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6das-0001b7-DX for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6das-00069I-5B for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6das-0007nC-0q for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 09/13] doc: Document the Minetest importer. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175543429835 (code B ref 53144); Sun, 09 Jan 2022 19:11:05 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:34 +0000 Received: from localhost ([127.0.0.1]:51330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daL-0007l3-TY for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:34 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daA-0007it-0l for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:26 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jAMsL; Sun, 09 Jan 2022 20:10:21 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:11 +0000 Message-Id: <20220109191015.33058-9-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755421; bh=Wizf0e3yxGGfIFfEv8IqilX6aZQwIYW+JfUrnLpz9AU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=N8TugxQdJ+G6DFsgtoAWdH63HGXTzo57L0mALJKQUqD+x1ahbVFD6HdiOVPhr5Kvr aucDG1T7RmUbJ1djFWEnH0tTXgeN6CW1j8lcPrKeTZBfQCG7JFF6eTwdTeEKfy3DQi XFc+180AywfRogIeokaWiMT2oN34gKWGIkYbZwKYjktfjkbnsaq8UXmkJq8h9cg7SX CLmArJKPRUjChBej30MmS0D2JkrVKK+RFIDjX4YvHLeceaA7IhPnm6pFao1ilcr4t6 VQdGPn9+phFmELh8VrpInjpSQfETkcuLvwg4V4+hGKn6rWlsdDmEAQWXeIbc6/l6j0 axjlAaMsQLuvQ== 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 * doc/guix.texi (Invoking guix refresh): Include the Minetest importer in the list. --- doc/guix.texi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 0e19285c1c..5c1b9adb87 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12575,6 +12575,8 @@ the updater for @uref{https://rubygems.org, RubyGems} packages. the updater for @uref{https://github.com, GitHub} packages. @item hackage the updater for @uref{https://hackage.haskell.org, Hackage} packages. +@item minetest +the updater for @uref{https://content.minetest.net, ContentDB} packages. @item stackage the updater for @uref{https://www.stackage.org, Stackage} packages. @item crate From patchwork Sun Jan 9 19:10:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 36195 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 96E2627BBEA; Sun, 9 Jan 2022 19:13: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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 E042527BBE9 for ; Sun, 9 Jan 2022 19:13:10 +0000 (GMT) Received: from localhost ([::1]:42256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dcs-0003w5-3p for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:13:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6dar-0001av-8C for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6dar-000693-05 for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6daq-0007mq-Rn for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 10/13] upstream: Support incrementing the revision of 'git-version'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175543329812 (code B ref 53144); Sun, 09 Jan 2022 19:11:04 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:33 +0000 Received: from localhost ([127.0.0.1]:51324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daK-0007kk-Cd for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:32 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daA-0007iS-BC for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:24 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jAMsP; Sun, 09 Jan 2022 20:10:22 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:12 +0000 Message-Id: <20220109191015.33058-10-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755422; bh=v1TrHB2SStczDDlPbBh4hKVcK72fHybe/vEEVbeutjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ppx3QnbhxysRsjkl5xpd4ULQrxSurSlyiwZiMysW7ZmE5cxN6QsMqlBn6R2d+AlTO 0iNxR45adqn0UNpv71uP/T17obMtXA3XosMq1YefpKrAzYrgd0hMEFPez173yEn5/Y AshmW1P1REYgbML9QTHMLNwBQPDk7o2zTkt4DxE1nA3GvXMu5v4YCvcXFKnPtAvnKY WZyVBMGzmcY6YZEecRhRcwVpx2vnpOnuovc1/Upxy91LSQ4pRbDTDHX2ZhnR1TglCG YtmnS5yKZN4jKKogLdHBsvdhnQsokb0QctPNR3E0EYhXNnUCPD4jNuzjLMMQHwMRUj KcnvzjdVM3NNw== 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 This is currently pointless, because no updater returns such versions. A future patch will introduce an updater returning such versions. * guix/upstream.scm (git-version-regexp): New variable. (maybe-git-version, maybe-git-version->revision) (maybe-git-versions->revision-replacements): New procedures. (update-package-source): Use 'package-definition-location' instead of 'package-location'. Also replace the revision. --- guix/upstream.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++- tests/upstream.scm | 37 ++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index 6666803a92..6b65147356 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -61,6 +61,10 @@ (define-module (guix upstream) url-prefix-predicate coalesce-sources + decompose-git-version + maybe-git-version->revision + maybe-git-versions->revision-replacements ; for tests + upstream-updater upstream-updater? upstream-updater-name @@ -230,6 +234,55 @@ (define (release>? r1 r2) (sort sources release>?))) + + +;;; +;;; Manipulating results of 'git-version'. +;;; TODO: also supporting Mercurial ('hg-version') would be nice. +;;; + +;; A regexp matching versions constructed by 'git-version'. +(define git-version-regexp + (delay (make-regexp "^(.+)-([0123456789]+).([0123456789abcdefg]{7})$"))) + +(define (decompose-git-version git-version-string) + "Split the version string GIT-VERSION-STRING constructed by 'git-version' +in three parts: the version it was based on, the revision (as a string) +and the abbreviated commit. If GIT-VERSION-STRING does not correspond +to a result of 'git-version', return #false (three times) instead." + (define m (regexp-exec (force git-version-regexp) git-version-string)) + (if m + (values (match:substring m 1) + (match:substring m 2) + (match:substring m 3)) + (values #false #false #false))) + +(define (maybe-git-version->revision maybe-git-version) ; string | #false + "If the string MAYBE-GIT-VERSION appears to be the result of a call to +'git-version', return the revision (as a string). Otherwise, return #false." + (let-values (((version-base revision abbreviated-commit) + (decompose-git-version maybe-git-version))) + revision)) + +(define (maybe-git-versions->revision-replacements old new) + "If the two strings OLD and NEW appear to be the result of a call +to 'git-version', return a list of replacements as expected by +'update-expression' in 'update-package-source' for updating the revision. +Otherwise, return the empty list." + (let* ((old-revision (maybe-git-version->revision old)) + (new-revision (maybe-git-version->revision new))) + (if (and old-revision new-revision) + ;; Simply returning ((old-revision . new-revision)) would work. + ;; However, revision numbers are usually quite small, + ;; e.g. "0" or "1", so that would have a high risk of replacing + ;; something unrelated. Instead, target the (revision ...) form + ;; in (let ((commit ...) (revision ...)) (package ...)). + `((,(object->string `(revision ,old-revision)) + . ,(object->string `(revision ,new-revision)))) + '()))) + + + ;;; ;;; Auto-update. ;;; @@ -535,7 +588,11 @@ (define (update-expression expr replacements) (version (upstream-source-version source)) (version-loc (package-field-location package 'version))) (if version-loc - (let* ((loc (package-location package)) + ;; Use 'package-definition-location' instead of 'package-location' + ;; such that the commit and revision in + ;; (let ((commit ...) (revision ...)) (package ...)) forms can + ;; be updated. + (let* ((loc (package-definition-location package)) (old-version (package-version package)) (old-hash (content-hash-value (origin-hash (package-source package)))) @@ -570,6 +627,8 @@ (define (update-expression expr replacements) 'filename file)) (replacements `((,old-version . ,version) (,old-hash . ,hash) + ,@(maybe-git-versions->revision-replacements + old-version version) ,@(if (and old-commit new-commit) `((,old-commit . ,new-commit)) '()) diff --git a/tests/upstream.scm b/tests/upstream.scm index 9aacb77229..0b14b9867f 100644 --- a/tests/upstream.scm +++ b/tests/upstream.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ludovic Courtès ;;; Copyright © 2022 Ricardo Wurmus +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ (define-module (test-upstream) #:use-module (guix download) #:use-module (guix packages) #:use-module (guix build-system gnu) + #:use-module (guix git-download) #:use-module (guix import print) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix upstream) @@ -210,4 +212,39 @@ (define test-new-package-sexp '("hello" "sed" "tar" "grep")))) (else (pk else #false))))) +(define (decompose-git-version* str) + (call-with-values (lambda () (decompose-git-version str)) list)) + +(test-equal "decompose-git-version returns arguments if commit is short" + '("1.2.3" "900" "cabba9e") + (decompose-git-version* "1.2.3-900.cabba9e")) + +(test-equal "decompose-git-version handles - in versions" + '("1.2.3-rc0" "123" "ba99a9e") + (decompose-git-version* "1.2.3-rc0-123.ba99a9e")) + +(test-equal "decompose-git-version returns #false if not a git-version result" + '(#false #false #false) + (decompose-git-version* "1.2.3-rc0.ba99a9e")) + +(test-equal "maybe-git-version->revision returns the revision" + "12" + (maybe-git-version->revision "1.2.3-12.ba99a9e")) + +(test-equal "maybe-git-version->revision returns #false if not a git-version" + #false + (maybe-git-version->revision "1.2.3-12.nope")) + +(test-equal "maybe-git-version->revision-replacement can return ()" + '(() () ()) + (map maybe-git-versions->revision-replacements + '("1.2.3" "1.2.3" "1.2.3-21.cabba9e") + '("1.2.3" "1.2.3-21.cabba9e" "1.2.3"))) + +(test-equal "maybe-git-version->revision-replacement with git-version" + '(("(revision \"0\")" . "(revision \"1\")")) + (maybe-git-versions->revision-replacements + (git-version "1.2.3" "0" "cabba9e") + (git-version "1.2.3" "1" "ba99age"))) + (test-end) From patchwork Sun Jan 9 19:10:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 36191 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 4B2D427BBEA; Sun, 9 Jan 2022 19:12:18 +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,FREEMAIL_FROM,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 7FE9527BBE9 for ; Sun, 9 Jan 2022 19:12:17 +0000 (GMT) Received: from localhost ([::1]:41328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dc0-00030H-Mj for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:12:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6das-0001b6-1X for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58439) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6dar-00069D-PM for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6dar-0007n5-Kx for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 11/13] git: Support resolving references without cloning. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175543429828 (code B ref 53144); Sun, 09 Jan 2022 19:11:05 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:34 +0000 Received: from localhost ([127.0.0.1]:51328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daL-0007ku-CD for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:33 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daA-0007iQ-Np for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:25 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jANsT; Sun, 09 Jan 2022 20:10:22 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:13 +0000 Message-Id: <20220109191015.33058-11-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755422; bh=upQS00ODOcvEJm2qGuFwgCEsZwJgFPknkrfDPqc8QiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xm4bycv9tbecohAyHZ1gSCYSsuOzaP3BHnCF9y+43shFHCfpOno5Wq7XzOkD1Bd3C gcIXrANTHLJtoee3rlxbL7+pNdWwrfjN5L2laaKEo0V5jMKEKyFWOjPUGJQX2kZeb+ ymrKik4XHHMoBhZsWn0mvXDTwihp1w+S4LWWwbv1SxQNMXoJebO66DQH52JqbzTHlO /ocoXjvvwcKbvV543GlY1KCRrH12BD/Fr3EN03dUqL0nB9CbjXz+pxP7r5rPvMYrPr zhk4lPE8jhA2w6SNkIJjm7QjKrfC08ZgtKBIqYDlHtmj7D+4XSHh5XADY5pfhWtpF0 ER9pgQ6eVvOhg== 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/git.scm (remote-refs): Split off some logic to ... (call-with-detached-remote): ... this new procedure. (lookup-reference): New procedure. * tests/git.scm ("lookup-reference: branch and HEAD"): New test. --- guix/git.scm | 57 +++++++++++++++++++++++++++++++++++++++------------ tests/git.scm | 22 +++++++++++++++++++- 2 files changed, 65 insertions(+), 14 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 43e85a5026..1c07eba584 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -62,6 +62,7 @@ (define-module (guix git) commit-relation remote-refs + lookup-reference git-checkout git-checkout? @@ -628,6 +629,22 @@ (define (commit-relation old new) ;;; Remote operations. ;;; +;; TODO: it would be nice to use 'remote-create-detached' here, +;; but that procedure isn't in any released version of guile-git yet. +(define (call-with-detached-remote url proc) + "Call PROC with a remote for URL. The remote is closed after PROC returns." + (call-with-temporary-directory + (lambda (cache-directory) + (let* ((repository (repository-init cache-directory)) + ;; Create an in-memory remote so we don't touch disk. + (remote (remote-create-anonymous repository url))) + (remote-connect remote) + (let-values ((result (proc remote))) + ;; Wait until we're finished with the repository before closing it. + (remote-disconnect remote) + (repository-close! repository) + (apply values result)))))) + (define* (remote-refs url #:key tags?) "Return the list of references advertised at Git repository URL. If TAGS? is true, limit to only refs/tags." @@ -649,19 +666,33 @@ (define (remote-head->ref remote) name))) (with-libgit2 - (call-with-temporary-directory - (lambda (cache-directory) - (let* ((repository (repository-init cache-directory)) - ;; Create an in-memory remote so we don't touch disk. - (remote (remote-create-anonymous repository url))) - (remote-connect remote) - - (let* ((remote-heads (remote-ls remote)) - (refs (filter-map remote-head->ref remote-heads))) - ;; Wait until we're finished with the repository before closing it. - (remote-disconnect remote) - (repository-close! repository) - refs)))))) + (call-with-detached-remote + url + (lambda (remote) + (define remote-heads (remote-ls remote)) + (filter-map remote-head->ref remote-heads))))) + +(define* (lookup-reference url reference-name) + "Lookup the reference named REFERENCE-NAME advertised at the Git repository +at URL and return the commit string. If the reference was not found, return +#false instead." + (define (oid->commit oid) + (define str (oid->string oid)) + ;; FIXME: why is the result of oid->string prefixed by 8 zeroes + ;; when remote-ls is used? To make hash collisions harder, it would + ;; be nice if the commit was not abbreviated. + (if (string-prefix? "00000000" str) + (string-drop str 8) + str)) + (define (match? remote-head) + (string=? reference-name (remote-head-name remote-head))) + (with-libgit2 + (call-with-detached-remote + url + (lambda (remote) + (define remote-heads (remote-ls remote)) + (define head (find match? remote-heads)) + (and=> head (compose oid->commit remote-head-oid)))))) ;;; diff --git a/tests/git.scm b/tests/git.scm index d0646bbc85..f8eaf9e93b 100644 --- a/tests/git.scm +++ b/tests/git.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Ludovic Courtès -;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -189,4 +190,23 @@ (define-module (test-git) (tag "v1.1" "Release 1.1")) (remote-refs directory #:tags? #t))) +(test-equal "lookup-reference: branch and HEAD" + '(#true #true) + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "First commit") + (branch "a-branch") + (add "b.txt" "B") + (commit "Second commit")) + (with-repository directory repository + ;; See 'oid->commit' in (guix git) for why not string=?. + (list (string-prefix? + (lookup-reference directory "refs/heads/a-branch") + (oid->string + (commit-id (find-commit repository "First commit")))) + (string-prefix? + (lookup-reference directory "HEAD") + (oid->string + (commit-id (find-commit repository "Second commit")))))))) + (test-end "git") From patchwork Sun Jan 9 19:10:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 36194 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 9798627BBEA; Sun, 9 Jan 2022 19:12:54 +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,FREEMAIL_FROM,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 0C74D27BBE9 for ; Sun, 9 Jan 2022 19:12:53 +0000 (GMT) Received: from localhost ([::1]:41814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dca-0003dq-7Z for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:12:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54342) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6das-0001ce-S4 for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58441) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6das-00069b-J3 for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6das-0007nK-Dm for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 12/13] import: Add 'latest-git' updater. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175543529842 (code B ref 53144); Sun, 09 Jan 2022 19:11:06 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:35 +0000 Received: from localhost ([127.0.0.1]:51332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daM-0007lA-A5 for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:35 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daC-0007jN-64 for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:26 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jANsV; Sun, 09 Jan 2022 20:10:23 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:14 +0000 Message-Id: <20220109191015.33058-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755423; bh=pZ0AB2ub68zyCIWnA5WXbJg3smL8MsNf21WYDFM8NuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Beq1uGKee4ypDl6Asqleq3zkFeB5BxWbKOpVf1WRDfslVtfxx0SWMczvC0eDc8RSi AMe/xdvglh9xmPq8PBpHE5Ijp1z9isZIDcHmWlvXlXdLYvJ04djKfGBl2lNl4+bStC cMdKryxGh72/1G24QrKg+tI+U6y3eRCmyNSIMt9/bsh5T0c9x9DRZY1sQMW/KTNHFh BATYijxvlsSc9PWf26NeJ9PvpIbPQ+bYAja7gZW24fmDGN+lEGX0AGCOUNhL5ZbeSi aLCgq6pd3G1fnfcdlf24wpTwqoG8zQZdI9PihNEr9tCuW+kTOX+AEOxJ+CLIi+TfhC 6Qwk7M0TF9Jog== 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 * Makefile.am (MODULES, SCM_TESTS): Register new files. * doc/guix.texi (Invoking guix refresh): Document it. * guix/import/latest-git.scm: New importer file. * guix/upstream.scm (increment-git-version): New procedure. * tests/import-latest-git.scm: New test file. --- Makefile.am | 2 + doc/guix.texi | 17 +++ guix/import/latest-git.scm | 104 ++++++++++++++++++ guix/upstream.scm | 9 ++ tests/import-latest-git.scm | 204 ++++++++++++++++++++++++++++++++++++ 5 files changed, 336 insertions(+) create mode 100644 guix/import/latest-git.scm create mode 100644 tests/import-latest-git.scm diff --git a/Makefile.am b/Makefile.am index d6aabac261..e380c7c83d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -267,6 +267,7 @@ MODULES = \ guix/import/json.scm \ guix/import/kde.scm \ guix/import/launchpad.scm \ + guix/import/latest-git.scm \ guix/import/minetest.scm \ guix/import/opam.scm \ guix/import/print.scm \ @@ -482,6 +483,7 @@ SCM_TESTS = \ tests/hackage.scm \ tests/home-import.scm \ tests/import-git.scm \ + tests/import-latest-git.scm \ tests/import-utils.scm \ tests/inferior.scm \ tests/lint.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 5c1b9adb87..58ccc75ccf 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12619,6 +12619,23 @@ property to @code{#t}. (release-tag-version-delimiter . ":")))) @end lisp +@item latest-git +@cindex latest-git +@cindex with-latest-git-commit +another updater for packages hosted on Git repositories. The difference +with @code{generic-git} is that it always choses the latest commit, even +when it does not have a version tag. As this practice should remain +exceptional (@pxref{Version Numbers}), packages have to opt-in this +updater, by using @code{git-version} to construct the version number and +setting the @code{with-latest-git-commit} package property. + +Usually, it can be simply be set to @code{#true} to use the latest Git +commit on the default branch---i.e., HEAD in Git parlance. If this is +not desired, for example if upstream has a branch that is considered +‘stable’, it can be set to the name of a reference to take commits from. +For example, to take commits from a branch named @code{stable}, the +property @code{with-latest-git-commit} needs to be set to +@code{refs/heads/stable}. @end table diff --git a/guix/import/latest-git.scm b/guix/import/latest-git.scm new file mode 100644 index 0000000000..208f112153 --- /dev/null +++ b/guix/import/latest-git.scm @@ -0,0 +1,104 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Maxime Devos +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix import latest-git) + #:use-module (guix packages) + #:use-module (guix upstream) + #:use-module (guix ui) + #:use-module (guix git) + #:use-module (guix git-download) + #:use-module (ice-9 match) + #:use-module (srfi srfi-26) + #:export (%latest-git-updater)) + +(define (check-valid-with-latest-git-commit? package value) + "Verify that VALUE is a valid value for the 'with-latest-git-commit' +package property of PACKAGE. If so, return #true. Otherwise, emit a +warning and return #false. It is assumed VALUE is not false." + (or (string? value) + (eq? #true value) + (begin + (warning (or (package-field-location package 'properties) + (package-location package)) + (G_ "Package ~a has an invalid 'with-latest-git-commit' \ +property.~%") + (package-name package)) + #false))) + +(define (with-latest-git-commit? package) + "Return true if PACKAGE is hosted on a Git repository and it is requested +that the latest Git commit is used even when not formally released." + (match (package-source package) + ((? origin? origin) + (and (decompose-git-version (package-version package)) + (eq? (origin-method origin) git-fetch) + (git-reference? (origin-uri origin)) + (and=> (assq-ref (package-properties package) + 'with-latest-git-commit) + (cut check-valid-with-latest-git-commit? package <>)))) + (_ #f))) + +(define (latest-commit-reference-name package) + "Return the name of the reference that is expected to hold the latest Git +commit to use as source code." + (match (assq-ref (package-properties package) 'with-latest-git-commit) + ('#true "HEAD") + ((? string? reference) reference))) + +(define (latest-git-upstream package) + "Return an for the latest git commit of PACKAGE. +If the reference pointing to the latest git commit has been deleted, +return #false instead." + (let* ((name (package-name package)) + (old-version (package-version package)) + (old-reference (origin-uri (package-source package))) + (reference-name (latest-commit-reference-name package)) + (commit (lookup-reference (git-reference-url old-reference) + reference-name))) + (if commit + (upstream-source + (package name) + (version + ;; See 'oid->commit' in (guix git) for why not string=?. + ;; Don't increment the revision if the commit remains the same. + (if (string-prefix? commit (git-reference-commit old-reference)) + old-version + (increment-git-version old-version commit))) + (urls (git-reference + (inherit old-reference) + (commit commit)))) + (begin + (warning (package-location package) + (G_ "Cannot update ~a because the reference ~a of ~a has \ +disappeared.~%") + (package-name package) + reference-name + (let ((maybe-hyperlink + (if (supports-hyperlinks? (guix-warning-port)) + hyperlink + (lambda (x y) x))) + (url (git-reference-url old-reference))) + (maybe-hyperlink url url))) + #false)))) + +(define %latest-git-updater + (upstream-updater + (name 'latest-git) + (description "Updater for packages using latest Git commit") + (pred with-latest-git-commit?) + (latest latest-git-upstream))) diff --git a/guix/upstream.scm b/guix/upstream.scm index 6b65147356..a9211fe45b 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -64,6 +64,7 @@ (define-module (guix upstream) decompose-git-version maybe-git-version->revision maybe-git-versions->revision-replacements ; for tests + increment-git-version upstream-updater upstream-updater? @@ -281,6 +282,14 @@ (define (maybe-git-versions->revision-replacements old new) . ,(object->string `(revision ,new-revision)))) '()))) +(define (increment-git-version old-git-version commit) + "Increment the revision in OLD-GIT-VERSION by one, replacing the commit +by COMMIT. It is assumed OLD-GIT-VERSION is a result of 'git-version'." + (let-values (((old-base-version revision old-commit) + (decompose-git-version old-git-version))) + (git-version old-base-version + (number->string (+ 1 (string->number revision))) commit))) + ;;; diff --git a/tests/import-latest-git.scm b/tests/import-latest-git.scm new file mode 100644 index 0000000000..d0dc149ff8 --- /dev/null +++ b/tests/import-latest-git.scm @@ -0,0 +1,204 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Maxime Devos +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (test-import-latest-git) + #:use-module (git) + #:use-module (guix git) + #:use-module (guix tests) + #:use-module (guix packages) + #:use-module (guix import latest-git) + #:use-module (guix upstream) + #:use-module (guix git-download) + #:use-module (guix hg-download) + #:use-module (guix tests git) + #:use-module (guix build utils) + #:use-module (srfi srfi-64)) + +(test-begin "git") + +(define latest-git-upstream + (upstream-updater-latest %latest-git-updater)) + +(define with-latest-git-commit? + (upstream-updater-predicate %latest-git-updater)) + +(define* (make-package directory base-version revision commit + #:optional (properties + '((with-latest-git-commit . #true)))) + (dummy-package "test-package" + (version (git-version base-version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "file://" directory)) + (commit commit))) + (sha256 #f))) + (properties properties))) + +(define (find-commit-as-string repository query) + (oid->string (commit-id (find-commit repository query)))) + +(unless (which (git-command)) (test-skip 1)) +(test-equal "latest-git: an update" + '(#true #true #true) + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "First commit") + (add "b.txt" "B") + (commit "Second commit")) + (with-repository directory repository + (let* ((old-commit + (find-commit-as-string repository "First commit")) + (new-commit + (find-commit-as-string repository "Second commit")) + (package (make-package directory "1.0" "0" old-commit)) + (update (latest-git-upstream package))) + (list (with-latest-git-commit? package) + (string=? (upstream-source-version update) + (git-version "1.0" "1" new-commit)) + ;; See 'oid->commit in (guix git) for why not string=?. + (string-prefix? + (git-reference-commit (upstream-source-urls update)) + new-commit)))))) + +(unless (which (git-command)) (test-skip 1)) +(test-equal "latest-git: no new commit, no new revision" + '(#true #true #true) + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "First commit")) + (with-repository directory repository + (let* ((commit + (find-commit-as-string repository "First commit")) + (package (make-package directory "1.0" "0" commit)) + (update (latest-git-upstream package))) + ;; 'update' being #false would work as well. + (list (with-latest-git-commit? package) + (string=? (upstream-source-version update) + (package-version package)) + (string-prefix? + (git-reference-commit (upstream-source-urls update)) + commit)))))) + +(unless (which (git-command)) (test-skip 1)) +(test-equal "latest-git: non-HEAD commits ignored" + '(#true #true #true) + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "First commit") + (tag "let-me-be-head") + (branch "dev") + (checkout "dev") + (add "b.txt" "B") + (commit "Not ready for distribution!") + (checkout "let-me-be-head")) + (with-repository directory repository + (let* ((commit + (find-commit-as-string repository "First commit")) + (package (make-package directory "1.0" "0" commit)) + (update (latest-git-upstream package))) + (list (with-latest-git-commit? package) + (string=? (upstream-source-version update) + (package-version package)) + (string-prefix? + (git-reference-commit (upstream-source-urls update)) + commit)))))) + +(unless (which (git-command)) (test-skip 1)) +(test-equal "latest-git: non-HEAD branches can be chosen" + '(#true #true #true) + (with-temporary-git-repository directory + '((checkout "stable-for-distros" orphan) + (add "a.txt" "A") + (commit "First commit") + (add "b.txt" "B") + (commit "Here's a bugfix.") + (branch "unstable") + (checkout "unstable") + (add "c.txt" "C") + ;; This commit may not be chosen. + (commit "New feature, needs more work before distributing.")) + (with-repository directory repository + (let* ((old-commit + (find-commit-as-string repository "First commit")) + (new-commit + (find-commit-as-string repository "Here's a bugfix")) + (properties + '((with-latest-git-commit . "refs/heads/stable-for-distros"))) + (package (make-package directory "1.0" "0" old-commit properties)) + (update (latest-git-upstream package))) + (list (with-latest-git-commit? package) + (string=? (upstream-source-version update) + (git-version "1.0" "1" new-commit)) + (string-prefix? + (git-reference-commit (upstream-source-urls update)) + new-commit)))))) + +(unless (which (git-command)) (test-skip 1)) +(test-equal "latest-git: deleted references handled gracefully" + #false + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "First commit")) + (with-repository directory repository + (let* ((properties + '((with-latest-git-commit . "refs/heads/I-do-not-exist"))) + (package (make-package directory "1.0" "0" "cabba9e" properties))) + (latest-git-upstream package))))) + +(test-equal "with-latest-git-commit?" + '(#true #false #true #true #false #false) + (map (lambda (properties) + (with-latest-git-commit? + (make-package "/dev/null" "1.0" "0" "cabba9e" properties))) + (list '((with-latest-git-commit . #true)) ; defaults to HEAD + '() ; packages have to opt-in, so #false + '((with-latest-git-commit . "HEAD")) ; explicit HEAD is ok + '((with-latest-git-commit . "refs/heads/main")) ; another branch + '((with-latest-git-commit . #xf00ba3)) ; bogus + '((irrelevant . #true))))) + +(test-equal "with-latest-git-commit?: not for other VCS" + #false + (with-latest-git-commit? + (package + (inherit (make-package "/dev/null" "1.0.0" "0" "cabba9e")) + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://foo") + (changeset "foo"))) + (sha256 #false)))))) + +(test-equal "with-latest-git-commit?: only if there's source code" + #false + (with-latest-git-commit? + (package + (inherit (make-package "/dev/null" "1.0.0" "0" "cabba9e")) + (source #false)))) + +(test-equal "with-latest-git-commit?: only for git-version" + #false + (with-latest-git-commit? + (package + (inherit (make-package "/dev/null" "1.0.0" "0" "cabba9e")) + (version "1.0.0")))) + +(test-end "git") From patchwork Sun Jan 9 19:10:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 36190 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 B0C4A27BBEA; Sun, 9 Jan 2022 19:12:08 +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,FREEMAIL_FROM,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 79C2E27BBE9 for ; Sun, 9 Jan 2022 19:12:08 +0000 (GMT) Received: from localhost ([::1]:40762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6dbr-0002dG-Lb for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 14:12:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6dar-0001b4-Jj for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58438) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6dar-000698-BY for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6dar-0007my-7i for guix-patches@gnu.org; Sun, 09 Jan 2022 14:11:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53144] [PATCH 13/13] gnu: minetest-throwing-arrows: Use 'latest-git' updater. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 19:11:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53144@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53144-submit@debbugs.gnu.org id=B53144.164175543329819 (code B ref 53144); Sun, 09 Jan 2022 19:11:05 +0000 Received: (at 53144) by debbugs.gnu.org; 9 Jan 2022 19:10:33 +0000 Received: from localhost ([127.0.0.1]:51326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daL-0007kn-0O for submit@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:33 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6daC-0007iS-F2 for 53144@debbugs.gnu.org; Sun, 09 Jan 2022 14:10:25 -0500 Received: from localhost.localdomain ([188.188.180.65]) by xavier.telenet-ops.be with bizsmtp id gjAG2600J1R3YAc01jAPsa; Sun, 09 Jan 2022 20:10:24 +0100 From: Maxime Devos Date: Sun, 9 Jan 2022 19:10:15 +0000 Message-Id: <20220109191015.33058-13-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220109191015.33058-1-maximedevos@telenet.be> References: <20220109191015.33058-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641755424; bh=/gCtetWOK1ST2LwXrnYWzuCLRjj4qJ99UFlqcEzrKPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hLMTrlQp0FXUB3w3Shz9735WOp5tqIU+N6KVsUXNjItWwPpQXarSBYihmts+Akkzw LzOmAR0xLiQsEpAQdQ6u1Ez4yKscPxrI59HAuklDmSuYEpzUFvJ8Vf4djY/EHiFW59 /NLUQ9S712wLNhhLlvDbEjw/NEogtf8/beFNd6vQgxhksxpPFv/vkdpr9fXfOqA7+a Kq9lCy/083TLuztODS5Mi+sj9ObYJhxW9TExezbZcjR+zBC8CDSdrhPv4S8IsbUQuo mRx2mvJyY3/m9CW4SRFx1KrXS8qxLBC278vmkh1hL/gPAOpHxPZdRHVz0nIl8hiVYg Mj/enxAQFnhwA== 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 * gnu/packages/minetest.scm (minetest-throwing-arrows)[properties]: New field. --- gnu/packages/minetest.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 9122e01463..9270acc6e0 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -537,7 +537,8 @@ (define-public minetest-throwing-arrows ;; not be translated. "This mod adds arrows and bows to Minetest. It is a compatible replacement for the throwing mod by PilzAdam that uses the throwing API.") - (license license:mpl2.0)))) + (license license:mpl2.0) + (properties '((with-latest-git-commit . #true)))))) (define-public minetest-worldedit (package