From: Vivien Kraus via Bug reports for GNU Guix <bug-guix@gnu.org>
To: Maxime Devos <maximedevos@telenet.be>, 50677@debbugs.gnu.org
Subject: bug#50677: [PATCH] Minetest basic_materials really depends on moreores
Date: Wed, 22 Sep 2021 18:46:27 +0200 [thread overview]
Message-ID: <391c3b2b8b058845bc07630ac2cd96c06783227b.camel@planete-kraus.eu> (raw)
In-Reply-To: <9f206acf24c7fc265102712912d3d0e336b54fc7.camel@planete-kraus.eu>
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
lylip on the #guix chat suggested to save the log to disk, so that the
errors can be read in context. I think it is the best thing to do, what
do you think?
Vivien
[-- Attachment #2: 0004-gnu-minetest-basic-materials-Depend-on-minetest-more.patch --]
[-- Type: text/x-patch, Size: 1144 bytes --]
From f5cafa5aaf26b065f3627d5e013d06c86c251f8f Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 19 Sep 2021 17:00:45 +0200
Subject: [PATCH 4/4] gnu: minetest-basic-materials: Depend on
minetest-moreores.
* minetest.scm (minetest-basic-materials): Add minetest-moreores as a propagated input.
---
gnu/packages/minetest.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 0730de7351..189889f890 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -221,6 +221,10 @@ numeric identifier TOPIC-ID on the official Minetest forums."
(base32 "0v6l3lrjgshy4sccjhfhmfxc3gk0cdy73qb02i9wd2vw506v5asx"))
(file-name (git-file-name name version))))
(build-system minetest-mod-build-system)
+ (propagated-inputs
+ ;; basic_materials:silver_wire cannot be crafted without
+ ;; moreores:silver_ingot.
+ `(("minetest-moreores" ,minetest-moreores)))
(home-page (minetest-topic 21000))
(synopsis "Some \"basic\" materials and items for other Minetest mods to use")
(description
--
2.33.0
[-- Attachment #3: 0003-gnu-Add-minetest-moreores.patch --]
[-- Type: text/x-patch, Size: 1527 bytes --]
From 92e59ddbcd185faaf0de00d8ac3cc68fdd13f531 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 19 Sep 2021 16:58:53 +0200
Subject: [PATCH 3/4] gnu: Add minetest-moreores.
* gnu/packages/minetest.scm (minetest-moreores): New variable.
---
gnu/packages/minetest.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index fd1439d4d2..0730de7351 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -187,6 +187,25 @@ numeric identifier TOPIC-ID on the official Minetest forums."
(string-append "https://forum.minetest.net/viewtopic.php?t="
(number->string topic-id)))
+(define-public minetest-moreores
+ (package
+ (name "minetest-moreores")
+ (version "2.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/minetest-mods/moreores")
+ (commit "0b6f669df4c9b7771c03e0e6ba8effb471cdfcae")))
+ (sha256 (base32 "1chfqbc6bb27aacjc67j5l5wcdvmcsvk2rfmangipd7nwini3y34"))
+ (file-name (git-file-name name version))))
+ (build-system minetest-mod-build-system)
+ (home-page (minetest-topic 549))
+ (synopsis "Adds new ore types")
+ (description "More ores for Minetest.")
+ (license license:zlib)
+ (properties `((upstream-name . "Calinou/moreores")))))
+
(define-public minetest-basic-materials
(package
(name "minetest-basic-materials")
--
2.33.0
[-- Attachment #4: 0002-guix-minetest-build-system-Also-install-config.txt-a.patch --]
[-- Type: text/x-patch, Size: 1125 bytes --]
From 9176a157e6cd73fe70549d3796772a944db822ed Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 19 Sep 2021 22:42:49 +0200
Subject: [PATCH 2/4] guix: minetest-build-system: Also install config.txt and
_config.txt
* minetest-build-system.scm (mod-install-plan): Add config.txt and _config.txt to the list of installed files.
---
guix/build/minetest-build-system.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm
index df6fb50416..d238056231 100644
--- a/guix/build/minetest-build-system.scm
+++ b/guix/build/minetest-build-system.scm
@@ -41,7 +41,7 @@
;; See <https://github.com/minetest/minetest/blob/master/doc/lua_api.txt>
;; for an incomple list of files that can be found in mods.
#:include ("mod.conf" "modpack.conf" "settingtypes.txt" "depends.txt"
- "description.txt")
+ "description.txt" "config.txt" "_config.txt")
#:include-regexp (".lua$" ".png$" ".ogg$" ".obj$" ".b3d$" ".tr$"
".mts$"))))
--
2.33.0
[-- Attachment #5: 0001-guix-minetest-build-system-Save-the-full-test-log.patch --]
[-- Type: text/x-patch, Size: 2515 bytes --]
From ffcd1922af4a1249b78f8e749d37b83e5f20034a Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 19 Sep 2021 20:03:10 +0200
Subject: [PATCH 1/4] guix: minetest-build-system: Save the full test log
* minetest-build-system.scm (check): Save the full test log.
---
guix/build/minetest-build-system.scm | 35 +++++++++++++++++-----------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm
index 477cc3d1d0..df6fb50416 100644
--- a/guix/build/minetest-build-system.scm
+++ b/guix/build/minetest-build-system.scm
@@ -23,6 +23,7 @@
#:use-module (ice-9 rdelim)
#:use-module (ice-9 receive)
#:use-module (ice-9 regex)
+ #:use-module (ice-9 exceptions)
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
#:use-module ((guix build copy-build-system) #:prefix copy:)
#:export (%standard-phases
@@ -199,20 +200,26 @@ auth_backend = sqlite3
(define (stop? line)
(and (string? line)
(string-contains line "ACTION[Server]: singleplayer [127.0.0.1] joins game.")))
- (let loop ()
- (match (read-line port)
- ((? error? line)
- (error "minetest raised an error: ~a" line))
- ((? stop?)
- (kill pid SIGINT)
- (close-port port)
- (waitpid pid))
- ((? string? line)
- (display line)
- (newline)
- (loop))
- ((? eof-object?)
- (error "minetest didn't start"))))))))
+ (define log-file (open-output-file "guix-test.log"))
+ (let loop ((has-errors? #f))
+ (let ((line (read-line port)))
+ (unless (eof-object? line)
+ (write-line line log-file))
+ (match `(,line ,has-errors?)
+ (((? error? line) _)
+ (loop #t))
+ (((? stop?) #f)
+ (kill pid SIGINT)
+ (close-port port)
+ (waitpid pid))
+ (((? eof-object?) #f)
+ (error "minetest didn't start"))
+ (((or (? stop?) (? eof-object?)) #t)
+ (error "minetest stopped after an error happened, see source/guix_testworld/guix-test.log"))
+ (((? string? line) has-error?)
+ (display line)
+ (newline)
+ (loop has-error?)))))))))
(define %standard-phases
(modify-phases gnu:%standard-phases
--
2.33.0
next prev parent reply other threads:[~2021-09-22 16:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-19 15:23 bug#50677: [PATCH] Minetest basic_materials really depends on moreores Vivien Kraus via Bug reports for GNU Guix
2021-09-19 17:40 ` Maxime Devos
2021-09-19 18:54 ` Vivien Kraus via Bug reports for GNU Guix
2021-09-19 18:59 ` Vivien Kraus via Bug reports for GNU Guix
2021-09-19 19:18 ` Maxime Devos
2021-09-19 19:11 ` Maxime Devos
2021-09-19 21:05 ` Vivien Kraus via Bug reports for GNU Guix
2021-09-22 16:46 ` Vivien Kraus via Bug reports for GNU Guix [this message]
2021-09-22 17:41 ` Maxime Devos
2021-09-22 18:04 ` Vivien Kraus via Bug reports for GNU Guix
2021-09-22 18:15 ` Maxime Devos
2021-09-22 18:37 ` Vivien Kraus via Bug reports for GNU Guix
2021-09-22 18:43 ` Maxime Devos
2021-10-14 15:14 ` Vivien Kraus via Bug reports for GNU Guix
2021-10-15 20:18 ` Maxime Devos
2021-10-16 15:32 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=391c3b2b8b058845bc07630ac2cd96c06783227b.camel@planete-kraus.eu \
--to=bug-guix@gnu.org \
--cc=50677@debbugs.gnu.org \
--cc=maximedevos@telenet.be \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.