From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id IN/RKUcE2mbwZAAA62LTzQ:P1 (envelope-from ) for ; Thu, 05 Sep 2024 19:19:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id IN/RKUcE2mbwZAAA62LTzQ (envelope-from ) for ; Thu, 05 Sep 2024 21:19:35 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=dSp98dwH; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b="x 0cYTFP"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=H6AJADKl; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725563975; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=9/aMUj4FGMtuAKTuduBdJHUoqP39LcBlSptPM+SI1TM=; b=rL8cjbpMdfjkvIKTHp4xB5wk8aVvbhe1el/8qs+5zbEm3lrk+V0/GJGiYlc+zjWb+8NAgV 7djl+xjNT9k7VHajqV69piMEMN/cfUQDpxDecAMnFvkEmxi48BHet0UQtrnWQ/pisCwZVB ykv/BS7HjrayoARPDfM5LO+QNPJ396JGOzmfSouAn9t2DOFRwC8OsqDMRyk6nseOmxrww4 WzfjGjHH1CLUBdNdslAG0BXzLj8tOMJSHMPnuY12JUK4725ozgAIyL8HE3XoZSmrfltQs4 I5CtYzC8BgYQVXoyrclBJN0xrD8z6gHyzJfnFT0xjlZy0uSaX1W5ZW/hsOeKsQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725563975; a=rsa-sha256; cv=none; b=frBy2fUyxhGKgD4Vi9Pk4z/uz4KYaBX+DiBjyTXQd1m+U51D6cN4aSV/8qhIFOngX2Cqsb 5pb5Om54waee4xN7h95MEGPoLWKqbNOIfL9L+VtUJl8uxooAOih0hUK82qCalNOj3t6p0W +T/9oSYiMJSX7LIu20HD7MVmXhGr7yPddBkSJDC/efxqqk6QAZsXDDu/OgwKE+B57oyquR eLENp2ub6kAFqvzTYdnp92AUQVjdhTIs2mU75/g9UwMlR4L3M5lyHxjBSS4po+4hanl8hU AO5+Q6NXgwrEV6Rpr7G+QXMoGGllYUqMWGm9WGG3WzgG7h2kmhMtxLLgJMGeNg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=dSp98dwH; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b="x 0cYTFP"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=H6AJADKl; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8E2C13E78B for ; Thu, 05 Sep 2024 21:19:34 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smI0v-0004dw-5n; Thu, 05 Sep 2024 15:19:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smI0Q-0002iQ-9N for guix-patches@gnu.org; Thu, 05 Sep 2024 15:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smI0O-0000l2-Tm for guix-patches@gnu.org; Thu, 05 Sep 2024 15:18:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:MIME-Version:References:From:Date:To:Subject; bh=9/aMUj4FGMtuAKTuduBdJHUoqP39LcBlSptPM+SI1TM=; b=dSp98dwH8hWWsgdkcy5rxgyx9Hd+/Hf8On9S25DaNLuSumxQ+mAH13DMd1p8DAD3FHa26kgILI8LDCgdZEI+LycB6uPQAFUDUFiTyx1Bhggg3da8qnUjb51Q+uq395zCRSmw1EMXNl6Zq7NqwK0zPG+q40H3HUHyxWjdADICS5/uc/f0r5iUVpTehCPYvUJPfxq61B7LZENy01/y5YYafIRKwKVQfVbioY9oBzCw7zT/qu3v+rWfD0v6iWr4oKZqBbS+ezC8DxPrCcL0NVy2qTS6IrC4W68fdVupw3Umwd59ncPsXzJ+qii2S3RIpm44NfCLRNv3Oo/gu0pokaToHQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smI1S-0002PX-7c for guix-patches@gnu.org; Thu, 05 Sep 2024 15:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Sep 2024 19:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72912 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jan Wielkiewicz Cc: Adam Faiz , 72912@debbugs.gnu.org, Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 72912-submit@debbugs.gnu.org id=B72912.17255639649185 (code B ref 72912); Thu, 05 Sep 2024 19:20:02 +0000 Received: (at 72912) by debbugs.gnu.org; 5 Sep 2024 19:19:24 +0000 Received: from localhost ([127.0.0.1]:38260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smI0q-0002O4-6Q for submit@debbugs.gnu.org; Thu, 05 Sep 2024 15:19:24 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:47391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smI0n-0002Nl-Oo for 72912@debbugs.gnu.org; Thu, 05 Sep 2024 15:19:23 -0400 Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id 7E2AD1380259; Thu, 5 Sep 2024 15:18:10 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-03.internal (MEProxy); Thu, 05 Sep 2024 15:18:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mesmtp; t=1725563890; x= 1725650290; bh=9/aMUj4FGMtuAKTuduBdJHUoqP39LcBlSptPM+SI1TM=; b=x 0cYTFPVn4NsN1YDPJXEqqkEDQHtkTgjzdorVSxD02zTOF050EPL4d32F4UsPdSCJ i7XiE62lJImeJFgm3aLfHlSfb4mINeZzVKrYlnCB4DrFm2n+LsSwgBn16e+QG+gR ZZa4WoGic+4/7Y9iPh6oxPr2ZPQhFOf2bh1AoZEYp8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1725563890; x=1725650290; bh=9/aMUj4FGMtuAKTuduBdJHUoqP39 LcBlSptPM+SI1TM=; b=H6AJADKlQ3pnTMNtKGWgM1y+f9DYiL1u0Jblhtq2ZnKI tMCin09CZTOo8GiuV+0hmikfA0vGzbzJmxi6sRZK88JmYd3tvqncRzlr8ZAqWaaB 4rjOlFkKKdg6AFERB7p+K+B1gXaLgkr3++K5Dse2fEst43EKVnN0Z7xNn+74Yj6+ j6/wuxnBTwyDhnt3hiLq9BqkagXZUNIF9VQ+h3DQJ5341EQvDXzfCXsoPEyRTftK HQ734w5od0UYYuBr+mcCEAsXGgUxwTtWHTKnkPLFqTy2mZ5LdwRWlk5DgoDeBJf1 imua1Yc6EsYbUjjOX0RIWYy7DOdQCUFB5eyBvPwL0A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehledgudefhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpeffhffvvefukfhfgggtuggjsehmtderredttddv necuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnh grmhgvqeenucggtffrrghtthgvrhhnpeduvddvudfhudfggffgtedtfffhudefudfgjeev keefleevheeihedttdffhfelkeenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhgnh hurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhho mheplhgvohesfhgrmhhulhgrrhhirdhnrghmvgdpnhgspghrtghpthhtohephedpmhhoug gvpehsmhhtphhouhhtpdhrtghpthhtohepthhonhgrpghkohhsmhhitgiinhgvghhopghs mhhivggtihgrsehinhhtvghrihgrrdhplhdprhgtphhtthhopehlihhlihgrnhgrrdhprh hikhhlvghrsehgmhgrihhlrdgtohhmpdhrtghpthhtohepjedvleduvdesuggvsggsuhhg shdrghhnuhdrohhrghdprhgtphhtthhopehihiiishhonhhgsegvnhhvshdrnhgvthdprh gtphhtthhopegruggrmhdrfhgrihiiseguihhsrhhoohhtrdhorhhg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 Sep 2024 15:18:09 -0400 (EDT) Date: Thu, 5 Sep 2024 15:17:56 -0400 From: Leo Famulari Message-ID: References: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> <20240831142605.29484112@interia.pl> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="JpShWh/1DG1n9GXw" Content-Disposition: inline In-Reply-To: <20240831142605.29484112@interia.pl> 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.82 X-Spam-Score: -4.82 X-Migadu-Queue-Id: 8E2C13E78B X-Migadu-Scanner: mx11.migadu.com X-TUID: TAAv7uJu3I9v --JpShWh/1DG1n9GXw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Jan, Thanks so much for performing this complicated upgrade! I confirm it works fine to play Minetest. On Sat, Aug 31, 2024 at 02:26:05PM +0200, Jan Wielkiewicz wrote: > The minetest-something convention is for packages that are either > games for minetest or mods for any minetest game. Minetest - the engine > executes games. Previously "Minetest Game" was the default game for > Minetest (the engine), but is not anymore. A similar example would be a > game called "MineClone" for Minetest, the package is then called > minetest-mineclone. But "Minetest Game" is indeed the name of the > ex-default game, hence minetest-minetest-game. "minetest-game" would > suggest it's a game for minetest named "game" also could make it > possible to confuse it with simply "minetest" - the engine. > The name of the package: https://github.com/minetest/minetest_game We have similar conventions for other packages in Guix, such as Python modules. But if a Python program is named by its authors "python-foo", we do not package it as "python-python-foo". Well, there is one package like this currently, but that's one mistake, after we avoided the repetitive names many times. I think that if somebody wants to play the basic Minetest game, they will not have much trouble choosing the package called "minetest-game". I've attached a diff against your patch that makes that change and some other minor changes. Specifically: It tweaks the description of the minetest engine packages to remove the "marketing" word "easy", as requested in the guidelines on writing package descriptions: https://guix.gnu.org/manual/devel/en/html_node/Synopses-and-Descriptions.html It also uses "minetest-game" as an example of a game that could be installed based on this engine. Or should we use mineclone? We don't have any other games packaged, right? It adjusts the version procedure of minetest-game to respect the guidlines in the manual section Version Numbers: https://guix.gnu.org/manual/en/html_node/Version-Numbers.html It removes irrlicht-for-minetest entirely. I don't think we need to deprecate libraries that wouldn't have been installed into someone's profile. I'm not as sure about minetest-data. Was that something that people would install? I never needed to in order to play the minetest game. What do you think? --JpShWh/1DG1n9GXw Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-WIP.patch" >From f29b6d80484f6d702a023a85bc51e55b83175e62 Mon Sep 17 00:00:00 2001 Message-ID: From: Leo Famulari Date: Thu, 5 Sep 2024 15:00:10 -0400 Subject: [PATCH] WIP Change-Id: Iaa3ae3314de1da287f296648699ff26cdb59c96e --- gnu/packages/minetest.scm | 24 ++++++++++-------------- guix/build-system/minetest.scm | 2 +- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 26764bfba8..d3c7fcde5d 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -148,11 +148,12 @@ (define-public minetest `(,zstd "lib"))) (synopsis "Voxel game and game engine") (description - "Minetest is a voxel game engine with easy modding and game creation + "Minetest is a voxel game engine that supports modding and game creation using its Lua modding API. It allows playing a wide range of voxel-based games, installing mods and texture packs. This package only provides the base -platform, users need to install games themselves (either through Guix, the -built-in interface or other sources).") +platform, users need to install games themselves (for example, +@code{minetest-game}), either through Guix, the built-in interface or other +sources.") (home-page "https://www.minetest.net/") (license license:lgpl2.1+))) @@ -188,12 +189,12 @@ (define-public minetest-server Minetest games with multiplayer support. This package provides @command{minetestserver} to run a Minetest server."))) -(define-public minetest-minetest-game - (let ((branch "master") - (commit "88ecab34d98550c8eb77f49ac2866b480a6e707a")) +(define-public minetest-game + (let ((commit "88ecab34d98550c8eb77f49ac2866b480a6e707a") + (revision "0")) (package - (name "minetest-minetest-game") - (version (git-version branch "0" commit)) + (name "minetest-game") + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -217,12 +218,7 @@ (define-public minetest-minetest-game ;; This package is deprecated. MTG is no longer the official game. (define-public minetest-data - (deprecated-package "minetest-data" minetest-minetest-game)) - -;; Minetest merged its irrlicht fork into the minetest repo -;; this package is not used outside of minetest, hence I deprecate it. -(define-public irrlicht-for-minetest - (deprecated-package "irrlicht-for-minetest" minetest)) + (deprecated-package "minetest-data" minetest-game)) (define-public (minetest-topic topic-id) "Return an URL (as a string) pointing to the forum topic with diff --git a/guix/build-system/minetest.scm b/guix/build-system/minetest.scm index 85459f905c..9774c5882a 100644 --- a/guix/build-system/minetest.scm +++ b/guix/build-system/minetest.scm @@ -38,7 +38,7 @@ (define (default-minetest) (module-ref (resolve-interface '(gnu packages minetest)) 'minetest)) (define (default-minetest-game) - (module-ref (resolve-interface '(gnu packages minetest)) 'minetest-minetest-game)) + (module-ref (resolve-interface '(gnu packages minetest)) 'minetest-game)) (define (default-xvfb-run) (module-ref (resolve-interface '(gnu packages xorg)) 'xvfb-run)) base-commit: 2d54ea6c8cc0a0bbb0c39d90d080fcf572533205 -- 2.45.2 --JpShWh/1DG1n9GXw--