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