[PATCH] Update minetest

  • Done
  • quality assurance status badge
Details
3 participants
  • Liliana Marie Prikler
  • (
  • Vivien Kraus
Owner
unassigned
Submitted by
Vivien Kraus
Severity
normal
V
V
Vivien Kraus wrote on 31 Oct 2022 23:02
(address . guix-patches@gnu.org)
d0b08c4eac9856e47351a692e74ed5f0593cdac9.camel@planete-kraus.eu
Dear guix,

Minetest had a new release. I briefly checked that mods load correctly,
and that mineclone looks good. The new dynamic shadows are very
impressive!

Best regards,

Vivien
From 6eeced3d066133449ce7ad06099b30164da41f4e Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Mon, 31 Oct 2022 22:44:31 +0100
Subject: [PATCH 4/4] gnu: minetest-technic: Update to 2022-10-30.

* gnu/packages/minetest.scm (minetest-technic): Update to 2022-10-30 (found a
commit with that date).
---
gnu/packages/minetest.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 7e0ec3ca21..f5671241a7 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -508,15 +508,15 @@ (define-public minetest-technic
(name "minetest-technic")
;; Upstream doesn't keep version numbers, so use the release
;; date on ContentDB instead.
- (version "2022-02-06")
+ (version "2022-10-30")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minetest-mods/technic")
- (commit "d2b68a6bef53e34e166deadd64e02b58bcae59a1")))
+ (commit "6a9dfec36f7265f9328fe378732417d9b57060b4")))
(sha256
- (base32 "0vmi1y39q0x39s9w0hhgi979a4hf6n1ah5jaazjvmjf02pjcvvy1"))
+ (base32 "0ng1aklm02n2lbar345yf88g3alzvnh0m0s5rb2bcw2k5lib8468"))
(file-name (git-file-name name version))))
(build-system minetest-mod-build-system)
(propagated-inputs
--
2.38.0
From 9e676d66e59edba95c57658d6b368d16e43b0617 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Mon, 31 Oct 2022 22:44:06 +0100
Subject: [PATCH 3/4] gnu: minetest-mineclone: Update to 0.80.1.

* gnu/packages/minetest.scm (minetest-mineclone): Update to 0.80.1.
---
gnu/packages/minetest.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 7f8caa6701..7e0ec3ca21 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -395,7 +395,7 @@ (define-public minetest-mesecons
(define-public minetest-mineclone
(package
(name "minetest-mineclone")
- (version "0.75.0")
+ (version "0.80.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -404,7 +404,7 @@ (define-public minetest-mineclone
(file-name (git-file-name name version))
(sha256
(base32
- "10apja8bp8wmrbjlxg3gvrw5bdc8mizcngvnfi2ff790f6bsc5ip"))))
+ "0ndgzasjmj8397bb3y2aqalx9v72llwgvp9pv05mms3chpji2675"))))
(build-system copy-build-system)
(arguments
`(#:install-plan
--
2.38.0
From b2d2d42a5c3843fe8cc5bd0f66899f4f78a7bfa3 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Mon, 31 Oct 2022 22:43:39 +0100
Subject: [PATCH 2/4] gnu: minetest: update to 5.6.1.

* gnu/packages/minetest.scm (minetest): Update to 5.6.1.
---
gnu/packages/minetest.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (33 lines)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index fd0dbec6a2..7f8caa6701 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -53,7 +53,7 @@ (define-module (gnu packages minetest)
(define-public minetest
(package
(name "minetest")
- (version "5.5.1")
+ (version "5.6.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -62,7 +62,7 @@ (define-public minetest
(file-name (git-file-name name version))
(sha256
(base32
- "042v71gkk0xfixcsn82az2fri0n28fgf9d2zcz31bijqmg5q7imj"))
+ "1bgk369n7r52vh3hdngrlf98k3v84ch2qp341xhs53ixrns2crfn"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -166,7 +166,7 @@ (define minetest-data
(file-name (git-file-name name version))
(sha256
(base32
- "12cpaiww148szvnrc8r8cffwvl33smnrl7k29sh401yv0pbqi3j8"))))
+ "1w0vdk6a1rhsfwyfviayfwsyqbzwikqazkgbrfl39anf3a50rvv1"))))
(build-system copy-build-system)
(arguments
(list #:install-plan
--
2.38.0
From b8b9d4d80f83aaf52cfabfc1b6d11b6a155439fd Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Mon, 31 Oct 2022 22:42:38 +0100
Subject: [PATCH 1/4] gnu: irrlicht-for-minetest: update to 1.9.0.mt8

* gnu/packages/games.scm (irrlicht-for-minetest): Update to 1.9.0.mt8.
[inputs]: Add libxi (xinput).
---
gnu/packages/games.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

Toggle diff (34 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 56d4ad2d87..2d93f42730 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3658,7 +3658,7 @@ (define-public irrlicht-for-minetest
(package
(inherit irrlicht)
(name "irrlicht-for-minetest")
- (version "1.9.0mt5")
+ (version "1.9.0mt8")
(source
(origin
(method git-fetch)
@@ -3667,11 +3667,14 @@ (define-public irrlicht-for-minetest
(commit version)))
(sha256
(base32
- "1jxk1x0f60n8lrz8a6x62aj2pqg0qnbajsld3lqncvwsfbi0xjx1"))))
+ "1646pj40dqkzbbc2lxzbmq2pjyrkgggbi2lah6pa5mv420p402kg"))))
(build-system cmake-build-system)
(arguments
;; No check target.
- (list #:tests? #f))))
+ (list #:tests? #f))
+ (inputs
+ `(,libxi
+ ,@(map cadr (package-inputs irrlicht))))))
(define-public mars
;; The latest release on SourceForge relies on an unreleased version of SFML

base-commit: eaaba9d62c611ff8eea03ac8f30d9d79cf7da3da
--
2.38.0
-----BEGIN PGP SIGNATURE-----

iQHMBAABCAA2FiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmNgReoYHHZpdmllbkBw
bGFuZXRlLWtyYXVzLmV1AAoJEDuwvBIy2Lgs388L/RdxgPVgQp/33CP7MZrUNCpG
LLWDK2ydTC76/hUMa3L6TsxI0Kq3VCryuBnG4Uupvkbt72pCm1cvyLW3nZ9B3gW4
pIaa6RTbC+CaoRZDx6/fBLg5x7fbm0UcMJ//ExNk0wLtXq0RHCkagOaHknVOnEZt
9JZQ0n2mluNAfSjGNXx3RNHvP0dHIse/+VASklIOTmq6RlVgCeQyrAkuyz7dMx/I
mCPEUQLEXbnKryxYMx3vET8k6iuyj6mjQV3v3i5wEy45HIZbRfueHdEyVx7STFRn
tQbprcrYSRmY0XwNKVswYccllnEoi7buGKH+6CMU8MSJ1HEFxo/YEzHj4N0J5gfE
/6ZzQa09jtVefavYiW+S0FxDCyJUSjXiBnW0etSi5LP9LmAvxlK45qY2PglD2rPZ
FPziR1RikCw4N5jobpR43WeRqvOQ0Yvekpj041hi1c6RILuvOMSMWCAPAVO5Ys7e
YtRtME3Nl9+XNlvICdQrAKBrCVhFL10j21jbX1OClA==
=0zHV
-----END PGP SIGNATURE-----


V
V
Vivien Kraus wrote on 1 Nov 2022 13:01
V2: Use modify-inputs
(address . 58932@debbugs.gnu.org)
2a7d83eff7537f883a166e5bcec53fc372e583eb.camel@planete-kraus.eu
Dear guix,

I was told I could use modify-inputs to add an input to irrlicht-for-
minetest. For convenience, here are all 4 commits again, even if only
the first is changed.

Best regards,

Vivien
From af1a990c36af4fc7b7185002a8e546bda88e7643 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Mon, 31 Oct 2022 22:44:31 +0100
Subject: [PATCH v2 4/4] gnu: minetest-technic: Update to 2022-10-30.

* gnu/packages/minetest.scm (minetest-technic): Update to 2022-10-30 (found a
commit with that date).
---
gnu/packages/minetest.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 7e0ec3ca21..f5671241a7 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -508,15 +508,15 @@ (define-public minetest-technic
(name "minetest-technic")
;; Upstream doesn't keep version numbers, so use the release
;; date on ContentDB instead.
- (version "2022-02-06")
+ (version "2022-10-30")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minetest-mods/technic")
- (commit "d2b68a6bef53e34e166deadd64e02b58bcae59a1")))
+ (commit "6a9dfec36f7265f9328fe378732417d9b57060b4")))
(sha256
- (base32 "0vmi1y39q0x39s9w0hhgi979a4hf6n1ah5jaazjvmjf02pjcvvy1"))
+ (base32 "0ng1aklm02n2lbar345yf88g3alzvnh0m0s5rb2bcw2k5lib8468"))
(file-name (git-file-name name version))))
(build-system minetest-mod-build-system)
(propagated-inputs
--
2.38.0
From 8708faa3bc19b6e47829abf5c15479ac8deb81e9 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Mon, 31 Oct 2022 22:44:06 +0100
Subject: [PATCH v2 3/4] gnu: minetest-mineclone: Update to 0.80.1.

* gnu/packages/minetest.scm (minetest-mineclone): Update to 0.80.1.
---
gnu/packages/minetest.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 7f8caa6701..7e0ec3ca21 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -395,7 +395,7 @@ (define-public minetest-mesecons
(define-public minetest-mineclone
(package
(name "minetest-mineclone")
- (version "0.75.0")
+ (version "0.80.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -404,7 +404,7 @@ (define-public minetest-mineclone
(file-name (git-file-name name version))
(sha256
(base32
- "10apja8bp8wmrbjlxg3gvrw5bdc8mizcngvnfi2ff790f6bsc5ip"))))
+ "0ndgzasjmj8397bb3y2aqalx9v72llwgvp9pv05mms3chpji2675"))))
(build-system copy-build-system)
(arguments
`(#:install-plan
--
2.38.0
From 527f050ca2073b53d7c91092b6c474aec467a820 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Mon, 31 Oct 2022 22:43:39 +0100
Subject: [PATCH v2 2/4] gnu: minetest: update to 5.6.1.

* gnu/packages/minetest.scm (minetest): Update to 5.6.1.
---
gnu/packages/minetest.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (33 lines)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index fd0dbec6a2..7f8caa6701 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -53,7 +53,7 @@ (define-module (gnu packages minetest)
(define-public minetest
(package
(name "minetest")
- (version "5.5.1")
+ (version "5.6.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -62,7 +62,7 @@ (define-public minetest
(file-name (git-file-name name version))
(sha256
(base32
- "042v71gkk0xfixcsn82az2fri0n28fgf9d2zcz31bijqmg5q7imj"))
+ "1bgk369n7r52vh3hdngrlf98k3v84ch2qp341xhs53ixrns2crfn"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -166,7 +166,7 @@ (define minetest-data
(file-name (git-file-name name version))
(sha256
(base32
- "12cpaiww148szvnrc8r8cffwvl33smnrl7k29sh401yv0pbqi3j8"))))
+ "1w0vdk6a1rhsfwyfviayfwsyqbzwikqazkgbrfl39anf3a50rvv1"))))
(build-system copy-build-system)
(arguments
(list #:install-plan
--
2.38.0
From ed546e02a5d12998d6167d714979edffc8efc82b Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Mon, 31 Oct 2022 22:42:38 +0100
Subject: [PATCH v2 1/4] gnu: irrlicht-for-minetest: update to 1.9.0.mt8

* gnu/packages/games.scm (irrlicht-for-minetest): Update to 1.9.0.mt8.
[inputs]: Add libxi (xinput).
---
gnu/packages/games.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

Toggle diff (34 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8ed4067deb..807dde8617 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3658,7 +3658,7 @@ (define-public irrlicht-for-minetest
(package
(inherit irrlicht)
(name "irrlicht-for-minetest")
- (version "1.9.0mt5")
+ (version "1.9.0mt8")
(source
(origin
(method git-fetch)
@@ -3667,11 +3667,14 @@ (define-public irrlicht-for-minetest
(commit version)))
(sha256
(base32
- "1jxk1x0f60n8lrz8a6x62aj2pqg0qnbajsld3lqncvwsfbi0xjx1"))))
+ "1646pj40dqkzbbc2lxzbmq2pjyrkgggbi2lah6pa5mv420p402kg"))))
(build-system cmake-build-system)
(arguments
;; No check target.
- (list #:tests? #f))))
+ (list #:tests? #f))
+ (inputs
+ (modify-inputs (package-inputs irrlicht)
+ (append libxi)))))
(define-public mars
;; The latest release on SourceForge relies on an unreleased version of SFML

base-commit: f151a729bf7b51750fbcd55fb7945282cddbf7c5
--
2.38.0
V
V
Vivien Kraus wrote on 31 Oct 2022 22:43
[PATCH v3 2/4] gnu: minetest: update to 5.6.1.
(address . 58932@debbugs.gnu.org)
abf0c4034f1005742782c0bb35b612a1809f716c.camel@planete-kraus.eu
* gnu/packages/minetest.scm (minetest): Update to 5.6.1.
---
gnu/packages/minetest.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (33 lines)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index fd0dbec6a2..7f8caa6701 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -53,7 +53,7 @@ (define-module (gnu packages minetest)
(define-public minetest
(package
(name "minetest")
- (version "5.5.1")
+ (version "5.6.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -62,7 +62,7 @@ (define-public minetest
(file-name (git-file-name name version))
(sha256
(base32
- "042v71gkk0xfixcsn82az2fri0n28fgf9d2zcz31bijqmg5q7imj"))
+ "1bgk369n7r52vh3hdngrlf98k3v84ch2qp341xhs53ixrns2crfn"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -166,7 +166,7 @@ (define minetest-data
(file-name (git-file-name name version))
(sha256
(base32
- "12cpaiww148szvnrc8r8cffwvl33smnrl7k29sh401yv0pbqi3j8"))))
+ "1w0vdk6a1rhsfwyfviayfwsyqbzwikqazkgbrfl39anf3a50rvv1"))))
(build-system copy-build-system)
(arguments
(list #:install-plan
--
2.38.0
V
V
Vivien Kraus wrote on 31 Oct 2022 22:44
[PATCH v3 4/4] gnu: minetest-technic: Update to 2022-10-30.
(address . 58932@debbugs.gnu.org)
edd8abd6f6c1b02437b4fa9ca1e215c30760b4f1.camel@planete-kraus.eu
* gnu/packages/minetest.scm (minetest-technic): Update to 2022-10-30 (found a
commit with that date).
---
gnu/packages/minetest.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 7e0ec3ca21..f5671241a7 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -508,15 +508,15 @@ (define-public minetest-technic
(name "minetest-technic")
;; Upstream doesn't keep version numbers, so use the release
;; date on ContentDB instead.
- (version "2022-02-06")
+ (version "2022-10-30")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minetest-mods/technic")
- (commit "d2b68a6bef53e34e166deadd64e02b58bcae59a1")))
+ (commit "6a9dfec36f7265f9328fe378732417d9b57060b4")))
(sha256
- (base32 "0vmi1y39q0x39s9w0hhgi979a4hf6n1ah5jaazjvmjf02pjcvvy1"))
+ (base32 "0ng1aklm02n2lbar345yf88g3alzvnh0m0s5rb2bcw2k5lib8468"))
(file-name (git-file-name name version))))
(build-system minetest-mod-build-system)
(propagated-inputs
--
2.38.0
V
V
Vivien Kraus wrote on 31 Oct 2022 22:44
[PATCH v3 3/4] gnu: minetest-mineclone: Update to 0.80.1.
(address . 58932@debbugs.gnu.org)
4db75f2e83a041b4d77bad9a0d77cbfbe9152c63.camel@planete-kraus.eu
* gnu/packages/minetest.scm (minetest-mineclone): Update to 0.80.1.
---
gnu/packages/minetest.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 7f8caa6701..7e0ec3ca21 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -395,7 +395,7 @@ (define-public minetest-mesecons
(define-public minetest-mineclone
(package
(name "minetest-mineclone")
- (version "0.75.0")
+ (version "0.80.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -404,7 +404,7 @@ (define-public minetest-mineclone
(file-name (git-file-name name version))
(sha256
(base32
- "10apja8bp8wmrbjlxg3gvrw5bdc8mizcngvnfi2ff790f6bsc5ip"))))
+ "0ndgzasjmj8397bb3y2aqalx9v72llwgvp9pv05mms3chpji2675"))))
(build-system copy-build-system)
(arguments
`(#:install-plan
--
2.38.0
V
V
Vivien Kraus wrote on 31 Oct 2022 22:42
[PATCH v3 1/4] gnu: irrlicht-for-minetest: update to 1.9.0.mt8
(address . 58932@debbugs.gnu.org)
9ebaf8ccbe4487e7d8e640adca2130d7d103776b.camel@planete-kraus.eu
* gnu/packages/games.scm (irrlicht-for-minetest): Update to 1.9.0.mt8.
[inputs]: Add libxi (xinput).
---
gnu/packages/games.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

Toggle diff (34 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 0a41840847..c365558321 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3658,7 +3658,7 @@ (define-public irrlicht-for-minetest
(package
(inherit irrlicht)
(name "irrlicht-for-minetest")
- (version "1.9.0mt5")
+ (version "1.9.0mt8")
(source
(origin
(method git-fetch)
@@ -3667,11 +3667,14 @@ (define-public irrlicht-for-minetest
(commit version)))
(sha256
(base32
- "1jxk1x0f60n8lrz8a6x62aj2pqg0qnbajsld3lqncvwsfbi0xjx1"))))
+ "1646pj40dqkzbbc2lxzbmq2pjyrkgggbi2lah6pa5mv420p402kg"))))
(build-system cmake-build-system)
(arguments
;; No check target.
- (list #:tests? #f))))
+ (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

base-commit: 84d239599a10f31e7d414d962ae25888ab21165c
--
2.38.0
(
Re: [bug#58932] [PATCH] Update minetest
CO4CG2KN6ENM.1WSMAR8LJAQ5L@guix-framework
v3 LGTM! :)

-- (
L
L
Liliana Marie Prikler wrote on 5 Nov 2022 18:04
0225db266cf5814d6785844948f6b6bf307d597b.camel@gmail.com
Am Samstag, dem 05.11.2022 um 12:00 +0000 schrieb (:
Toggle quote (3 lines)
> v3 LGTM! :)
>
>     -- (
Agreed and pushed.

Cheers
Closed
?