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