From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 31 06:53:48 2024 Received: (at submit) by debbugs.gnu.org; 31 Aug 2024 10:53:48 +0000 Received: from localhost ([127.0.0.1]:54052 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skLjn-0002mu-RF for submit@debbugs.gnu.org; Sat, 31 Aug 2024 06:53:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:55802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skLjl-0002mm-Bt for submit@debbugs.gnu.org; Sat, 31 Aug 2024 06:53:45 -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 1skLip-0002qP-4c for guix-patches@gnu.org; Sat, 31 Aug 2024 06:52:47 -0400 Received: from smtpo49.interia.pl ([217.74.67.49]) by eggs.gnu.org with esmtps (TLS1.2:RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1skLim-0005O2-W5 for guix-patches@gnu.org; Sat, 31 Aug 2024 06:52:46 -0400 Received: from localhost.localdomain (89-64-60-39.dynamic.chello.pl [89.64.60.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sat, 31 Aug 2024 12:52:37 +0200 (CEST) From: Jan Wielkiewicz To: guix-patches@gnu.org Subject: [PATCH 0/1] Update Minetest to 5.9.0 (again) Date: Sat, 31 Aug 2024 12:52:26 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Liliana Marie Prikler , 宋文武 Content-Transfer-Encoding: 8bit X-IPL-Priority-Group: 0-0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=dk; t=1725101558; bh=S+f4gtIzhuqmMXlNZypye8NzfNEuLCumi1nZ8Nzbz+4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=izFjYzzAHKeKx1k+Nhjw/xIsoJ/fd/Y+gJWEsOzk5FKiFa1qxlx9r5zU9GroaglPa N7sBmJhett5gBTg0Iql61f4o4edhVI9stYfMTXs2VvVyp/q3TUTc7uSubOYzq4nlX5 FweQDpR/5t/f9pDoIFrmUMCpllNw9Ebc+cCrW9RM= Received-SPF: pass client-ip=217.74.67.49; envelope-from=tona_kosmicznego_smiecia@interia.pl; helo=smtpo49.interia.pl X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Sending again after sending guix lint messages. Minetest got updated to 5.9.0. This was a big update with major changes. Minetest Game (MTG) got dropped - is not longer the official game for the Minetest engine, and got debundled from default Minetest (engine) shipped to players. Hence I'm debundling it from this Guix package renamed from "minetest-data" to "minetest-minetest-game" and deprecated the former package. In this release irrlicht-for-minetest got merged into Minetest's tree, so I'm deprecating the package. I also had to adjust the minetest build system to use the new "minetest-minetest-game" package for testing. MTG also entered maintenance-only mode and became a rolling release, so I picked the latest commit from the master branch for it instead of git tags. Minetest build system actually makes a pretty ugly assumption - that all minetest mods are mods for MTG, while the game supports mods for any minetest game (for example Voxelibre, Nodecore and such). So testing all mods against MTG makes no sense, but it will addressed in future commits. Jan Wielkiewicz (1): gnu: minetest: update to 5.9.0. gnu/packages/games.scm | 24 +--- gnu/packages/minetest.scm | 239 +++++++++++++++++---------------- guix/build-system/minetest.scm | 4 + 3 files changed, 130 insertions(+), 137 deletions(-) base-commit: d5312370b46ace47e138d84e1bb28e5651cee94b -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 31 06:56:19 2024 Received: (at 72912) by debbugs.gnu.org; 31 Aug 2024 10:56:19 +0000 Received: from localhost ([127.0.0.1]:54060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skLmE-0002rr-BA for submit@debbugs.gnu.org; Sat, 31 Aug 2024 06:56:19 -0400 Received: from smtpo69.interia.pl ([217.74.67.69]:44806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skLmB-0002rZ-J9 for 72912@debbugs.gnu.org; Sat, 31 Aug 2024 06:56:17 -0400 Received: from localhost.localdomain (89-64-60-39.dynamic.chello.pl [89.64.60.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sat, 31 Aug 2024 12:55:10 +0200 (CEST) From: Jan Wielkiewicz To: 72912@debbugs.gnu.org Subject: [PATCH 1/1] gnu: minetest: update to 5.9.0. Date: Sat, 31 Aug 2024 12:54:59 +0200 Message-ID: <9633e961c2bed508ed8eb3159141170838a768bb.1725057692.git.tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Liliana Marie Prikler , 宋文武 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-IPL-Priority-Group: 0-0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=dk; t=1725101711; bh=XUpBIHGi1FS7do+ZB7oEaHFwW6YGXJjDrvW2wqyYOfU=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=I0+h+RX3Sh8FmmzfhwVj+ytc6L49kMBZN3zYI1yRl1pt7iXA0HzS5he/aGjwApLhx k8uIX7IiK3djaaJ6APlNYocRPRteBhcA+IGQLIpLzya2f0dinXRjNdxOTGT4yRlZFt uOLqZSbd/mGbUb/G9oF4cr6Mb83TmsjiXhYVmkZo= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 72912 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/minetest.scm (minetest): Update to 5.9.0. (minetest-data): Update to 88ecab3. Rename to (minetest-minetest-game), deprecate (minetest-data). Minetest Game stopped being the official game for the Minetest engine. * gnu/packages/games.scm (irrlicht-for-minetest): deprecate as it was merged into upstream minetest. * guix/build-system/minetest.scm: add (default-minetest-game), use in (standard-minetest-packages). Change-Id: I0117bd33a2ce5eb1c79fdb29878682081f61dd4e --- gnu/packages/games.scm | 24 +--- gnu/packages/minetest.scm | 239 +++++++++++++++++---------------- guix/build-system/minetest.scm | 4 + 3 files changed, 130 insertions(+), 137 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8e35df0278..3b5c6c9544 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -83,6 +83,7 @@ ;;; Copyright © 2024 Vagrant Cascadian ;;; Copyright © 2024 Sébastien Lerique ;;; Copyright © 2024 James Smith +;;; Copyright © 2024 Jan Wielkiewicz ;;; ;;; This file is part of GNU Guix. ;;; @@ -3954,29 +3955,6 @@ (define-public irrlicht (home-page "https://irrlicht.sourceforge.io/") (license license:zlib))) -(define-public irrlicht-for-minetest - (package - (inherit irrlicht) - (name "irrlicht-for-minetest") - (version "1.9.0mt13") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/irrlicht") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11pxg0yh50ym1hvh8va5jbbcjz5dsshj3xxvm3qhkgg96vpism06")))) - (build-system cmake-build-system) - (arguments - ;; No check target. - (list #:tests? #f)) - (inputs - (modify-inputs (package-inputs irrlicht) - (prepend libxi))))) - (define-public mars ;; The latest release on SourceForge relies on an unreleased version of SFML ;; with a different API, so we take the latest version from the official diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 831ccf6e72..26764bfba8 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2021 Trevor Hass ;;; Copyright © 2020, 2021, 2022 Liliana Marie Prikler ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2024 Jan Wielkiewicz ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it @@ -29,7 +30,6 @@ (define-module (gnu packages minetest) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) - #:use-module (gnu packages games) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages image) @@ -53,105 +53,106 @@ (define-module (gnu packages minetest) (define-public minetest (package (name "minetest") - (version "5.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/minetest") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1sww17h8z77w38jk19nsqxn8xcj27msq0glbil7pyj4i0ffprjrr")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete bundled libraries. - (delete-file-recursively "lib") - #t)))) + (version "5.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest/minetest") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h4yn4k0wpjr1h24aiqcnc9xsxgxj4bq757pla2pa9zmh2xf45kk")) + (modules '((guix build utils))) + ;; Delete bundled libraries, keep lib/sha256 because there's no good + ;; upstream, see: + ;; https://github.com/openssl/openssl/blob/master/crypto/sha/sha512.c + ;; "SHA512 low level APIs are deprecated for public use, + ;; but still ok for internal use." Also asked MT devs on IRC for this. + (snippet + '(begin + (with-directory-excursion "lib" + (for-each (lambda (file) + (if (not (string=? file "sha256")) + (delete-file-recursively file))) + (find-files (string-append "lib") #:directories? #t))) + #t)))) (build-system cmake-build-system) (arguments (list #:configure-flags - #~(list "-DRUN_IN_PLACE=0" - "-DENABLE_FREETYPE=1" - "-DENABLE_GETTEXT=1" - "-DENABLE_SYSTEM_JSONCPP=TRUE" - (string-append "-DIRRLICHTMT_INCLUDE_DIR=" - (search-input-directory %build-inputs - "include/irrlichtmt")) + #~(list "-DENABLE_LTO=ON" + "-DENABLE_UPDATE_CHECKER=FALSE" (string-append "-DCURL_INCLUDE_DIR=" - (search-input-directory %build-inputs - "include/curl")) + (search-input-directory + %build-inputs "include/curl")) (string-append "-DZSTD_INCLUDE_DIR=" - (dirname - (search-input-file %build-inputs - "include/zstd.h"))) + (dirname (search-input-file + %build-inputs + "include/zstd.h"))) (string-append "-DZSTD_LIBRARY=" - (search-input-file %build-inputs - "lib/libzstd.so"))) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-sources - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/filesys.cpp" - ;; Use store-path for "rm" instead of non-existing FHS path. - (("\"/bin/rm\"") - (format #f "~s" (search-input-file inputs "bin/rm")))) - (substitute* "src/CMakeLists.txt" - ;; Let minetest binary remain in build directory. - (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") "")) - (substitute* "src/unittest/test_servermodmanager.cpp" - ;; do no override MINETEST_SUBGAME_PATH - (("(un)?setenv\\(\"MINETEST_SUBGAME_PATH\".*\\);") - "(void)0;")) - (setenv "MINETEST_SUBGAME_PATH" ; for check - (string-append (getcwd) "/games")))) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key tests? #:allow-other-keys) - ;; Thanks to our substitutions, the tests should also run - ;; when invoked on the target outside of `guix build'. - (when tests? - (setenv "HOME" "/tmp") - (invoke "src/minetest" "--run-unittests"))))))) + (search-input-file + %build-inputs "lib/libzstd.so"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/filesys.cpp" + ;; Use store-path for "rm" instead of non-existing FHS path. + (("\"/bin/rm\"") + (format #f "~s" + (search-input-file inputs "bin/rm")))) + (substitute* "src/CMakeLists.txt" + ;; Let minetest binary remain in build directory. + (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") + "")) + (substitute* "src/unittest/test_servermodmanager.cpp" + ;; do no override MINETEST_GAME_PATH + (("(un)?setenv\\(\"MINETEST_GAME_PATH\".*\\);") + "(void)0;")) + (setenv "MINETEST_GAME_PATH" ;for check + (string-append (getcwd) "/games")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + ;; Thanks to our substitutions, the tests should also run + ;; when invoked on the target outside of `guix build'. + (when tests? + (setenv "HOME" "/tmp") + (invoke "src/minetest" "--run-unittests"))))))) (native-search-paths (list (search-path-specification - (variable "MINETEST_SUBGAME_PATH") + (variable "MINETEST_GAME_PATH") (files '("share/minetest/games"))) (search-path-specification (variable "MINETEST_MOD_PATH") (files '("share/minetest/mods"))))) - (native-inputs - (list pkg-config)) - (inputs - (list coreutils - curl - freetype - gettext-minimal - gmp - irrlicht-for-minetest - jsoncpp - libjpeg-turbo - libpng - libogg - libvorbis - libxxf86vm - luajit - mesa - ncurses - openal - sqlite - `(,zstd "lib"))) - (propagated-inputs - (list minetest-data)) - (synopsis "Infinite-world block sandbox game") + (native-inputs (list pkg-config)) + (inputs (list coreutils + curl + freetype + gettext-minimal + gmp + jsoncpp + libjpeg-turbo + libpng + libogg + libvorbis + libxxf86vm + libxi + luajit + mesa + ncurses + openal + sqlite + `(,zstd "lib"))) + (synopsis "Voxel game and game engine") (description - "Minetest is a sandbox construction game. Players can create and destroy -various types of blocks in a three-dimensional open world. This allows -forming structures in every possible creation, on multiplayer servers or as a -single player. Mods and texture packs allow players to personalize the game -in different ways.") + "Minetest is a voxel game engine with easy 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).") (home-page "https://www.minetest.net/") (license license:lgpl2.1+))) @@ -183,35 +184,45 @@ (define-public minetest-server "openal"))) (synopsis "Infinite-world block sandbox game (server)") (description - "Minetest is a sandbox construction game. Players can create and destroy -various types of blocks in a three-dimensional open world. This allows -forming structures in every possible creation, on multiplayer servers or as a -single player. Mods and texture packs allow players to personalize the game -in different ways. This package provides @command{minetestserver} to run a -Minetest server."))) + "Server for Minetest game engine and gaming platform. Allows hosting +Minetest games with multiplayer support. This package provides +@command{minetestserver} to run a Minetest server."))) -(define minetest-data - (package - (name "minetest-data") - (version (package-version minetest)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/minetest_game") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1pq4rm15lzwcqv6npgyz6v89hi3zj8zybw25n9i0d27qj786xc4z")))) - (build-system copy-build-system) - (arguments - (list #:install-plan - #~'(("." "/share/minetest/games/minetest_game")))) - (synopsis "Main game data for the Minetest game engine") - (description - "Game data for the Minetest infinite-world block sandbox game.") - (home-page "https://www.minetest.net/") - (license license:lgpl2.1+))) +(define-public minetest-minetest-game + (let ((branch "master") + (commit "88ecab34d98550c8eb77f49ac2866b480a6e707a")) + (package + (name "minetest-minetest-game") + (version (git-version branch "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest/minetest_game") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pvr3m7kxrriabw20sy6rhx0givh5ic85dk5g88cbbsy83admsp0")))) + (build-system copy-build-system) + (arguments + (list + #:install-plan #~'(("." "/share/minetest/games/minetest_game")))) + (synopsis "Ex-official game for Minetest game engine") + (description + "A game for the Minetest voxel game platform. It provides a very basic +Minecraft-like base for some mods. It is currently in maintenance mode +and gets no new features.") + (home-page "https://www.minetest.net/") + (license license:lgpl2.1+)))) + +;; 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)) (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 1fae3a47e9..85459f905c 100644 --- a/guix/build-system/minetest.scm +++ b/guix/build-system/minetest.scm @@ -37,6 +37,9 @@ (define (default-optipng) (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)) + (define (default-xvfb-run) (module-ref (resolve-interface '(gnu packages xorg)) 'xvfb-run)) @@ -57,6 +60,7 @@ (define (standard-minetest-packages) `(("xvfb-run" ,(default-xvfb-run)) ("optipng" ,(default-optipng)) ("minetest" ,(default-minetest)) + ("minetest-game" ,(default-minetest-game)) ,@(filter (lambda (input) (member (car input) '("libc" "tar" "gzip" "bzip2" "xz" "locales"))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 31 07:42:11 2024 Received: (at 72912) by debbugs.gnu.org; 31 Aug 2024 11:42:11 +0000 Received: from localhost ([127.0.0.1]:54199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skMUc-0004Fo-Ml for submit@debbugs.gnu.org; Sat, 31 Aug 2024 07:42:11 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:58437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skMUb-0004FV-6C for 72912@debbugs.gnu.org; Sat, 31 Aug 2024 07:42:09 -0400 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-5bec87ececeso2898844a12.0 for <72912@debbugs.gnu.org>; Sat, 31 Aug 2024 04:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725104405; x=1725709205; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=y2fIg5o/nUhkR7OqNVgYcINvsrQaNYjFEzSpfriPm9U=; b=jk+VNjp5mXcXXWYQD+XcOtvI6nkrW9q4umnmXsj8pO7OOW5CoX2mMPWexbCsHq8HSB 2aNjGYCEd3BdThOndcQP4N65ZfhBz5o+UpRGPsrfScu82O9UzIh40q3HKZ82O697zFuH JeP4PozLWU4KRQwx7NC6BH91a5vnhLOqPbFi+pGB5rKvskiCQwx57Upk/tXRxD5eJ82S rhMHd2EaxtkEegBZyrtn6Hxw/OYJQI/rDOnWg+aVe3NKz4yfTnQ1qeXjPnq49YYSPQh+ L3ofOESV3tR6dCqq81QqUkNqDnYeD1bKmT3utB4iZlLIk2UlgtO785M5IVqNNCpEcFMe heow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725104405; x=1725709205; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=y2fIg5o/nUhkR7OqNVgYcINvsrQaNYjFEzSpfriPm9U=; b=pWpMlJDXEX3KXBMd+rOorBqxYl6RggXzpOdebxqNxxB5LesXUnlB/mpZW2Acgq+BvU ZmiYNDIKLBOzoJAxbMuw8FnJ4EzvBRbIZHF8jr855Ma/ocDMj0Y2mrKiiDs3d6HrfwTO kxkW+fjJVlkQxVM1W+dXnXbMleULWLk5XFzszn2GlUjN0CVTDCRb+EjGWYEcgTf0WXNS p8zWEftmc7cGm4Uy12z6TBKCGfq+IYlyWQHGoliG7o3nAL8lxYZNOi5VRaTzX4/MFkis u/iDUDuKDSiuX5Iuqu0D9UmrEHRGz730V7HKTvp25DG5RgEw7YB+YaK3pKpUtJ/7W1RF z5Bg== X-Forwarded-Encrypted: i=1; AJvYcCWvu3mv4vxzBbKjD+7T5ZrZZCaPSUXJP3mXK8GmiG2q2EvKqrfXBjsgA2IZ420/5QJXOtdFGg==@debbugs.gnu.org X-Gm-Message-State: AOJu0YxULLkxYEg12URjMmvDPFQMrf2YsFx/YWP23whQPZE2CUzRr006 VWych0YMeXxtGYtzFdya695V0pOJ4ghGVQ/vyTYs0EoG4/nl168h X-Google-Smtp-Source: AGHT+IGtEOT+YAiWgMGGf0thvWlggOIVePsZr2hgZ0zzFXkQQaj/vHLvHh/sC8aLsYVB1yECQptgdQ== X-Received: by 2002:a05:6402:50ca:b0:5bf:257f:4ddd with SMTP id 4fb4d7f45d1cf-5c21ed3e1f0mr6870905a12.10.1725104404934; Sat, 31 Aug 2024 04:40:04 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c226c7c32dsm2904442a12.48.2024.08.31.04.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Aug 2024 04:40:04 -0700 (PDT) Message-ID: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> Subject: Re: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) From: Liliana Marie Prikler To: Jan Wielkiewicz , 72912@debbugs.gnu.org Date: Sat, 31 Aug 2024 13:40:02 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72912 Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , Adam Faiz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 31.08.2024 um 12:52 +0200 schrieb Jan Wielkiewicz: > Sending again after sending guix lint messages. Note for future submissions: it's okay (and even expected) to use -- reroll-count while sending the revised patch to the same address as the original one.=20 > Minetest got updated to 5.9.0. This was a big update with major > changes. Minetest Game (MTG) got dropped - is not longer the > official game for the Minetest engine, and got debundled from default > Minetest (engine) shipped to players. Hence I'm debundling it from > this Guix package renamed from "minetest-data" to "minetest-minetest- > game" and deprecated the former package. That's a somewhat unfortunate name. Is there no better name to choose? Is there a reason not to use "minetest-game" for example? > In this release irrlicht-for-minetest got merged into Minetest's > tree, so I'm deprecating the package. I also had to adjust the > minetest build system to use the new "minetest-minetest-game" package > for testing. MTG also entered maintenance-only mode and became a > rolling release, so I picked the latest commit from the master branch > for it instead of git tags. We also like to unbundle such dependencies. Is there a way forward for doing so? > Minetest build system actually makes a pretty ugly assumption - > that all minetest mods are mods for MTG, while the game supports > mods for any minetest game (for example Voxelibre, Nodecore and > such). So testing all mods against MTG makes no sense, but it will > addressed in future commits. Sounds like a plan. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 31 08:27:14 2024 Received: (at 72912) by debbugs.gnu.org; 31 Aug 2024 12:27:15 +0000 Received: from localhost ([127.0.0.1]:54229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skNCE-0005XD-J1 for submit@debbugs.gnu.org; Sat, 31 Aug 2024 08:27:14 -0400 Received: from smtpo69.interia.pl ([217.74.67.69]:32777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skNCB-0005Ws-D6 for 72912@debbugs.gnu.org; Sat, 31 Aug 2024 08:27:12 -0400 Received: from localhost (89-64-60-39.dynamic.chello.pl [89.64.60.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sat, 31 Aug 2024 14:26:05 +0200 (CEST) Date: Sat, 31 Aug 2024 14:26:05 +0200 From: Jan Wielkiewicz To: Liliana Marie Prikler Subject: Re: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) Message-ID: <20240831142605.29484112@interia.pl> In-Reply-To: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> References: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.41; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-IPL-Priority-Group: 0-0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=dk; t=1725107166; bh=1TgbhpyviaYUrJqhC1dekloO165IYwKmA9cRQ0hKkXA=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=M3UQgUF7SbNnqr/9SF6TE5UgPnCdAM7blDH9oO6JFoKPBq1kY5+RQdewJ0siKBSlW mMho1RjmDPXE4w/sWPxPBJVJswMTYq+gnsXsH6wcoz6jmb3JGD1HuDNCDeKJCynSHQ lN2ngJjc97Wx8swQvCleDjMK6RdXww5iMih+FqkI= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 72912 Cc: 72912@debbugs.gnu.org, =?UTF-8?B?5a6L5paH5q2m?= , Adam Faiz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 31 Aug 2024 13:40:02 +0200 Liliana Marie Prikler wrote: > Am Samstag, dem 31.08.2024 um 12:52 +0200 schrieb Jan Wielkiewicz: > > Sending again after sending guix lint messages. > Note for future submissions: it's okay (and even expected) to use -- > reroll-count while sending the revised patch to the same address as > the original one. Okay, will do so. I missed that in documentation. > > Minetest got updated to 5.9.0. This was a big update with major > > changes. Minetest Game (MTG) got dropped - is not longer the > > official game for the Minetest engine, and got debundled from > > default Minetest (engine) shipped to players. Hence I'm debundling > > it from this Guix package renamed from "minetest-data" to > > "minetest-minetest- game" and deprecated the former package. > That's a somewhat unfortunate name. Is there no better name to > choose? Is there a reason not to use "minetest-game" for example? 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 I know it's convoluted, but the naming ambiguity is inherited from the upstream project. I believe this redundant name makes it clearer. > > In this release irrlicht-for-minetest got merged into Minetest's > > tree, so I'm deprecating the package. I also had to adjust the > > minetest build system to use the new "minetest-minetest-game" > > package for testing. MTG also entered maintenance-only mode and > > became a rolling release, so I picked the latest commit from the > > master branch for it instead of git tags. > We also like to unbundle such dependencies. Is there a way forward > for doing so? There's no unbundling to be done here. Minetest was the sole user of irrlicht-for-minetest. Minetest developers moved irrlicht directly into the game's code and the two components are tightly coupled. The irrlicht fork has been archived: https://github.com/minetest/irrlicht So the irrlicht-for-minetest code that was moved into Minetest is now considered to be a non-replaceable non-modular part of the code that's not meant to be anywhere but in Minetest only. On top of that it's not longer possible to use upstream irrlicht in Minetest, hence the decision to move the fork into the game's tree directly. > > > Minetest build system actually makes a pretty ugly assumption - > > that all minetest mods are mods for MTG, while the game supports > > mods for any minetest game (for example Voxelibre, Nodecore and > > such). So testing all mods against MTG makes no sense, but it will > > addressed in future commits. > Sounds like a plan. > > Cheers Hope this makes it clear. -- Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 05 15:19:24 2024 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 To: Jan Wielkiewicz Subject: Re: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 72912 Cc: Adam Faiz , 72912@debbugs.gnu.org, Liliana Marie Prikler , =?utf-8?B?5a6L5paH5q2m?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --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-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 05 19:07:17 2024 Received: (at 72912) by debbugs.gnu.org; 5 Sep 2024 23:07:17 +0000 Received: from localhost ([127.0.0.1]:38486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLZM-0001uq-Oa for submit@debbugs.gnu.org; Thu, 05 Sep 2024 19:07:17 -0400 Received: from smtpo49.interia.pl ([217.74.67.49]:48916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLZI-0001uO-7t for 72912@debbugs.gnu.org; Thu, 05 Sep 2024 19:07:15 -0400 Received: from localhost (89-64-60-39.dynamic.chello.pl [89.64.60.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Fri, 6 Sep 2024 01:05:57 +0200 (CEST) Date: Fri, 6 Sep 2024 01:05:48 +0200 From: Jan Wielkiewicz To: Leo Famulari Subject: Re: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) Message-ID: <20240906010548.1eab8fb1@interia.pl> In-Reply-To: References: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> <20240831142605.29484112@interia.pl> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.41; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-IPL-Priority-Group: 0-0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=dk; t=1725577558; bh=98U7LIyXvV93c1K3WYIV+QO4tAxFpNHlaOCbSyD/Av0=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=pfDlemItNtnW/99FsucQPndM/sp6Sxla+6/W5BvEzVgoDv2brTaA7bzD59Vhwwb89 EfNlxDF/0+Z8K/Vn/faaCuuZFIfjxCz9m2QkuQRs92xstkmC59OUcPVZfg4FqnKHCG Q+xvQRVooCRHqOJTMW3ZX9sG3NrHd21SxTjq+J+o= X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72912 Cc: Adam Faiz , 72912@debbugs.gnu.org, Liliana Marie Prikler , =?UTF-8?B?5a6L5paH5q2m?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Thu, 5 Sep 2024 15:17:56 -0400 Leo Famulari wrote: > 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". Well, I guess "minetest-game" should be fine then. > I've attached a diff against your patch that makes that change and > some other minor changes. Do I need to apply the patch and resend it or will a maintainer take care of that? > 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 Looks good. > 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? There are multiple games for Minetest, most of them listed on ContentDB https://content.minetest.net/packages/?type=game The general idea is that after dropping MTG as the default, it's up to the user to pick what they want to play. ContentDB can be also accessed in the game and the game upon the first startup instructs the user to install a game. ContentDB has a relatively strict policy for package inclusion: https://content.minetest.net/policy_and_guidance/ Most games/mods are free software, some packages that aren't are clearly marked as such with red text. Most importantly Minetest by default hides non-free packages from ContentDB in the game. So it should be fine to let users pick a game they like from ContentDB. I think that Mineclone is not the best default game because it does a 1:1 copy of Minecraft. It is free software and assets are free, but a 1:1 copy is legally questionable. That's why I believe we shouldn't ship Minetest with any game preinstalled. On a side note, I plan updating existing Minetest packages and adding more games for it, but this work should be merged first. > 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. Makes sense. > 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. People still play this, in fact it has hundreds of mods and is still the second most popular game, it's just not official anymore. Also the input was propagated so it makes sense to replace it with the new "minetest-game" package I guess? If people don't want it they can still remove it. But new installs shouldn't get this installed by default. Long story short Minetest devs considered MTG was a bad advertisement for the project also a waste of their resources and decided to focus on the engine instead. > What do you think? Looks good. -- Jan From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 05 22:49:59 2024 Received: (at 72912) by debbugs.gnu.org; 6 Sep 2024 02:49:59 +0000 Received: from localhost ([127.0.0.1]:38715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smP2s-0006iY-C4 for submit@debbugs.gnu.org; Thu, 05 Sep 2024 22:49:59 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:49247) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smP2o-0006iG-Q1 for 72912@debbugs.gnu.org; Thu, 05 Sep 2024 22:49:56 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id 36F3A11402E5; Thu, 5 Sep 2024 22:48:43 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Thu, 05 Sep 2024 22:48:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-transfer-encoding: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=1725590923; x=1725677323; bh=kanmAM8+D0WFFpcSq7AQ/E4fd S5bgSnaMt85f+VoL8g=; b=1QFR5LrJ3TBdCikpdLi6BHVQVveGK/xmYU4yOtGzG 6u7eE/qlauBKo9V01yi+rnkyJ+FXzTc/hy4ow/NDL4N5BV4YZuhLR58sr3T814n3 ewfvc28v9VE1hNpNHzzeTf0ndPRj7pprkogtg4hGh3stFmX2PC8u4dRXK/PJNhaB Sg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1725590923; x= 1725677323; bh=kanmAM8+D0WFFpcSq7AQ/E4fdS5bgSnaMt85f+VoL8g=; b=U j/ASRe+CsPSVUZcRseQf6TTet3HhHWw4fj0Hxgs/KiTRpAJwKbonAqd/IetZLOOy QXY+SahB9CQkBOmQRy0mn3bWT8I1nqoWpPihUTdAaGgNb0iiFyK/3qYuKYN4cNuG M8ZVelxWQ4y441VIKguwHkaj2doD3DM9C+YNOeeyDpFiJo2MDLyh/Zuq48V9fSJB 4ndARKFcgCF4UbNGP0WTIKRhDqxyMZR4cRse1GYDf8absFPlLv0UOX6WyFdPc14z yFhv2U3f/rztKh34ZWQYRfEwGDtF4e9j3oouerwL+bBH5zKZGdvOYWTpGkXGhFwj aHQepnb0OAWuIZlDxxKnQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeitddgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhepfffhvfevuffkfhggtggugfgjsehmkeerredttddv necuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnh grmhgvqeenucggtffrrghtthgvrhhnpeehtedugeethfeitdfgteelvdfhhefhheegjeej uddugeeileegjeeiieefteehtdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgvpdhnsggprhgtphht thhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehtohhnrggpkhhoshhmih gtiihnvghgohgpshhmihgvtghirgesihhnthgvrhhirgdrphhlpdhrtghpthhtoheplhhi lhhirghnrgdrphhrihhklhgvrhesghhmrghilhdrtghomhdprhgtphhtthhopeejvdelud dvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihihiihsohhnghesvghn vhhsrdhnvghtpdhrtghpthhtoheprggurghmrdhfrghiiiesughishhrohhothdrohhrgh X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 Sep 2024 22:48:42 -0400 (EDT) Date: Thu, 5 Sep 2024 22:48:40 -0400 From: Leo Famulari To: Jan Wielkiewicz Subject: Re: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) Message-ID: References: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> <20240831142605.29484112@interia.pl> <20240906010548.1eab8fb1@interia.pl> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="POEc2VXidGVZkfyd" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240906010548.1eab8fb1@interia.pl> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 72912 Cc: Adam Faiz , 72912@debbugs.gnu.org, Liliana Marie Prikler , =?utf-8?B?5a6L5paH5q2m?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --POEc2VXidGVZkfyd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Sep 06, 2024 at 01:05:48AM +0200, Jan Wielkiewicz wrote: > Do I need to apply the patch and resend it or will a maintainer take > care of that? I prepared an updated patch (attached). There's something I don't quite understand: The "minetest-game" package doesn't provide any executables. It's just data. The "minetest" package still runs and lets me play the basic minetest game locally or on a server. Is that expected? I would have expected differently based on the news about the removal of the game from the engine's codebase. Leo --POEc2VXidGVZkfyd Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-minetest-Update-to-5.9.0.patch" Content-Transfer-Encoding: 8bit >From 6cbd545902644d18204ed9db6b8de6de24f7b62d Mon Sep 17 00:00:00 2001 Message-ID: <6cbd545902644d18204ed9db6b8de6de24f7b62d.1725590913.git.leo@famulari.name> From: Jan Wielkiewicz Date: Sat, 31 Aug 2024 12:54:59 +0200 Subject: [PATCH] gnu: minetest: Update to 5.9.0. The Minetest engine and the "Minetest Game" have been decoupled upstream in Minetest 5.9.0: https://dev.minetest.net/Changelog#Minetest_Game * gnu/packages/minetest.scm (minetest): Update to 5.9.0. [arguments]: Adjust #:configure-flags and #:phases to account for the removal of the Minetest Game from the Minetest codebase. [native-search-paths, synopsis, description]: Likewise. [inputs]: Remove IRRLICHT-FOR-MINETEST. (minetest-data): Update to 0.0.0-0.88ecab3. Rename to MINETEST-GAME and deprecate MINETEST-DATA. [synopsis, description]: Adjust to account for the decoupling of the game from the engine. * gnu/packages/games.scm (irrlicht-for-minetest): Remove variable. * guix/build-system/minetest.scm (default-minetest-game): New variable. (%default-modules): Use it. Change-Id: I0117bd33a2ce5eb1c79fdb29878682081f61dd4e Signed-off-by: Leo Famulari --- gnu/packages/games.scm | 24 +--- gnu/packages/minetest.scm | 235 +++++++++++++++++---------------- guix/build-system/minetest.scm | 4 + 3 files changed, 126 insertions(+), 137 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 30057a4f4a..7f0debac07 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -83,6 +83,7 @@ ;;; Copyright © 2024 Vagrant Cascadian ;;; Copyright © 2024 Sébastien Lerique ;;; Copyright © 2024 James Smith +;;; Copyright © 2024 Jan Wielkiewicz ;;; ;;; This file is part of GNU Guix. ;;; @@ -3961,29 +3962,6 @@ (define-public irrlicht (home-page "https://irrlicht.sourceforge.io/") (license license:zlib))) -(define-public irrlicht-for-minetest - (package - (inherit irrlicht) - (name "irrlicht-for-minetest") - (version "1.9.0mt13") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/irrlicht") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11pxg0yh50ym1hvh8va5jbbcjz5dsshj3xxvm3qhkgg96vpism06")))) - (build-system cmake-build-system) - (arguments - ;; No check target. - (list #:tests? #f)) - (inputs - (modify-inputs (package-inputs irrlicht) - (prepend libxi))))) - (define-public mars ;; The latest release on SourceForge relies on an unreleased version of SFML ;; with a different API, so we take the latest version from the official diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 831ccf6e72..4ea4854695 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2021 Trevor Hass ;;; Copyright © 2020, 2021, 2022 Liliana Marie Prikler ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2024 Jan Wielkiewicz ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it @@ -29,7 +30,6 @@ (define-module (gnu packages minetest) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) - #:use-module (gnu packages games) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages image) @@ -53,105 +53,107 @@ (define-module (gnu packages minetest) (define-public minetest (package (name "minetest") - (version "5.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/minetest") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1sww17h8z77w38jk19nsqxn8xcj27msq0glbil7pyj4i0ffprjrr")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete bundled libraries. - (delete-file-recursively "lib") - #t)))) + (version "5.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest/minetest") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h4yn4k0wpjr1h24aiqcnc9xsxgxj4bq757pla2pa9zmh2xf45kk")) + (modules '((guix build utils))) + ;; Delete bundled libraries, keep lib/sha256 because there's no good + ;; upstream, see: + ;; https://github.com/openssl/openssl/blob/master/crypto/sha/sha512.c + ;; "SHA512 low level APIs are deprecated for public use, + ;; but still ok for internal use." Also asked MT devs on IRC for this. + (snippet + '(begin + (with-directory-excursion "lib" + (for-each (lambda (file) + (if (not (string=? file "sha256")) + (delete-file-recursively file))) + (find-files (string-append "lib") #:directories? #t))) + #t)))) (build-system cmake-build-system) (arguments (list #:configure-flags - #~(list "-DRUN_IN_PLACE=0" - "-DENABLE_FREETYPE=1" - "-DENABLE_GETTEXT=1" - "-DENABLE_SYSTEM_JSONCPP=TRUE" - (string-append "-DIRRLICHTMT_INCLUDE_DIR=" - (search-input-directory %build-inputs - "include/irrlichtmt")) + #~(list "-DENABLE_LTO=ON" + "-DENABLE_UPDATE_CHECKER=FALSE" (string-append "-DCURL_INCLUDE_DIR=" - (search-input-directory %build-inputs - "include/curl")) + (search-input-directory + %build-inputs "include/curl")) (string-append "-DZSTD_INCLUDE_DIR=" - (dirname - (search-input-file %build-inputs - "include/zstd.h"))) + (dirname (search-input-file + %build-inputs + "include/zstd.h"))) (string-append "-DZSTD_LIBRARY=" - (search-input-file %build-inputs - "lib/libzstd.so"))) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-sources - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/filesys.cpp" - ;; Use store-path for "rm" instead of non-existing FHS path. - (("\"/bin/rm\"") - (format #f "~s" (search-input-file inputs "bin/rm")))) - (substitute* "src/CMakeLists.txt" - ;; Let minetest binary remain in build directory. - (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") "")) - (substitute* "src/unittest/test_servermodmanager.cpp" - ;; do no override MINETEST_SUBGAME_PATH - (("(un)?setenv\\(\"MINETEST_SUBGAME_PATH\".*\\);") - "(void)0;")) - (setenv "MINETEST_SUBGAME_PATH" ; for check - (string-append (getcwd) "/games")))) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key tests? #:allow-other-keys) - ;; Thanks to our substitutions, the tests should also run - ;; when invoked on the target outside of `guix build'. - (when tests? - (setenv "HOME" "/tmp") - (invoke "src/minetest" "--run-unittests"))))))) + (search-input-file + %build-inputs "lib/libzstd.so"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/filesys.cpp" + ;; Use store-path for "rm" instead of non-existing FHS path. + (("\"/bin/rm\"") + (format #f "~s" + (search-input-file inputs "bin/rm")))) + (substitute* "src/CMakeLists.txt" + ;; Let minetest binary remain in build directory. + (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") + "")) + (substitute* "src/unittest/test_servermodmanager.cpp" + ;; do no override MINETEST_GAME_PATH + (("(un)?setenv\\(\"MINETEST_GAME_PATH\".*\\);") + "(void)0;")) + (setenv "MINETEST_GAME_PATH" ;for check + (string-append (getcwd) "/games")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + ;; Thanks to our substitutions, the tests should also run + ;; when invoked on the target outside of `guix build'. + (when tests? + (setenv "HOME" "/tmp") + (invoke "src/minetest" "--run-unittests"))))))) (native-search-paths (list (search-path-specification - (variable "MINETEST_SUBGAME_PATH") + (variable "MINETEST_GAME_PATH") (files '("share/minetest/games"))) (search-path-specification (variable "MINETEST_MOD_PATH") (files '("share/minetest/mods"))))) - (native-inputs - (list pkg-config)) - (inputs - (list coreutils - curl - freetype - gettext-minimal - gmp - irrlicht-for-minetest - jsoncpp - libjpeg-turbo - libpng - libogg - libvorbis - libxxf86vm - luajit - mesa - ncurses - openal - sqlite - `(,zstd "lib"))) - (propagated-inputs - (list minetest-data)) - (synopsis "Infinite-world block sandbox game") + (native-inputs (list pkg-config)) + (inputs (list coreutils + curl + freetype + gettext-minimal + gmp + jsoncpp + libjpeg-turbo + libpng + libogg + libvorbis + libxxf86vm + libxi + luajit + mesa + ncurses + openal + sqlite + `(,zstd "lib"))) + (synopsis "Voxel game engine") (description - "Minetest is a sandbox construction game. Players can create and destroy -various types of blocks in a three-dimensional open world. This allows -forming structures in every possible creation, on multiplayer servers or as a -single player. Mods and texture packs allow players to personalize the game -in different ways.") + "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 (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+))) @@ -183,35 +185,40 @@ (define-public minetest-server "openal"))) (synopsis "Infinite-world block sandbox game (server)") (description - "Minetest is a sandbox construction game. Players can create and destroy -various types of blocks in a three-dimensional open world. This allows -forming structures in every possible creation, on multiplayer servers or as a -single player. Mods and texture packs allow players to personalize the game -in different ways. This package provides @command{minetestserver} to run a -Minetest server."))) + "Server for Minetest game engine and gaming platform. Allows hosting +Minetest games with multiplayer support. This package provides +@command{minetestserver} to run a Minetest server."))) -(define minetest-data - (package - (name "minetest-data") - (version (package-version minetest)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/minetest_game") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1pq4rm15lzwcqv6npgyz6v89hi3zj8zybw25n9i0d27qj786xc4z")))) - (build-system copy-build-system) - (arguments - (list #:install-plan - #~'(("." "/share/minetest/games/minetest_game")))) - (synopsis "Main game data for the Minetest game engine") - (description - "Game data for the Minetest infinite-world block sandbox game.") - (home-page "https://www.minetest.net/") - (license license:lgpl2.1+))) +(define-public minetest-game + (let ((commit "88ecab34d98550c8eb77f49ac2866b480a6e707a") + (revision "0")) + (package + (name "minetest-game") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest/minetest_game") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pvr3m7kxrriabw20sy6rhx0givh5ic85dk5g88cbbsy83admsp0")))) + (build-system copy-build-system) + (arguments + (list + #:install-plan #~'(("." "/share/minetest/games/minetest_game")))) + (synopsis "Ex-official game for Minetest game engine") + (description + "A game for the Minetest voxel game platform. It provides a very basic +Minecraft-like base for some mods. It is currently in maintenance mode +and gets no new features.") + (home-page "https://www.minetest.net/") + (license license:lgpl2.1+)))) + +;; This package is deprecated. "Minetest Game" is no longer the official game. +(define-public minetest-data + (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 1fae3a47e9..9774c5882a 100644 --- a/guix/build-system/minetest.scm +++ b/guix/build-system/minetest.scm @@ -37,6 +37,9 @@ (define (default-optipng) (define (default-minetest) (module-ref (resolve-interface '(gnu packages minetest)) 'minetest)) +(define (default-minetest-game) + (module-ref (resolve-interface '(gnu packages minetest)) 'minetest-game)) + (define (default-xvfb-run) (module-ref (resolve-interface '(gnu packages xorg)) 'xvfb-run)) @@ -57,6 +60,7 @@ (define (standard-minetest-packages) `(("xvfb-run" ,(default-xvfb-run)) ("optipng" ,(default-optipng)) ("minetest" ,(default-minetest)) + ("minetest-game" ,(default-minetest-game)) ,@(filter (lambda (input) (member (car input) '("libc" "tar" "gzip" "bzip2" "xz" "locales"))) base-commit: 392a552524b7801b4a5517e40d860c05f010c655 -- 2.45.2 --POEc2VXidGVZkfyd-- From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 11:15:38 2024 Received: (at 72912) by debbugs.gnu.org; 6 Sep 2024 15:15:38 +0000 Received: from localhost ([127.0.0.1]:53854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smagT-0005ZF-T3 for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:15:38 -0400 Received: from smtpo69.interia.pl ([217.74.67.69]:47351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smagR-0005Yz-5L for 72912@debbugs.gnu.org; Fri, 06 Sep 2024 11:15:36 -0400 Received: from localhost (89-64-60-39.dynamic.chello.pl [89.64.60.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Fri, 6 Sep 2024 17:15:26 +0200 (CEST) Date: Fri, 6 Sep 2024 17:15:13 +0200 From: Jan Wielkiewicz To: Leo Famulari Subject: Re: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) Message-ID: <20240906171513.58c156b1@interia.pl> In-Reply-To: References: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> <20240831142605.29484112@interia.pl> <20240906010548.1eab8fb1@interia.pl> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.41; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-IPL-Priority-Group: 0-0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=dk; t=1725635728; bh=F1rCsBJMO54EuQ6G04mgyc6RpURQD2cGsKHoFQfky7g=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=KizpG1NRGm0GvBZ3/QfqUWmwnOF1/5vIEsi4hE+R9XzPPprK8HuicU98ebj3SDxox GsBPDXzcAEYnRjbTfr3X/VX5MRSBRbVLRJR8Q9BM0pO1slkvG48j87poFdvilTA6eH oYvA8QlqEkkSB9SpXn567sx1tI5qDGEwPpCc8/vI= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 72912 Cc: Adam Faiz , 72912@debbugs.gnu.org, Liliana Marie Prikler , =?UTF-8?B?5a6L5paH5q2m?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Thu, 5 Sep 2024 22:48:40 -0400 Leo Famulari wrote: > On Fri, Sep 06, 2024 at 01:05:48AM +0200, Jan Wielkiewicz wrote: > > Do I need to apply the patch and resend it or will a maintainer take > > care of that? > > I prepared an updated patch (attached). > > There's something I don't quite understand: > > The "minetest-game" package doesn't provide any executables. It's just > data. > > The "minetest" package still runs and lets me play the basic minetest > game locally or on a server. > > Is that expected? I would have expected differently based on the news > about the removal of the game from the engine's codebase. The Minetest engine is written in C++ but provides a modding Lua API. Games and mods are written in Lua and Minetest (the engine) executes them in a similar fashion as Emacs does to Elisp scripts or a web browser does to JavaScript. Minetest Game (MTG) was previously the default game and came preinstalled with the engine (the minetest-data package). So doing "guix install minetest" should give you only the "engine" and this is what you should see after starting: https://p.mort.coffee/4Og.png If you see the minetest game installed along minetest that probably means you had the older Minetest install in your profile and that minetest-data got replaced by "minetest-game". An alternative explanation is having MTG installed manually in ~/.minetest/games/minetest_game > Leo From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 13:45:38 2024 Received: (at 72912) by debbugs.gnu.org; 6 Sep 2024 17:45:38 +0000 Received: from localhost ([127.0.0.1]:54128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smd1e-0005XM-8W for submit@debbugs.gnu.org; Fri, 06 Sep 2024 13:45:38 -0400 Received: from fout5-smtp.messagingengine.com ([103.168.172.148]:35671) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smd1b-0005X5-5L for 72912@debbugs.gnu.org; Fri, 06 Sep 2024 13:45:36 -0400 Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id 6E0A21380222; Fri, 6 Sep 2024 13:45:29 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Fri, 06 Sep 2024 13:45:29 -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=1725644729; x= 1725731129; bh=xmLBoHWQ0ThLCo/9l6y9GRp7foURxFoKk1qhxe7XFs4=; b=A vyqDgHPzbpKGkXW++Ow8X2rlxf9qjqqR31q7h9AANbLQP5cxB4XeTNvGS90rrOYj ssa0wM9lZohUDIathBGc6CVqAMS7QoV90uNLQ79WDNc8PVXm5EMxfA21SHi0HYJx Z6q60ToqcTo6UgFsmow3PXMa+8TapXtEtGrPOYuwVQ= 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=1725644729; x=1725731129; bh=xmLBoHWQ0ThLCo/9l6y9GRp7foUR xFoKk1qhxe7XFs4=; b=kLR2Kv6wnICGtnnQ3dMy12jE+P1Lcrf0r8zLIPNmUGLy UhgQHTDZVUqSd8KJKq4qiXpACW42vayZBklS9YCPhKgtkatoMiIKppkdgwq5GyPH Jf34yyAgKh0fHFzkt36D+3CFT/FcUOe0XYNqIQ6pJF5JUGni+UR+yH09U4+XS+0y dZg5N8cCXfR7o/x5+JQ3RTSIliRkdKrDqtgIknuvCEaD7be/4fVDK/ux7Yt3xOTQ fllYyJI6wnoxV/iKIJ32ep3My01lMnO6VmwT8WB3tjUv8W3XB0CqzFybcpKTniXJ CnkPZruFzqILEdc+bOOsxGPijFKaLrTFAiAjrw3z0A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeiuddguddujecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpeffhffvvefukfhfgggtuggjsehttdertddttddv necuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnh grmhgvqeenucggtffrrghtthgvrhhnpeejfeevieefgeefheevvefhvedvkeffhffhiefg heeivdehfeduteehfeeuheevgfenucffohhmrghinhepmhhorhhtrdgtohhffhgvvgenuc evlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehf rghmuhhlrghrihdrnhgrmhgvpdhnsggprhgtphhtthhopeehpdhmohguvgepshhmthhpoh huthdprhgtphhtthhopehtohhnrggpkhhoshhmihgtiihnvghgohgpshhmihgvtghirges ihhnthgvrhhirgdrphhlpdhrtghpthhtoheplhhilhhirghnrgdrphhrihhklhgvrhesgh hmrghilhdrtghomhdprhgtphhtthhopeejvdeluddvseguvggssghughhsrdhgnhhurdho rhhgpdhrtghpthhtohepihihiihsohhnghesvghnvhhsrdhnvghtpdhrtghpthhtoheprg gurghmrdhfrghiiiesughishhrohhothdrohhrgh X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 6 Sep 2024 13:45:28 -0400 (EDT) Date: Fri, 6 Sep 2024 13:45:26 -0400 From: Leo Famulari To: Jan Wielkiewicz Subject: Re: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) Message-ID: References: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> <20240831142605.29484112@interia.pl> <20240906010548.1eab8fb1@interia.pl> <20240906171513.58c156b1@interia.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240906171513.58c156b1@interia.pl> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 72912 Cc: Adam Faiz , 72912@debbugs.gnu.org, Liliana Marie Prikler , =?utf-8?B?5a6L5paH5q2m?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Fri, Sep 06, 2024 at 05:15:13PM +0200, Jan Wielkiewicz wrote: > So doing "guix install minetest" should give you only the "engine" and > this is what you should see after starting: > https://p.mort.coffee/4Og.png Okay, I don't see that but rather the interface to launch the Minetest game. > If you see the minetest game installed along minetest that probably > means you had the older Minetest install in your profile and that > minetest-data got replaced by "minetest-game". An alternative > explanation is having MTG installed manually in > ~/.minetest/games/minetest_game That must be it. So, I'm wondering if minetest-game should depend on or even propagate minetest? Like, what is the correct method for a new user to install and run the Minetest game with Minetest 5.9.0? From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 06 14:20:15 2024 Received: (at 72912) by debbugs.gnu.org; 6 Sep 2024 18:20:15 +0000 Received: from localhost ([127.0.0.1]:54160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smdZ9-0007RD-6X for submit@debbugs.gnu.org; Fri, 06 Sep 2024 14:20:15 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:55463) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smdZ7-0007O0-IK for 72912@debbugs.gnu.org; Fri, 06 Sep 2024 14:20:14 -0400 Received: by mail-wr1-f68.google.com with SMTP id ffacd0b85a97d-374ca65cafdso1296043f8f.2 for <72912@debbugs.gnu.org>; Fri, 06 Sep 2024 11:20:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725646748; x=1726251548; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=nhBOlZhOCEkSXc6lqNMwdgfrF2C3jlZ4H17Mpfs3DE4=; b=WDgNtOmyL9xCneRqqHjAnhnWY6YJFEn6agwFXQkALor4AjGzwF0uWT8unmdzN7GKor YzC1xOEYlf49XMYo4Vscd2Uky6FaHDOwTpYSWIymLzxLzXINSeK+l6hP1Zx66xA0Ln31 +yx768cfgYeiQDUYKcgKreNBUqztLUZdH7pAzCn4RN4VSKPDp4KQqBFJ5L4IFYSVw17z 3vd/8ZSeetkdKahS/UL8Z/j0Pum8/OwcoTxH8twVN18ktYSvAHqcsVSJ9gr7wTaeWGET TkqC/GNjmW0Sd73tjgo5jJfJDbEelWKs4fbbJnfV5dh1ds4cNOKtmkw3JlMchV1fQ2k2 B7tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725646748; x=1726251548; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=nhBOlZhOCEkSXc6lqNMwdgfrF2C3jlZ4H17Mpfs3DE4=; b=RqWtd+JqcTyu/Vo8RakBglxqezaZM7+2xh/nXCO4BKY3q6zxBZ+YzJahcyfkla8yBc +F+v3thYp/5cDSUKcLENDluG6ouh4WCKud+BnD3pc51epLksBrUbL6WozeA7ymgsSb46 qVyE31nnVdm/qOAMSSGy7WfBdaym1ZjWrZQOkUtedM/UsdiKFlSeWUJ8IP41/FJa/+io yE0oZ1Mof/0CaXwznRYFXZe1GM5aUvIEC6BLIP4p91SNR1EXCo2Te0QpjNclgVl4Jsul zYVOXuz/SILiVDwqqrQQE+eHeimUoZGMsMid97+Oq4YRbXmy/A0lj6i91pbfwBLoiKxJ vMwQ== X-Gm-Message-State: AOJu0Yx6LDwV+i+D86KeOqMz9cZbZaGFNPNvm+2IZX2IXp/AtS5UhnIu Lxk6mklgd05pz7s6Dm2iFauCCst0my7dBPXo3gfFuDj9yW0DKW9C X-Google-Smtp-Source: AGHT+IELLBrhw6GSbZGQnGSY8NKfhOzRkH7mURCxnX9yLGRtEh9qNglsQH3lf4rHiOpkDpnDg53qEg== X-Received: by 2002:a5d:500a:0:b0:374:babf:ac4d with SMTP id ffacd0b85a97d-374babfacc8mr12686540f8f.58.1725646747866; Fri, 06 Sep 2024 11:19:07 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42ca05cfb47sm27532275e9.22.2024.09.06.11.19.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 11:19:07 -0700 (PDT) Message-ID: Subject: Re: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) From: Liliana Marie Prikler To: Leo Famulari , Jan Wielkiewicz Date: Fri, 06 Sep 2024 20:19:06 +0200 In-Reply-To: References: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> <20240831142605.29484112@interia.pl> <20240906010548.1eab8fb1@interia.pl> <20240906171513.58c156b1@interia.pl> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72912 Cc: 72912@debbugs.gnu.org, Adam Faiz , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 06.09.2024 um 13:45 -0400 schrieb Leo Famulari: > So, I'm wondering if minetest-game should depend on or even propagate > minetest? Like, what is the correct method for a new user to install > and run the Minetest game with Minetest 5.9.0? I would guess it's `guix install minetest minetest-game', but note that you could also have `guix install minetest minetest-mineclone`. I would use the same pattern that we already use for Guile, Emacs, etc. and just require that the base package be in the profile. Cheers From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 17:37:56 2024 Received: (at 72912) by debbugs.gnu.org; 9 Sep 2024 21:37:56 +0000 Received: from localhost ([127.0.0.1]:34275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snm56-0006JA-5t for submit@debbugs.gnu.org; Mon, 09 Sep 2024 17:37:56 -0400 Received: from smtpo69.interia.pl ([217.74.67.69]:36163) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snm53-0006It-HM for 72912@debbugs.gnu.org; Mon, 09 Sep 2024 17:37:54 -0400 Received: from localhost (89-64-60-39.dynamic.chello.pl [89.64.60.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Mon, 9 Sep 2024 23:37:40 +0200 (CEST) Date: Mon, 9 Sep 2024 23:37:30 +0200 From: Jan Wielkiewicz To: Liliana Marie Prikler Subject: Re: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) Message-ID: <20240909233730.2640e1f5@interia.pl> In-Reply-To: References: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> <20240831142605.29484112@interia.pl> <20240906010548.1eab8fb1@interia.pl> <20240906171513.58c156b1@interia.pl> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.41; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-IPL-Priority-Group: 0-0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=dk; t=1725917862; bh=yEaSH5C780isC5PlaPkm34Uol+DyWSVEKxeZgOZ1Mow=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=WSwHdLrMe9ft0i4TXvEEaDcpnwPScyrin7GFfioOBOMbnQsPY9NsqZ8BOju14yF2O 0I/Biw7Ft19sASe6PgffULVnIKyLXfvKDAP5ugjsEmQRZpUgiO+5UcXQbQIMhItmWu C1oikUE2TENJR5vfkIduaMvbsPmu3ZndyqHi5RAo= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 72912 Cc: 72912@debbugs.gnu.org, Adam Faiz , =?UTF-8?B?5a6L5paH5q2m?= , Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Fri, 06 Sep 2024 20:19:06 +0200 Liliana Marie Prikler wrote: > Am Freitag, dem 06.09.2024 um 13:45 -0400 schrieb Leo Famulari: > > So, I'm wondering if minetest-game should depend on or even > > propagate minetest? Like, what is the correct method for a new user > > to install and run the Minetest game with Minetest 5.9.0? > I would guess it's `guix install minetest minetest-game', but note > that you could also have `guix install minetest minetest-mineclone`. > I would use the same pattern that we already use for Guile, Emacs, > etc. and just require that the base package be in the profile. > > Cheers By this you mean I'd have to add minetest as a propagated input for each package that needs it to run? I could do that, but I believe this is out of the scope of the current work. I'll update minetest packages in a future PR and while doing so I'll add minetest to propagated inputs. But right now packages don't depend on minetest and putting that in this issue would be scope creep. Is there anything else I need to do in order to get this merged? -- Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 10 00:30:51 2024 Received: (at 72912) by debbugs.gnu.org; 10 Sep 2024 04:30:51 +0000 Received: from localhost ([127.0.0.1]:34537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snsWh-0001aZ-59 for submit@debbugs.gnu.org; Tue, 10 Sep 2024 00:30:51 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:55554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snsWe-0001aI-IX for 72912@debbugs.gnu.org; Tue, 10 Sep 2024 00:30:49 -0400 Received: by mail-wm1-f67.google.com with SMTP id 5b1f17b1804b1-42bbdf7f860so45438135e9.3 for <72912@debbugs.gnu.org>; Mon, 09 Sep 2024 21:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725942578; x=1726547378; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=+ystIgg5i8pmlxjt2ONbtjHCFADekdUm5D6BzcVG8nc=; b=RGQYtjqvzHqQp7zsGuNESAZG0QQHDDSMotx/mhh6D/hr8CHDqPgRRKBjKZtWYK7Mrq TX3V3+R8jc1wNYW/EfNplRsP7s3h43nwyvI5PUujS2VFFDWZp3tdoEk1vVl/2Rt/xq8t 4TpESLXZYn7NezINIipWFm4b1UCd1djKg05Ddb8enYihX0BLeUO9T/f/jdcHe/Fvx6lD omNC9GB5HBo9t+K1W1oTTipMn3r/BxvkcqkDinmSxqrITzb+6Nlev5J2U2uOwUeo863R GTgvI6sNUlo/T+1V6hXzKwxXJl59b9+ffmJZcRasLak6126HK5deBYgv/ttrt18ljZFw 5NVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725942578; x=1726547378; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+ystIgg5i8pmlxjt2ONbtjHCFADekdUm5D6BzcVG8nc=; b=U/uC6GdGHCJ6UDuND6VXfyIbnhNo5NNUhvyhms1xWhhfpqe0NPeCrhze4RwN+m7imG ojg0Xcoo/xn1/hBiQk1uf9V/IVyqvJSsYHeFMixQBMZGw9ARq5ACKKGF9q1wo2ozcLU3 gok/p840DWqi2o0oaxIH5zvbEQ39IxlKlyLWWSmnAN50QQj+McRrxipumTjOyTmnNC1I by+ows8Tx+VAlWWjd4Kx+tyRd/jLWh7tFuPRWQ1BYQXPsHHkMBupRLEMJqjHEQh70OMX Bxq2dok4UtR8SeoIUDcNVerYZbSnuQLMP65FrMN2uu5giLsJ+WysVrdak4/jYBrmgVcI oOnw== X-Forwarded-Encrypted: i=1; AJvYcCUCR4Ff5X0xBbC1w+/IJZ89a7xLlcdLVAkRMGRvdz2EMykdvuWUtgAomU+IngskSoPiXTCJhQ==@debbugs.gnu.org X-Gm-Message-State: AOJu0YzmO2hSv/0HbzR7LdHnrHtZHrrGiSfkJ6q7xlBQUBgjZ1ydUXbY Df9SA4U0GEKWyPta939fgs2t9oXdlXSfaYCuoiofEwUvgTYCVAJA X-Google-Smtp-Source: AGHT+IEEIfpb1+FjpCkq+GMx7p/yHxrbA7yvLvTdj0acYOI9mMT0a9bDW0X636+TztBjEbsF/4K70w== X-Received: by 2002:a05:600c:314c:b0:42b:af5a:109 with SMTP id 5b1f17b1804b1-42cae76cf52mr64409945e9.24.1725942577825; Mon, 09 Sep 2024 21:29:37 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42cb73ab096sm57873855e9.22.2024.09.09.21.29.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 21:29:37 -0700 (PDT) Message-ID: Subject: Re: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) From: Liliana Marie Prikler To: Jan Wielkiewicz Date: Tue, 10 Sep 2024 06:29:35 +0200 In-Reply-To: <20240909233730.2640e1f5@interia.pl> References: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> <20240831142605.29484112@interia.pl> <20240906010548.1eab8fb1@interia.pl> <20240906171513.58c156b1@interia.pl> <20240909233730.2640e1f5@interia.pl> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Montag, dem 09.09.2024 um 23:37 +0200 schrieb Jan Wielkiewicz: > On Fri, 06 Sep 2024 20:19:06 +0200 > Liliana Marie Prikler wrote: > > > Am Freitag, dem 06.09.2024 um 13:45 -0400 schrieb Leo Famu [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.128.67 listed in bl.score.senderscore.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.67 listed in list.dnswl.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 72912 Cc: 72912@debbugs.gnu.org, Adam Faiz , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Am Montag, dem 09.09.2024 um 23:37 +0200 schrieb Jan Wielkiewicz: > On Fri, 06 Sep 2024 20:19:06 +0200 > Liliana Marie Prikler wrote: >=20 > > Am Freitag, dem 06.09.2024 um 13:45 -0400 schrieb Leo Famulari: > > > So, I'm wondering if minetest-game should depend on or even > > > propagate minetest? Like, what is the correct method for a new > > > user > > > to install and run the Minetest game with Minetest 5.9.0? > > I would guess it's `guix install minetest minetest-game', but note > > that you could also have `guix install minetest minetest- > > mineclone`. > > I would use the same pattern that we already use for Guile, Emacs, > > etc. and just require that the base package be in the profile. > >=20 > > Cheers >=20 > By this you mean I'd have to add minetest as a propagated input for > each package that needs it to run? I could do that, but I believe > this is out of the scope of the current work. I'll update minetest > packages in a future PR and while doing so I'll add minetest to > propagated inputs. No, I mean that it'd be the user who adds minetest on top of whatever minetest-* they want to their profile, which can be done as-is. > But right now packages don't depend on minetest and putting that in > this issue would be scope creep. >=20 > Is there anything else I need to do in order to get this merged? You would have to look for that in other discussions =E2=80=93 I'll check a= t a later time. Cheers From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 10 21:58:10 2024 Received: (at 72912-done) by debbugs.gnu.org; 11 Sep 2024 01:58:10 +0000 Received: from localhost ([127.0.0.1]:37256 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1soCcT-0000Ur-R5 for submit@debbugs.gnu.org; Tue, 10 Sep 2024 21:58:10 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:44107) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1soCcR-0000UX-QM for 72912-done@debbugs.gnu.org; Tue, 10 Sep 2024 21:58:08 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id E306A114016D; Tue, 10 Sep 2024 21:57:56 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Tue, 10 Sep 2024 21:57:56 -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=1726019876; x= 1726106276; bh=0JY6zb+A9qix5T07k0h+gg4grKfNPqUWJ546L+0t67c=; b=U 1WLwDCE/909YLgpe9aMw8KqLIT1I4nUBL9iD/VmG+jSebYMI4En8Qd7xqb71giaF f297+qS1v0JfkVGDygY2jU0mEpbwYqZ7fyqljBriQjLzTCI+VM53mYbF8I/Zw+Rx tpWNXcw9dn65MKqHoP4wRbXL1X9HhqTT97dBm4NqWg= 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=1726019876; x=1726106276; bh=0JY6zb+A9qix5T07k0h+gg4grKfN PqUWJ546L+0t67c=; b=DzMNyyyt7Em5TQNVzxMyyx0/srrEq8D9vPHfj10ymJKy BVe6FFNwDodCDmTdqk+ntwEmmZmrWvWL47Rmt8rlF0hRduhUBtqQ7qWpN5ozlfiV XsbkcrnTxi3HqahFbLICR6xQlT+dturcrU6WEoz5eyzlMU+7yTGV0E9dS75cW0T0 QpLGHs+9ZjJR2iEd435+DIZwuOtZiNQC3CvDukBEE85STE6x2Fna10q38SX6Kgog 7IJZFLOk4b5TAiBqY/Z40oDsU6//3KttcwIPXXPDcGPfVHAMQuuJe0wSRA/1Xax0 7AFnox6QkwXEam7s3k087A2eLQtoPklB6Hchwj9ZRQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudejtddghedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvden ucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrg hmvgeqnecuggftrfgrthhtvghrnhepieetudehfeekueefleegudfhjefgleehfeeluefh feffgfeuudelhedvjeelieetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvgdpnhgspghrtghpthht ohephedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepthhonhgrpghkohhsmhhitg iinhgvghhopghsmhhivggtihgrsehinhhtvghrihgrrdhplhdprhgtphhtthhopehlihhl ihgrnhgrrdhprhhikhhlvghrsehgmhgrihhlrdgtohhmpdhrtghpthhtohepjedvleduvd dqughonhgvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihihiihsohhn ghesvghnvhhsrdhnvghtpdhrtghpthhtoheprggurghmrdhfrghiiiesughishhrohhoth drohhrgh X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 10 Sep 2024 21:57:56 -0400 (EDT) Date: Tue, 10 Sep 2024 21:57:53 -0400 From: Leo Famulari To: Jan Wielkiewicz Subject: Re: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) Message-ID: References: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> <20240831142605.29484112@interia.pl> <20240906010548.1eab8fb1@interia.pl> <20240906171513.58c156b1@interia.pl> <20240909233730.2640e1f5@interia.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240909233730.2640e1f5@interia.pl> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 72912-done Cc: Adam Faiz , 72912-done@debbugs.gnu.org, Liliana Marie Prikler , =?utf-8?B?5a6L5paH5q2m?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Mon, Sep 09, 2024 at 11:37:30PM +0200, Jan Wielkiewicz wrote: > Liliana Marie Prikler wrote: > > Am Freitag, dem 06.09.2024 um 13:45 -0400 schrieb Leo Famulari: > > > So, I'm wondering if minetest-game should depend on or even > > > propagate minetest? Like, what is the correct method for a new user > > > to install and run the Minetest game with Minetest 5.9.0? > > I would guess it's `guix install minetest minetest-game', but note > > that you could also have `guix install minetest minetest-mineclone`. > > I would use the same pattern that we already use for Guile, Emacs, > > etc. and just require that the base package be in the profile. Sounds good to me. > By this you mean I'd have to add minetest as a propagated input for > each package that needs it to run? I could do that, but I believe this > is out of the scope of the current work. I'll update minetest packages > in a future PR and while doing so I'll add minetest to propagated > inputs. Okay, if you like. As Liliana pointed out, propagation may not be expected in cases like this. > Is there anything else I need to do in order to get this merged? Pushed as ef428cf721861c01e21c96db61330a44e9a5ee28 Thanks again! From unknown Mon Jun 16 23:36:58 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 09 Oct 2024 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator