unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#67200] [PATCH] gnu: Add minetest-server.
@ 2023-11-15 11:53 Tristan Cottam via Guix-patches via
  2023-11-15 18:39 ` Liliana Marie Prikler
  2024-01-14 12:07 ` bug#67200: " Liliana Marie Prikler
  0 siblings, 2 replies; 9+ messages in thread
From: Tristan Cottam via Guix-patches via @ 2023-11-15 11:53 UTC (permalink / raw)
  To: 67200; +Cc: Tristan Cottam, Liliana Marie Prikler, 宋文武

* gnu/packages/minetest.scm (minetest-server): New variable.

Change-Id: I1125888b2944acc4063a19db4c602d33286a7e14
---

This package is a variant of minetest, with modified arguments and dropped
inputs.

About the inputs, I'm having a hard time understanding why certain of them
(i.e. pkg-config, coreutils, libxxf86vm, and ncurses) are specified for
minetest in the first place; the docs make no mention of them, and the package
builds fine without them.

 gnu/packages/minetest.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index bf0df314a7..4d658f9e03 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -44,6 +44,7 @@ (define-module (gnu packages minetest)
   #:use-module (guix packages)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
+  #:use-module (guix utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system minetest)
@@ -154,6 +155,41 @@ (define-public minetest
     (home-page "https://www.minetest.net/")
     (license license:lgpl2.1+)))
 
+(define-public minetest-server
+  (package
+    (inherit minetest)
+    (name "minetest-server")
+    (arguments
+     (substitute-keyword-arguments (package-arguments minetest)
+       ((#:configure-flags configure-flags)
+        #~(cons* "-DBUILD_CLIENT=FALSE"
+                 "-DBUILD_SERVER=TRUE"
+                 #$configure-flags))
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (replace 'check
+              (lambda* (#:key tests? #:allow-other-keys)
+                (when tests?
+                  (setenv "HOME" "/tmp")
+                  (invoke "src/minetestserver" "--run-unittests"))))))))
+    (inputs
+     (modify-inputs (package-inputs minetest)
+       (delete "libjpeg-turbo"
+               "libpng"
+               "libogg"
+               "libvorbis"
+               "libxxf86vm"
+               "mesa"
+               "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.")))
+
 (define minetest-data
   (package
     (name "minetest-data")

base-commit: bd0f2173210416e86281c1de8789e7cdab66dd57
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#67200] [PATCH] gnu: Add minetest-server.
  2023-11-15 11:53 [bug#67200] [PATCH] gnu: Add minetest-server Tristan Cottam via Guix-patches via
@ 2023-11-15 18:39 ` Liliana Marie Prikler
  2023-11-15 21:31   ` Tristan Cottam via Guix-patches via
  2024-01-14 12:07 ` bug#67200: " Liliana Marie Prikler
  1 sibling, 1 reply; 9+ messages in thread
From: Liliana Marie Prikler @ 2023-11-15 18:39 UTC (permalink / raw)
  To: Tristan Cottam, 67200; +Cc: 宋文武

Am Mittwoch, dem 15.11.2023 um 12:53 +0100 schrieb Tristan Cottam:
> * gnu/packages/minetest.scm (minetest-server): New variable.
> 
> Change-Id: I1125888b2944acc4063a19db4c602d33286a7e14
> ---
> 
> This package is a variant of minetest, with modified arguments and
> dropped
> inputs.
> 
> About the inputs, I'm having a hard time understanding why certain of
> them (i.e. pkg-config, coreutils, libxxf86vm, and ncurses) are
> specified for minetest in the first place; the docs make no mention
> of them, and the package builds fine without them.
pkg-config is nice to have for dependency resolution, though I don't
know whether the current version of minetest makes use of it. 
Coreutils were at one point required to patch rm; I hope minetest now
uses system calls for that.  The other two I don't know.

>  gnu/packages/minetest.scm | 36 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 36 insertions(+)
> 
> diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
> index bf0df314a7..4d658f9e03 100644
> --- a/gnu/packages/minetest.scm
> +++ b/gnu/packages/minetest.scm
> @@ -44,6 +44,7 @@ (define-module (gnu packages minetest)
>    #:use-module (guix packages)
>    #:use-module (guix gexp)
>    #:use-module (guix git-download)
> +  #:use-module (guix utils)
>    #:use-module (guix build-system cmake)
>    #:use-module (guix build-system copy)
>    #:use-module (guix build-system minetest)
> @@ -154,6 +155,41 @@ (define-public minetest
>      (home-page "https://www.minetest.net/")
>      (license license:lgpl2.1+)))
>  
> +(define-public minetest-server
> +  (package
> +    (inherit minetest)
> +    (name "minetest-server")
> +    (arguments
> +     (substitute-keyword-arguments (package-arguments minetest)
> +       ((#:configure-flags configure-flags)
> +        #~(cons* "-DBUILD_CLIENT=FALSE"
> +                 "-DBUILD_SERVER=TRUE"
> +                 #$configure-flags))
> +       ((#:phases phases)
> +        #~(modify-phases #$phases
> +            (replace 'check
> +              (lambda* (#:key tests? #:allow-other-keys)
> +                (when tests?
> +                  (setenv "HOME" "/tmp")
> +                  (invoke "src/minetestserver" "--run-
> unittests"))))))))
> +    (inputs
> +     (modify-inputs (package-inputs minetest)
> +       (delete "libjpeg-turbo"
> +               "libpng"
> +               "libogg"
> +               "libvorbis"
> +               "libxxf86vm"
> +               "mesa"
> +               "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.")))
> +
>  (define minetest-data
>    (package
>      (name "minetest-data")
> 
> base-commit: bd0f2173210416e86281c1de8789e7cdab66dd57
LGTM, assuming CI lights green.

Cheers




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#67200] [PATCH] gnu: Add minetest-server.
  2023-11-15 18:39 ` Liliana Marie Prikler
@ 2023-11-15 21:31   ` Tristan Cottam via Guix-patches via
  2023-11-15 21:49     ` Liliana Marie Prikler
  0 siblings, 1 reply; 9+ messages in thread
From: Tristan Cottam via Guix-patches via @ 2023-11-15 21:31 UTC (permalink / raw)
  To: 67200, 宋文武, Liliana Marie Prikler

> LGTM, assuming CI lights green.

How can I check?




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#67200] [PATCH] gnu: Add minetest-server.
  2023-11-15 21:31   ` Tristan Cottam via Guix-patches via
@ 2023-11-15 21:49     ` Liliana Marie Prikler
  2023-11-22 20:43       ` Tristan Cottam via Guix-patches via
  0 siblings, 1 reply; 9+ messages in thread
From: Liliana Marie Prikler @ 2023-11-15 21:49 UTC (permalink / raw)
  To: Tristan Cottam, 67200, 宋文武

Am Mittwoch, dem 15.11.2023 um 21:31 +0000 schrieb Tristan Cottam:
> > LGTM, assuming CI lights green.
> 
> How can I check?
Wait for https://qa.guix.gnu.org/issue/67200 to process the revision :)




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#67200] [PATCH] gnu: Add minetest-server.
  2023-11-15 21:49     ` Liliana Marie Prikler
@ 2023-11-22 20:43       ` Tristan Cottam via Guix-patches via
  2023-11-23 11:15         ` Liliana Marie Prikler
  0 siblings, 1 reply; 9+ messages in thread
From: Tristan Cottam via Guix-patches via @ 2023-11-22 20:43 UTC (permalink / raw)
  To: 67200

I see the QA is failing. What should I do?




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#67200] [PATCH] gnu: Add minetest-server.
  2023-11-22 20:43       ` Tristan Cottam via Guix-patches via
@ 2023-11-23 11:15         ` Liliana Marie Prikler
  2023-11-23 12:28           ` Tristan Cottam via Guix-patches via
  0 siblings, 1 reply; 9+ messages in thread
From: Liliana Marie Prikler @ 2023-11-23 11:15 UTC (permalink / raw)
  To: Tristan Cottam, 67200

Am Mittwoch, dem 22.11.2023 um 20:43 +0000 schrieb Tristan Cottam:
> I see the QA is failing. What should I do?
You can try figuring out why

======== Testing module TestLua
Test assertion failed: did_destruct
    at test_lua.cpp:100

fails (probably also affects minetest itself).  That being said, this
is an armhf failure, that's not even worked for minetest, so from my
perspective, the package looks good.

Cheers




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#67200] [PATCH] gnu: Add minetest-server.
  2023-11-23 11:15         ` Liliana Marie Prikler
@ 2023-11-23 12:28           ` Tristan Cottam via Guix-patches via
  2023-12-01 17:47             ` Tristan Cottam via Guix-patches via
  0 siblings, 1 reply; 9+ messages in thread
From: Tristan Cottam via Guix-patches via @ 2023-11-23 12:28 UTC (permalink / raw)
  To: 67200@debbugs.gnu.org

> > I see the QA is failing. What should I do?
> 
> You can try figuring out why
> 
> ======== Testing module TestLua
> Test assertion failed: did_destruct
> at test_lua.cpp:100
> 
> fails (probably also affects minetest itself).

I saw that error in the logs, I checked out the original file, but I'm unsure
how to proceed from there, apart from filing an issue to Minetest.

> That being said, this is an armhf failure, that's not even worked for
> minetest, so from my perspective, the package looks good.

Awesome, cheers!





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#67200] [PATCH] gnu: Add minetest-server.
  2023-11-23 12:28           ` Tristan Cottam via Guix-patches via
@ 2023-12-01 17:47             ` Tristan Cottam via Guix-patches via
  0 siblings, 0 replies; 9+ messages in thread
From: Tristan Cottam via Guix-patches via @ 2023-12-01 17:47 UTC (permalink / raw)
  To: 67200@debbugs.gnu.org

What does this package still need to be merged upstream? Is further review required?




^ permalink raw reply	[flat|nested] 9+ messages in thread

* bug#67200: [PATCH] gnu: Add minetest-server.
  2023-11-15 11:53 [bug#67200] [PATCH] gnu: Add minetest-server Tristan Cottam via Guix-patches via
  2023-11-15 18:39 ` Liliana Marie Prikler
@ 2024-01-14 12:07 ` Liliana Marie Prikler
  1 sibling, 0 replies; 9+ messages in thread
From: Liliana Marie Prikler @ 2024-01-14 12:07 UTC (permalink / raw)
  To: Tristan Cottam, 67200-done; +Cc: 宋文武

Am Mittwoch, dem 15.11.2023 um 12:53 +0100 schrieb Tristan Cottam:
> * gnu/packages/minetest.scm (minetest-server): New variable.
> 
> Change-Id: I1125888b2944acc4063a19db4c602d33286a7e14
Applied at last.

Cheers




^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-01-14 12:08 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-15 11:53 [bug#67200] [PATCH] gnu: Add minetest-server Tristan Cottam via Guix-patches via
2023-11-15 18:39 ` Liliana Marie Prikler
2023-11-15 21:31   ` Tristan Cottam via Guix-patches via
2023-11-15 21:49     ` Liliana Marie Prikler
2023-11-22 20:43       ` Tristan Cottam via Guix-patches via
2023-11-23 11:15         ` Liliana Marie Prikler
2023-11-23 12:28           ` Tristan Cottam via Guix-patches via
2023-12-01 17:47             ` Tristan Cottam via Guix-patches via
2024-01-14 12:07 ` bug#67200: " Liliana Marie Prikler

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).