[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Vivien Kraus via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 120 bytes --]


Dear Guix,

I’d like to have the advtrains minetest mod in Guix, what do you think?

Best regards,

Vivien


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-add-minetest-advtrains.patch --]
[-- Type: text/x-patch, Size: 3223 bytes --]

From 2a0abac482a9a40a1263419766d23a169ec61e89 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 5 Sep 2021 15:21:35 +0200
Subject: [PATCH] gnu: add minetest-advtrains

* gnu/packages/minetest.scm (minetest-advtrains): New variable.
* gnu/packages/minetest.scm (minetest-basic-trains): New variable.
---
 gnu/packages/minetest.scm | 61 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 5453f4d16a..13ea6036f5 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -624,3 +624,64 @@ track of important locations.")
                    license:cc-by4.0 license:cc-by-sa3.0 license:public-domain
                    license:cc0 license:fdl1.2+))
     (properties `((upstream-name . "RealBadAngel/unified_inventory")))))
+
+(define-public minetest-advtrains
+  (package
+    (name "minetest-advtrains")
+    (version "2.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.bananach.space/advtrains.git")
+             (commit "release-2.3.1")))
+       (sha256
+        (base32 "1ijqlchh269jpvmgmdmdvy3nsnk0bszkvvcqk6vaysvxam695ggw"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (home-page "http://advtrains.de/")
+    (synopsis
+     "Adds good-looking, realistic trains with realistic rails.")
+    (description
+     "This mod features realistic trains and various equipment for railways, with a focus on automated train operation.
+
+Main features:
+
+- Almost-realistic tracks with actual curves and switches
+- Railway signals, controllable by various means
+- ATC: Simple, command-like automatic train control
+- LuaATC: Powerful Lua-scripted automatic train operation(requires some programming knowledge)*
+- An Interlocking system, featuring track sections, routes and automatic stopping before signals")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3))
+    (properties
+     `((upstream-name . "orwell/advtrains")))))
+
+(define-public minetest-basic-trains
+  (package
+    (name "minetest-basic-trains")
+    (version "1.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "http://git.bananach.space/basic_trains.git/")
+             (commit
+              "d44c410f7c2a7202ee68b66fc50febae89e0c5dc")))
+       (sha256
+        (base32
+         "0vvzndj48kgdz2bfgivfm217sbmc2lmxpp2mispcy7byn4i26prx"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (propagated-inputs
+     `(("minetest-advtrains" ,minetest-advtrains)))
+    (home-page
+     "http://advtrains.de/wiki/doku.php?id=usage:trains:basic_trains")
+    (synopsis
+     "Collection of basic trains for the Advanced Trains mod. Formerly included in main advtrains modpack (until 2.3.0)")
+    (description
+     "This modpack contains the trains which were the \"default\" trains in advtrains up to version 2.2.1.")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3))
+    (properties
+     `((upstream-name . "orwell/basic_trains")))))
-- 
2.33.0

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Maxime Devos]

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 134 bytes --]

Maxime Devos schreef op ma 06-09-2021 om 13:02 [+0200]:
> 

Please ignore, I accidentally pushed 'Sent' before writing
anything.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]

Vivien Kraus via Guix-patches via schreef op ma 06-09-2021 om 10:53 [+0200]:
> Guix,
> 
> I’d like to have the advtrains minetest mod in Guix, what do you think?

Did the minetest importer work well for you?

> +- Almost-realistic tracks with actual curves and switches
> +- Railway signals, controllable by various means
> +- ATC: Simple, command-like automatic train control
> +- LuaATC: Powerful Lua-scripted automatic train operation(requires some programming knowledge)*

Package descriptions are in texinfo, not markdown.  You'll need
to make the necessary adjustments.  Being proper Texinfo is necessary
for things like <https://guix.gnu.org/en/packages/minetest-mesecons-1.2.1-0.db58797/>.

(It would be nice if guix could automatically convert the markup ...)

> +    (license
> +     (list license:cc-by-sa3.0 license:agpl3))

According to http://git.bananach.space/basic_trains.git/tree/license.txt,
it's agpl3+ actually.  I now that the ContentDB page (and hence, the importer)
says it's AGPL-3.0-only, but ContentDB only very recently distinguishes between
AGPL-3.0-only and AGPL-3.0-or-later.  I sent a bug report upstream.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Vivien Kraus via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1274 bytes --]

Hello Maxime,

Le lundi 06 septembre 2021 à 13:17 +0200, Maxime Devos a écrit :
> Did the minetest importer work well for you?
I noticed 3 minor things:
1. The advtrain dependency on basic-trains was duplicated, I had to
remove one occurence;
2. The version number came prefixed with a "v" that I had to remove;
3. It was not able to get the commit ID and the hash for minetest-
advtrains, I had to fill it in myself (it was set to #f). Presumably
because of the exotic tag name.

That’s not counting the markdown and license issues, these are out of
scope indeed.

> Package descriptions are in texinfo, not markdown.  You'll need
> to make the necessary adjustments.
I updated the patch to account for an @itemize instead of dash
enumerations, I think it was the only thing missing.

> According to 
> http://git.bananach.space/basic_trains.git/tree/license.txt,
> it's agpl3+ actually.

You’re right, advtrains too: 
https://git.bananach.space/advtrains.git/tree/license.txt
I updated the patch.

Also, when I run ./etc/indent-code.el gnu/packages/minetest, there are
some re-indentations that happen for othe minetest packages. Thus, I’m
not sure what indentation and general style I should adopt. Hopefully
this problem will be fixed by guix style :)

Vivien



[-- Attachment #2: 0001-gnu-add-minetest-advtrains.patch --]
[-- Type: text/x-patch, Size: 3279 bytes --]

From 36b3170366205e761c57665f19dba1a581ca9053 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 5 Sep 2021 15:21:35 +0200
Subject: [PATCH] gnu: add minetest-advtrains

* gnu/packages/minetest.scm (minetest-advtrains): New variable.
* gnu/packages/minetest.scm (minetest-basic-trains): New variable.
---
 gnu/packages/minetest.scm | 68 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 5453f4d16a..80151b8de6 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -624,3 +624,71 @@ track of important locations.")
                    license:cc-by4.0 license:cc-by-sa3.0 license:public-domain
                    license:cc0 license:fdl1.2+))
     (properties `((upstream-name . "RealBadAngel/unified_inventory")))))
+
+(define-public minetest-advtrains
+  (package
+    (name "minetest-advtrains")
+    (version "2.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.bananach.space/advtrains.git")
+             (commit "release-2.3.1")))
+       (sha256
+        (base32 "1ijqlchh269jpvmgmdmdvy3nsnk0bszkvvcqk6vaysvxam695ggw"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (home-page "http://advtrains.de/")
+    (synopsis
+     "Adds good-looking, realistic trains with realistic rails.")
+    (description
+     "This mod features realistic trains and various equipment for railways, with a focus on automated train operation.
+
+Main features:
+
+@itemize
+@item
+almost-realistic tracks with actual curves and switches;
+@item
+railway signals, controllable by various means;
+@item
+ATC: simple, command-like automatic train control;
+@item
+LuaATC: Powerful Lua-scripted automatic train operation (requires some programming knowledge);
+@item
+an interlocking system, featuring track sections, routes and automatic stopping before signals.
+@end itemize")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3+))
+    (properties
+     `((upstream-name . "orwell/advtrains")))))
+
+(define-public minetest-basic-trains
+  (package
+    (name "minetest-basic-trains")
+    (version "1.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "http://git.bananach.space/basic_trains.git/")
+             (commit
+              "d44c410f7c2a7202ee68b66fc50febae89e0c5dc")))
+       (sha256
+        (base32
+         "0vvzndj48kgdz2bfgivfm217sbmc2lmxpp2mispcy7byn4i26prx"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (propagated-inputs
+     `(("minetest-advtrains" ,minetest-advtrains)))
+    (home-page
+     "http://advtrains.de/wiki/doku.php?id=usage:trains:basic_trains")
+    (synopsis
+     "Collection of basic trains for the Advanced Trains mod. Formerly included in main advtrains modpack (until 2.3.0)")
+    (description
+     "This modpack contains the trains which were the \"default\" trains in advtrains up to version 2.2.1.")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3+))
+    (properties
+     `((upstream-name . "orwell/basic_trains")))))
-- 
2.33.0

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]

Vivien Kraus schreef op ma 06-09-2021 om 13:56 [+0200]:
> Hello Maxime,
> 
> Le lundi 06 septembre 2021 à 13:17 +0200, Maxime Devos a écrit :
> > Did the minetest importer work well for you?
> I noticed 3 minor things:
> 1. The advtrain dependency on basic-trains was duplicated, I had to
> remove one occurence;

I can reproduce this with ‘guix import minetest --recursive orwell/basic_trains’.
Presumably the issue is that advtrains is listed twice in the dependencies
on ContentDB, as ‘advtrains’ and ‘advtrains_train_track’.  I'll send a patch
to remove duplicates.

> 2. The version number came prefixed with a "v" that I had to remove;

The importer uses the ‘release title’ as version number.  Apparently
the release titles for orwell/advtrains include a "v" prefix.  I'll
send a patch to remove the prefix.

> 3. It was not able to get the commit ID and the hash for minetest-
> advtrains, I had to fill it in myself (it was set to #f). Presumably
> because of the exotic tag name.

FWIW, the minetest importer doesn't look at git tag names, it just copies
the commit from ContentDB.  And in case of advtrains, the commit is
not available there, so the importer sets it to #false.
<https://content.minetest.net/api/packages/orwell/advtrains/releases/>.

> [...]
> 
> Also, when I run ./etc/indent-code.el gnu/packages/minetest, there are
> some re-indentations that happen for othe minetest packages. Thus, I’m
> not sure what indentation and general style I should adopt. Hopefully
> this problem will be fixed by guix style :)

The indentation from "./etc/indent-code.el" should be good.  Feel free
to precedede the ‘gnu: Add minetest-advtrains’ patch with a patch fixing
the indentation.

Greetings,
Maime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Vivien Kraus via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

Hello Maxime,

Le mardi 07 septembre 2021 à 12:20 +0200, Maxime Devos a écrit :
> The indentation from "./etc/indent-code.el" should be good.  Feel
> free
> to precedede the ‘gnu: Add minetest-advtrains’ patch with a patch
> fixing
> the indentation.

Since the indentation only changed for 2 packages, I made 2 commits,
one for each package. This amounts to 3 commits (they should commute):
1. Fix indentation for minetest-data;
2. Fix indentation for minetest-mesecons;
3. Add minetest-advtrains.

Vivien

[-- Attachment #2: 0003-gnu-add-minetest-advtrains.patch --]
[-- Type: text/x-patch, Size: 3283 bytes --]

From 791ad5843d8175d569132697aff264c633d2b112 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 5 Sep 2021 15:21:35 +0200
Subject: [PATCH 3/3] gnu: add minetest-advtrains

* gnu/packages/minetest.scm (minetest-advtrains): New variable.
* gnu/packages/minetest.scm (minetest-basic-trains): New variable.
---
 gnu/packages/minetest.scm | 68 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 9e48d5c69c..ad0b70195d 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -624,3 +624,71 @@ track of important locations.")
                    license:cc-by4.0 license:cc-by-sa3.0 license:public-domain
                    license:cc0 license:fdl1.2+))
     (properties `((upstream-name . "RealBadAngel/unified_inventory")))))
+
+(define-public minetest-advtrains
+  (package
+    (name "minetest-advtrains")
+    (version "2.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.bananach.space/advtrains.git")
+             (commit "release-2.3.1")))
+       (sha256
+        (base32 "1ijqlchh269jpvmgmdmdvy3nsnk0bszkvvcqk6vaysvxam695ggw"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (home-page "http://advtrains.de/")
+    (synopsis
+     "Adds good-looking, realistic trains with realistic rails.")
+    (description
+     "This mod features realistic trains and various equipment for railways, with a focus on automated train operation.
+
+Main features:
+
+@itemize
+@item
+almost-realistic tracks with actual curves and switches;
+@item
+railway signals, controllable by various means;
+@item
+ATC: simple, command-like automatic train control;
+@item
+LuaATC: Powerful Lua-scripted automatic train operation (requires some programming knowledge);
+@item
+an interlocking system, featuring track sections, routes and automatic stopping before signals.
+@end itemize")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3+))
+    (properties
+     `((upstream-name . "orwell/advtrains")))))
+
+(define-public minetest-basic-trains
+  (package
+    (name "minetest-basic-trains")
+    (version "1.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "http://git.bananach.space/basic_trains.git/")
+             (commit
+              "d44c410f7c2a7202ee68b66fc50febae89e0c5dc")))
+       (sha256
+        (base32
+         "0vvzndj48kgdz2bfgivfm217sbmc2lmxpp2mispcy7byn4i26prx"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (propagated-inputs
+     `(("minetest-advtrains" ,minetest-advtrains)))
+    (home-page
+     "http://advtrains.de/wiki/doku.php?id=usage:trains:basic_trains")
+    (synopsis
+     "Collection of basic trains for the Advanced Trains mod. Formerly included in main advtrains modpack (until 2.3.0)")
+    (description
+     "This modpack contains the trains which were the \"default\" trains in advtrains up to version 2.2.1.")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3+))
+    (properties
+     `((upstream-name . "orwell/basic_trains")))))
-- 
2.33.0


[-- Attachment #3: 0002-gnu-minetest-mesecons-Fix-indentation.patch --]
[-- Type: text/x-patch, Size: 3397 bytes --]

From 2c86184c6ad043aa87bbddc10ed3c4f63e6e690e Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 7 Sep 2021 12:28:35 +0200
Subject: [PATCH 2/3] gnu: minetest-mesecons: Fix indentation.

* gnu/packages/minetest.scm (minetest-mesecons): Fix indentation.
---
 gnu/packages/minetest.scm | 50 +++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 6f4682ba47..9e48d5c69c 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -304,37 +304,37 @@ and a variety of other stuff.")
   ;; The release on ContentDB does not have its own version number.
   (let ((commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7")
         (revision "0"))
-  (package
-    (name "minetest-mesecons")
-    (version (git-version "1.2.1" revision commit))
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/minetest-mods/mesecons")
-             (commit commit)))
-       (sha256
-        (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645"))
-       (file-name (git-file-name name version))))
-    (build-system minetest-mod-build-system)
-    (home-page "https://mesecons.net")
-    (synopsis
-     "Digital circuitry for Minetest, including wires, buttons and lights")
-    (description
-     "Mesecons is a mod for Minetest implementing various items related
+    (package
+      (name "minetest-mesecons")
+      (version (git-version "1.2.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/minetest-mods/mesecons")
+               (commit commit)))
+         (sha256
+          (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645"))
+         (file-name (git-file-name name version))))
+      (build-system minetest-mod-build-system)
+      (home-page "https://mesecons.net")
+      (synopsis
+       "Digital circuitry for Minetest, including wires, buttons and lights")
+      (description
+       "Mesecons is a mod for Minetest implementing various items related
 to digital circuitry, such as wires, buttons, lights and programmable
 controllers.  Among other things, there are also pistons, solar panels,
 pressure plates and note blocks.
 
 Mesecons has a similar goal to Redstone in Minecraft, but works in its own way,
 with different rules and mechanics.")
-    ;; LGPL for code, CC-BY-SA for textures.
-    ;; The README.md and COPYING.txt disagree about the "+" in license:lgpl3+.
-    ;; For now, assume README.md is correct.  Upstream has been asked to
-    ;; correct the inconsistency:
-    ;; <https://github.com/minetest-mods/mesecons/issues/575>.
-    (license (list license:lgpl3+ license:cc-by-sa3.0))
-    (properties `((upstream-name . "Jeija/mesecons"))))))
+      ;; LGPL for code, CC-BY-SA for textures.
+      ;; The README.md and COPYING.txt disagree about the "+" in license:lgpl3+.
+      ;; For now, assume README.md is correct.  Upstream has been asked to
+      ;; correct the inconsistency:
+      ;; <https://github.com/minetest-mods/mesecons/issues/575>.
+      (license (list license:lgpl3+ license:cc-by-sa3.0))
+      (properties `((upstream-name . "Jeija/mesecons"))))))
 
 (define-public minetest-mineclone
   (package
-- 
2.33.0


[-- Attachment #4: 0001-gnu-minetest-data-Fix-indentation.patch --]
[-- Type: text/x-patch, Size: 1510 bytes --]

From a97f8395a685b688b240f28089f368b9065d1d61 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 7 Sep 2021 12:27:59 +0200
Subject: [PATCH 1/3] gnu: minetest-data: Fix indentation.

* gnu/packages/minetest.scm (minetest-data): Fix indentation.
---
 gnu/packages/minetest.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 5453f4d16a..6f4682ba47 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -154,8 +154,8 @@ in different ways.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/minetest/minetest_game")
-                     (commit version)))
+                    (url "https://github.com/minetest/minetest_game")
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -172,8 +172,8 @@ in different ways.")
                                        "/share/minetest/games/minetest_game")))
                      (mkdir-p install-dir)
                      (copy-recursively
-                       (assoc-ref %build-inputs "source")
-                       install-dir)
+                      (assoc-ref %build-inputs "source")
+                      install-dir)
                      #t))))
     (synopsis "Main game data for the Minetest game engine")
     (description
-- 
2.33.0

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 2463 bytes --]

Hi,

Presuming minetest-advtrains and minetest-basic-trains build and actually
work, this largely LGTM.  I looked at the source code of advtrains and basic_trains
and didn't find anything ‘suspicious’ (e.g. malware, though mods are sandboxed
so they would have a hard time doing anything bad). 

minetest-advtrains and minetest-basic-trains are separate packages that
can be added separately, so theoretically, they should be added in separate
patches:

From (guix)Submitting Patches:
  11. Verify that your patch contains only one set of related changes.
     Bundling unrelated changes together makes reviewing harder and
     slower.

(minetest-advtrains seems rather useless without minetest-basic-trains though,
so maybe it's ok?)

Vivien Kraus schreef op di 07-09-2021 om 12:45 [+0200]:
> +(define-public minetest-advtrains
> +  (package
> +    (name "minetest-advtrains")
> +    (version "2.3.1")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://git.bananach.space/advtrains.git")
> +             (commit "release-2.3.1")))
> +       (sha256
> +        (base32 "1ijqlchh269jpvmgmdmdvy3nsnk0bszkvvcqk6vaysvxam695ggw"))
> +       (file-name (git-file-name name version))))
> +    (build-system minetest-mod-build-system)
> +    (home-page "http://advtrains.de/")
> +    (synopsis
> +     "Adds good-looking, realistic trains with realistic rails.")
> +    (description
> +     "This mod features realistic trains and various equipment for railways, with a focus on automated train operation.

Aren't the actual trains added with minetest-basic-trains?
Maybe replace ‘realistic trains’ -> ‘realistic train system’,
and note that minetest-basic-trains contains the actual train models.

I think a linter will have something to say about long lines here
(try "./pre-inst-env guix lint minetest-advtrains minetest-basic-trains").

> +
> +Main features:
> +
> +@itemize
> +@item
> +almost-realistic tracks with actual curves and switches;
> +@item
> +railway signals, controllable by various means;
> +@item
> +ATC: simple, command-like automatic train control;
> +@item
> +LuaATC: Powerful Lua-scripted automatic train operation (requires some programming knowledge);
> +@item
> +an interlocking system, featuring track sections, routes and automatic stopping before signals.
> +@end itemize")

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Vivien Kraus via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1138 bytes --]

Hello Maxime,

Le vendredi 10 septembre 2021 à 12:25 +0200, Maxime Devos a écrit :
> minetest-advtrains and minetest-basic-trains are separate packages
> that
> can be added separately, so theoretically, they should be added in
> separate
> patches:
It seems like the least surprising thing to do, so let’s go with the
split patch.

> Maybe replace ‘realistic trains’ -> ‘realistic train system’,
I’m not sure. Upstream really likes to use "train" as a general term,
like in share/minetest/mods/advtrains/modpack.conf, the official
description, the wiki, ... so I think it’s better to use that.

> and note that minetest-basic-trains contains the actual train models.
This sentence was missing, and I added it.

> I think a linter will have something to say about long lines here
> (try "./pre-inst-env guix lint minetest-advtrains minetest-basic-
> trains").
You’re right, I fixed the long lines and other warnings. However, I
don’t know how to fix "no updater for minetest-xxx" for both minetest-
advtrains and minetest-basic-trains. I can’t see a meaningful
difference between my packages and the others.

Vivien

[-- Attachment #2: 0004-gnu-add-minetest-basic-trains.patch --]
[-- Type: text/x-patch, Size: 1768 bytes --]

From fbe39d93acb01fbef9f7f497e9bb5814fdf3f6b5 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Fri, 10 Sep 2021 14:21:47 +0200
Subject: [PATCH 4/4] gnu: add minetest-basic-trains

* gnu/packages/minetest.scm (minetest-basic-trains): New variable.
---
 gnu/packages/minetest.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 0b0e7ace96..c218fb827f 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -668,3 +668,35 @@ stopping before signals.
      (list license:cc-by-sa3.0 license:agpl3+))
     (properties
      `((upstream-name . "orwell/advtrains")))))
+
+(define-public minetest-basic-trains
+  (package
+    (name "minetest-basic-trains")
+    (version "1.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "http://git.bananach.space/basic_trains.git/")
+             (commit
+              "d44c410f7c2a7202ee68b66fc50febae89e0c5dc")))
+       (sha256
+        (base32
+         "0vvzndj48kgdz2bfgivfm217sbmc2lmxpp2mispcy7byn4i26prx"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (propagated-inputs
+     `(("minetest-advtrains" ,minetest-advtrains)))
+    (home-page
+     "http://advtrains.de/wiki/doku.php?id=usage:trains:basic_trains")
+    (synopsis
+     "\
+Collection of basic trains for the Advanced Trains mod")
+    (description
+     "\
+This modpack contains the trains which were the \"default\" trains in
+advtrains up to version 2.2.1.")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3+))
+    (properties
+     `((upstream-name . "orwell/basic_trains")))))
-- 
2.33.0


[-- Attachment #3: 0003-gnu-add-minetest-advtrains.patch --]
[-- Type: text/x-patch, Size: 2195 bytes --]

From 9675601acba125905877f30b5bc47053db3b652d Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 5 Sep 2021 15:21:35 +0200
Subject: [PATCH 3/4] gnu: add minetest-advtrains

* gnu/packages/minetest.scm (minetest-advtrains): New variable.
---
 gnu/packages/minetest.scm | 44 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 9e48d5c69c..0b0e7ace96 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -624,3 +624,47 @@ track of important locations.")
                    license:cc-by4.0 license:cc-by-sa3.0 license:public-domain
                    license:cc0 license:fdl1.2+))
     (properties `((upstream-name . "RealBadAngel/unified_inventory")))))
+
+(define-public minetest-advtrains
+  (package
+    (name "minetest-advtrains")
+    (version "2.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.bananach.space/advtrains.git")
+             (commit "release-2.3.1")))
+       (sha256
+        (base32 "1ijqlchh269jpvmgmdmdvy3nsnk0bszkvvcqk6vaysvxam695ggw"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (home-page "http://advtrains.de/")
+    (synopsis
+     "Adds good-looking, realistic trains with realistic rails")
+    (description
+     "\
+This mod features realistic trains and various equipment for railways, with a
+focus on automated train operation.  This package contains no actual trains,
+please use minetest-basic-trains.
+
+Main features:
+
+@itemize
+@item
+almost-realistic tracks with actual curves and switches;
+@item
+railway signals, controllable by various means;
+@item
+ATC: simple, command-like automatic train control;
+@item
+LuaATC: Powerful Lua-scripted automatic train operation (requires some
+programming knowledge);
+@item
+an interlocking system, featuring track sections, routes and automatic
+stopping before signals.
+@end itemize")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3+))
+    (properties
+     `((upstream-name . "orwell/advtrains")))))
-- 
2.33.0


[-- Attachment #4: 0002-gnu-minetest-mesecons-Fix-indentation.patch --]
[-- Type: text/x-patch, Size: 3397 bytes --]

From ba9014e45f9b237e23da58de075231bda87a0cab Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 7 Sep 2021 12:28:35 +0200
Subject: [PATCH 2/4] gnu: minetest-mesecons: Fix indentation.

* gnu/packages/minetest.scm (minetest-mesecons): Fix indentation.
---
 gnu/packages/minetest.scm | 50 +++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 6f4682ba47..9e48d5c69c 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -304,37 +304,37 @@ and a variety of other stuff.")
   ;; The release on ContentDB does not have its own version number.
   (let ((commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7")
         (revision "0"))
-  (package
-    (name "minetest-mesecons")
-    (version (git-version "1.2.1" revision commit))
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/minetest-mods/mesecons")
-             (commit commit)))
-       (sha256
-        (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645"))
-       (file-name (git-file-name name version))))
-    (build-system minetest-mod-build-system)
-    (home-page "https://mesecons.net")
-    (synopsis
-     "Digital circuitry for Minetest, including wires, buttons and lights")
-    (description
-     "Mesecons is a mod for Minetest implementing various items related
+    (package
+      (name "minetest-mesecons")
+      (version (git-version "1.2.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/minetest-mods/mesecons")
+               (commit commit)))
+         (sha256
+          (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645"))
+         (file-name (git-file-name name version))))
+      (build-system minetest-mod-build-system)
+      (home-page "https://mesecons.net")
+      (synopsis
+       "Digital circuitry for Minetest, including wires, buttons and lights")
+      (description
+       "Mesecons is a mod for Minetest implementing various items related
 to digital circuitry, such as wires, buttons, lights and programmable
 controllers.  Among other things, there are also pistons, solar panels,
 pressure plates and note blocks.
 
 Mesecons has a similar goal to Redstone in Minecraft, but works in its own way,
 with different rules and mechanics.")
-    ;; LGPL for code, CC-BY-SA for textures.
-    ;; The README.md and COPYING.txt disagree about the "+" in license:lgpl3+.
-    ;; For now, assume README.md is correct.  Upstream has been asked to
-    ;; correct the inconsistency:
-    ;; <https://github.com/minetest-mods/mesecons/issues/575>.
-    (license (list license:lgpl3+ license:cc-by-sa3.0))
-    (properties `((upstream-name . "Jeija/mesecons"))))))
+      ;; LGPL for code, CC-BY-SA for textures.
+      ;; The README.md and COPYING.txt disagree about the "+" in license:lgpl3+.
+      ;; For now, assume README.md is correct.  Upstream has been asked to
+      ;; correct the inconsistency:
+      ;; <https://github.com/minetest-mods/mesecons/issues/575>.
+      (license (list license:lgpl3+ license:cc-by-sa3.0))
+      (properties `((upstream-name . "Jeija/mesecons"))))))
 
 (define-public minetest-mineclone
   (package
-- 
2.33.0


[-- Attachment #5: 0001-gnu-minetest-data-Fix-indentation.patch --]
[-- Type: text/x-patch, Size: 1510 bytes --]

From 77d3a0c63ae28a03e4408fa220a24605ad051e60 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 7 Sep 2021 12:27:59 +0200
Subject: [PATCH 1/4] gnu: minetest-data: Fix indentation.

* gnu/packages/minetest.scm (minetest-data): Fix indentation.
---
 gnu/packages/minetest.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 5453f4d16a..6f4682ba47 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -154,8 +154,8 @@ in different ways.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/minetest/minetest_game")
-                     (commit version)))
+                    (url "https://github.com/minetest/minetest_game")
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -172,8 +172,8 @@ in different ways.")
                                        "/share/minetest/games/minetest_game")))
                      (mkdir-p install-dir)
                      (copy-recursively
-                       (assoc-ref %build-inputs "source")
-                       install-dir)
+                      (assoc-ref %build-inputs "source")
+                      install-dir)
                      #t))))
     (synopsis "Main game data for the Minetest game engine")
     (description
-- 
2.33.0

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1121 bytes --]

Hi,

Vivien Kraus schreef op vr 10-09-2021 om 14:46 [+0200]:
> > Maybe replace ‘realistic trains’ -> ‘realistic train system’,
> I’m not sure. Upstream really likes to use "train" as a general term,
> like in share/minetest/mods/advtrains/modpack.conf, the official
> description, the wiki, ... so I think it’s better to use that.
> 
Ok.

> > I think a linter will have something to say about long lines here
> > (try "./pre-inst-env guix lint minetest-advtrains minetest-basic-
> > trains").
> You’re right, I fixed the long lines and other warnings. However, I
> don’t know how to fix "no updater for minetest-xxx" for both minetest-
> advtrains and minetest-basic-trains. I can’t see a meaningful
> difference between my packages and the others.

There is no updater for mods from ContentDB at the moment, so this is
expected.  There's a patch series for allowing updating git-fetch
origins: <https://issues.guix.gnu.org/50072#0>.  Once (the final version of)
that patch series is merged, it should be feasible to add an updater
for mods from ContentDB.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Xinglu Chen]

[-- Attachment #1: Type: text/plain, Size: 4887 bytes --]

On Fri, Sep 10 2021, Vivien Kraus via Guix-patches via wrote:

> Hello Maxime,
>
> Le vendredi 10 septembre 2021 à 12:25 +0200, Maxime Devos a écrit :
>> minetest-advtrains and minetest-basic-trains are separate packages
>> that
>> can be added separately, so theoretically, they should be added in
>> separate
>> patches:
> It seems like the least surprising thing to do, so let’s go with the
> split patch.
>
>> Maybe replace ‘realistic trains’ -> ‘realistic train system’,
> I’m not sure. Upstream really likes to use "train" as a general term,
> like in share/minetest/mods/advtrains/modpack.conf, the official
> description, the wiki, ... so I think it’s better to use that.
>
>> and note that minetest-basic-trains contains the actual train models.
> This sentence was missing, and I added it.
>
>> I think a linter will have something to say about long lines here
>> (try "./pre-inst-env guix lint minetest-advtrains minetest-basic-
>> trains").
> You’re right, I fixed the long lines and other warnings. However, I
> don’t know how to fix "no updater for minetest-xxx" for both minetest-
> advtrains and minetest-basic-trains. I can’t see a meaningful
> difference between my packages and the others.
>
> Vivien
> From fbe39d93acb01fbef9f7f497e9bb5814fdf3f6b5 Mon Sep 17 00:00:00 2001
> From: Vivien Kraus <vivien@planete-kraus.eu>
> Date: Fri, 10 Sep 2021 14:21:47 +0200
> Subject: [PATCH 4/4] gnu: add minetest-basic-trains
>
> * gnu/packages/minetest.scm (minetest-basic-trains): New variable.
> ---
>  gnu/packages/minetest.scm | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
> index 0b0e7ace96..c218fb827f 100644
> --- a/gnu/packages/minetest.scm
> +++ b/gnu/packages/minetest.scm
> @@ -668,3 +668,35 @@ stopping before signals.
>       (list license:cc-by-sa3.0 license:agpl3+))
>      (properties
>       `((upstream-name . "orwell/advtrains")))))
> +
> +(define-public minetest-basic-trains
> +  (package
> +    (name "minetest-basic-trains")
> +    (version "1.0.1")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "http://git.bananach.space/basic_trains.git/")
> +             (commit
> +              "d44c410f7c2a7202ee68b66fc50febae89e0c5dc")))
> +       (sha256
> +        (base32
> +         "0vvzndj48kgdz2bfgivfm217sbmc2lmxpp2mispcy7byn4i26prx"))
> +       (file-name (git-file-name name version))))
> +    (build-system minetest-mod-build-system)
> +    (propagated-inputs
> +     `(("minetest-advtrains" ,minetest-advtrains)))
> +    (home-page
> +     "http://advtrains.de/wiki/doku.php?id=usage:trains:basic_trains")
> +    (synopsis
> +     "\
> +Collection of basic trains for the Advanced Trains mod")
> +    (description
> +     "\
> +This modpack contains the trains which were the \"default\" trains in
> +advtrains up to version 2.2.1.")

I would use ``default'', which is the correct Texinfo syntax,
instead of "default".  See the Texinfo manual for more details:

  <https://www.gnu.org/software/texinfo/manual/texinfo/html_node/Inserting-Quotation-Marks.html>

> +    (license
> +     (list license:cc-by-sa3.0 license:agpl3+))
> +    (properties
> +     `((upstream-name . "orwell/basic_trains")))))
> -- 
> 2.33.0
>
> From 9675601acba125905877f30b5bc47053db3b652d Mon Sep 17 00:00:00 2001
> From: Vivien Kraus <vivien@planete-kraus.eu>
> Date: Sun, 5 Sep 2021 15:21:35 +0200
> Subject: [PATCH 3/4] gnu: add minetest-advtrains
>
> * gnu/packages/minetest.scm (minetest-advtrains): New variable.
> ---
>  gnu/packages/minetest.scm | 44 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 44 insertions(+)
>
> diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
> index 9e48d5c69c..0b0e7ace96 100644
> --- a/gnu/packages/minetest.scm
> +++ b/gnu/packages/minetest.scm
> @@ -624,3 +624,47 @@ track of important locations.")
>                     license:cc-by4.0 license:cc-by-sa3.0 license:public-domain
>                     license:cc0 license:fdl1.2+))
>      (properties `((upstream-name . "RealBadAngel/unified_inventory")))))
> +
> +(define-public minetest-advtrains
> +  (package
> +    (name "minetest-advtrains")
> +    (version "2.3.1")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://git.bananach.space/advtrains.git")
> +             (commit "release-2.3.1")))

This would preferably be (commit (string-append "release-" version)),
that means that you only have to update the ‘version’ field and the hash
when updating the package (assuming it doesn’t need additional
dependencies or change build system, etc.).

Otherwise, LGTM!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Vivien Kraus via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1539 bytes --]

Hello,

Le jeudi 16 septembre 2021 à 10:03 +0200, Xinglu Chen a écrit :
> > +This modpack contains the trains which were the \"default\" trains
> in
> > +advtrains up to version 2.2.1.")
> 
> I would use ``default'', which is the correct Texinfo syntax,
> instead of "default".  See the Texinfo manual for more details:
> https://www.gnu.org/software/texinfo/manual/texinfo/html_node/Inserting-Quotation-Marks.html
> 
You are correct, I changed it. Guix lint does not like it that much,
because it thinks it is a lazy shortcut for @code{}, but I guess guix
lint can be wrong sometimes.

> > +(define-public minetest-advtrains
> > +  (package
> > +    (name "minetest-advtrains")
> > +    (version "2.3.1")
> > +    (source
> > +     (origin
> > +       (method git-fetch)
> > +       (uri (git-reference
> > +             (url "https://git.bananach.space/advtrains.git")
> > +             (commit "release-2.3.1")))
> 
> This would preferably be (commit (string-append "release-" version)),
> that means that you only have to update the ‘version’ field and the
> hash
> when updating the package (assuming it doesn’t need additional
> dependencies or change build system, etc.).

This is a temporary fix because the contentdb importer (and future
updater) should get the commit ID from the minetest contentdb. For
minetest-advtrains, it is broken right now, so I had to guess which
commit it is, but it may be fixed soon. I added your change because it
makes more sense, but I don’t know if it will be relevant for long.

Vivien

[-- Attachment #2: 0004-gnu-add-minetest-basic-trains.patch --]
[-- Type: text/x-patch, Size: 1768 bytes --]

From 4a50fc1af3698ae13e855fb859eb98455a6d29a9 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Fri, 10 Sep 2021 14:21:47 +0200
Subject: [PATCH 4/4] gnu: add minetest-basic-trains

* gnu/packages/minetest.scm (minetest-basic-trains): New variable.
---
 gnu/packages/minetest.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 1e2ee54800..7ddff52925 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -668,3 +668,35 @@ stopping before signals.
      (list license:cc-by-sa3.0 license:agpl3+))
     (properties
      `((upstream-name . "orwell/advtrains")))))
+
+(define-public minetest-basic-trains
+  (package
+    (name "minetest-basic-trains")
+    (version "1.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "http://git.bananach.space/basic_trains.git/")
+             (commit
+              "d44c410f7c2a7202ee68b66fc50febae89e0c5dc")))
+       (sha256
+        (base32
+         "0vvzndj48kgdz2bfgivfm217sbmc2lmxpp2mispcy7byn4i26prx"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (propagated-inputs
+     `(("minetest-advtrains" ,minetest-advtrains)))
+    (home-page
+     "http://advtrains.de/wiki/doku.php?id=usage:trains:basic_trains")
+    (synopsis
+     "\
+Collection of basic trains for the Advanced Trains mod")
+    (description
+     "\
+This modpack contains the trains which were the ``default'' trains in
+advtrains up to version 2.2.1.")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3+))
+    (properties
+     `((upstream-name . "orwell/basic_trains")))))
-- 
2.33.0


[-- Attachment #3: 0003-gnu-add-minetest-advtrains.patch --]
[-- Type: text/x-patch, Size: 2214 bytes --]

From 556c240d5cdfc1f009c6f2e45c8a435ad1123ca8 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 5 Sep 2021 15:21:35 +0200
Subject: [PATCH 3/4] gnu: add minetest-advtrains

* gnu/packages/minetest.scm (minetest-advtrains): New variable.
---
 gnu/packages/minetest.scm | 44 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 9e48d5c69c..1e2ee54800 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -624,3 +624,47 @@ track of important locations.")
                    license:cc-by4.0 license:cc-by-sa3.0 license:public-domain
                    license:cc0 license:fdl1.2+))
     (properties `((upstream-name . "RealBadAngel/unified_inventory")))))
+
+(define-public minetest-advtrains
+  (package
+    (name "minetest-advtrains")
+    (version "2.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.bananach.space/advtrains.git")
+             (commit (string-append "release-" "2.3.1"))))
+       (sha256
+        (base32 "1ijqlchh269jpvmgmdmdvy3nsnk0bszkvvcqk6vaysvxam695ggw"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (home-page "http://advtrains.de/")
+    (synopsis
+     "Adds good-looking, realistic trains with realistic rails")
+    (description
+     "\
+This mod features realistic trains and various equipment for railways, with a
+focus on automated train operation.  This package contains no actual trains,
+please use minetest-basic-trains.
+
+Main features:
+
+@itemize
+@item
+almost-realistic tracks with actual curves and switches;
+@item
+railway signals, controllable by various means;
+@item
+ATC: simple, command-like automatic train control;
+@item
+LuaATC: Powerful Lua-scripted automatic train operation (requires some
+programming knowledge);
+@item
+an interlocking system, featuring track sections, routes and automatic
+stopping before signals.
+@end itemize")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3+))
+    (properties
+     `((upstream-name . "orwell/advtrains")))))
-- 
2.33.0


[-- Attachment #4: 0002-gnu-minetest-mesecons-Fix-indentation.patch --]
[-- Type: text/x-patch, Size: 3397 bytes --]

From c7ef72b8648d5800935f9b353d3c03807de08d11 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 7 Sep 2021 12:28:35 +0200
Subject: [PATCH 2/4] gnu: minetest-mesecons: Fix indentation.

* gnu/packages/minetest.scm (minetest-mesecons): Fix indentation.
---
 gnu/packages/minetest.scm | 50 +++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 6f4682ba47..9e48d5c69c 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -304,37 +304,37 @@ and a variety of other stuff.")
   ;; The release on ContentDB does not have its own version number.
   (let ((commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7")
         (revision "0"))
-  (package
-    (name "minetest-mesecons")
-    (version (git-version "1.2.1" revision commit))
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/minetest-mods/mesecons")
-             (commit commit)))
-       (sha256
-        (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645"))
-       (file-name (git-file-name name version))))
-    (build-system minetest-mod-build-system)
-    (home-page "https://mesecons.net")
-    (synopsis
-     "Digital circuitry for Minetest, including wires, buttons and lights")
-    (description
-     "Mesecons is a mod for Minetest implementing various items related
+    (package
+      (name "minetest-mesecons")
+      (version (git-version "1.2.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/minetest-mods/mesecons")
+               (commit commit)))
+         (sha256
+          (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645"))
+         (file-name (git-file-name name version))))
+      (build-system minetest-mod-build-system)
+      (home-page "https://mesecons.net")
+      (synopsis
+       "Digital circuitry for Minetest, including wires, buttons and lights")
+      (description
+       "Mesecons is a mod for Minetest implementing various items related
 to digital circuitry, such as wires, buttons, lights and programmable
 controllers.  Among other things, there are also pistons, solar panels,
 pressure plates and note blocks.
 
 Mesecons has a similar goal to Redstone in Minecraft, but works in its own way,
 with different rules and mechanics.")
-    ;; LGPL for code, CC-BY-SA for textures.
-    ;; The README.md and COPYING.txt disagree about the "+" in license:lgpl3+.
-    ;; For now, assume README.md is correct.  Upstream has been asked to
-    ;; correct the inconsistency:
-    ;; <https://github.com/minetest-mods/mesecons/issues/575>.
-    (license (list license:lgpl3+ license:cc-by-sa3.0))
-    (properties `((upstream-name . "Jeija/mesecons"))))))
+      ;; LGPL for code, CC-BY-SA for textures.
+      ;; The README.md and COPYING.txt disagree about the "+" in license:lgpl3+.
+      ;; For now, assume README.md is correct.  Upstream has been asked to
+      ;; correct the inconsistency:
+      ;; <https://github.com/minetest-mods/mesecons/issues/575>.
+      (license (list license:lgpl3+ license:cc-by-sa3.0))
+      (properties `((upstream-name . "Jeija/mesecons"))))))
 
 (define-public minetest-mineclone
   (package
-- 
2.33.0


[-- Attachment #5: 0001-gnu-minetest-data-Fix-indentation.patch --]
[-- Type: text/x-patch, Size: 1510 bytes --]

From 04d842a8355b9b9dedcfc51b78c3baccdcdb1e64 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 7 Sep 2021 12:27:59 +0200
Subject: [PATCH 1/4] gnu: minetest-data: Fix indentation.

* gnu/packages/minetest.scm (minetest-data): Fix indentation.
---
 gnu/packages/minetest.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 5453f4d16a..6f4682ba47 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -154,8 +154,8 @@ in different ways.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/minetest/minetest_game")
-                     (commit version)))
+                    (url "https://github.com/minetest/minetest_game")
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -172,8 +172,8 @@ in different ways.")
                                        "/share/minetest/games/minetest_game")))
                      (mkdir-p install-dir)
                      (copy-recursively
-                       (assoc-ref %build-inputs "source")
-                       install-dir)
+                      (assoc-ref %build-inputs "source")
+                      install-dir)
                      #t))))
     (synopsis "Main game data for the Minetest game engine")
     (description
-- 
2.33.0

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Vivien Kraus via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

Sorry, the last patches contained an error: (string-append "release-"
"2.3.1") insntead of (string-append "release-" version), please
consider these ones instead:

[-- Attachment #2: 0004-gnu-add-minetest-basic-trains.patch --]
[-- Type: text/x-patch, Size: 1768 bytes --]

From 5c00d1eca59c36d613dcccd13d90acf09f86071f Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Fri, 10 Sep 2021 14:21:47 +0200
Subject: [PATCH 4/4] gnu: add minetest-basic-trains

* gnu/packages/minetest.scm (minetest-basic-trains): New variable.
---
 gnu/packages/minetest.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 43dbe161da..8a4d81de03 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -668,3 +668,35 @@ stopping before signals.
      (list license:cc-by-sa3.0 license:agpl3+))
     (properties
      `((upstream-name . "orwell/advtrains")))))
+
+(define-public minetest-basic-trains
+  (package
+    (name "minetest-basic-trains")
+    (version "1.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "http://git.bananach.space/basic_trains.git/")
+             (commit
+              "d44c410f7c2a7202ee68b66fc50febae89e0c5dc")))
+       (sha256
+        (base32
+         "0vvzndj48kgdz2bfgivfm217sbmc2lmxpp2mispcy7byn4i26prx"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (propagated-inputs
+     `(("minetest-advtrains" ,minetest-advtrains)))
+    (home-page
+     "http://advtrains.de/wiki/doku.php?id=usage:trains:basic_trains")
+    (synopsis
+     "\
+Collection of basic trains for the Advanced Trains mod")
+    (description
+     "\
+This modpack contains the trains which were the ``default'' trains in
+advtrains up to version 2.2.1.")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3+))
+    (properties
+     `((upstream-name . "orwell/basic_trains")))))
-- 
2.33.0


[-- Attachment #3: 0003-gnu-add-minetest-advtrains.patch --]
[-- Type: text/x-patch, Size: 2214 bytes --]

From 7df9af22de4fdacf1e81653754a19f5484f68f2c Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 5 Sep 2021 15:21:35 +0200
Subject: [PATCH 3/4] gnu: add minetest-advtrains

* gnu/packages/minetest.scm (minetest-advtrains): New variable.
---
 gnu/packages/minetest.scm | 44 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 9e48d5c69c..43dbe161da 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -624,3 +624,47 @@ track of important locations.")
                    license:cc-by4.0 license:cc-by-sa3.0 license:public-domain
                    license:cc0 license:fdl1.2+))
     (properties `((upstream-name . "RealBadAngel/unified_inventory")))))
+
+(define-public minetest-advtrains
+  (package
+    (name "minetest-advtrains")
+    (version "2.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.bananach.space/advtrains.git")
+             (commit (string-append "release-" version))))
+       (sha256
+        (base32 "1ijqlchh269jpvmgmdmdvy3nsnk0bszkvvcqk6vaysvxam695ggw"))
+       (file-name (git-file-name name version))))
+    (build-system minetest-mod-build-system)
+    (home-page "http://advtrains.de/")
+    (synopsis
+     "Adds good-looking, realistic trains with realistic rails")
+    (description
+     "\
+This mod features realistic trains and various equipment for railways, with a
+focus on automated train operation.  This package contains no actual trains,
+please use minetest-basic-trains.
+
+Main features:
+
+@itemize
+@item
+almost-realistic tracks with actual curves and switches;
+@item
+railway signals, controllable by various means;
+@item
+ATC: simple, command-like automatic train control;
+@item
+LuaATC: Powerful Lua-scripted automatic train operation (requires some
+programming knowledge);
+@item
+an interlocking system, featuring track sections, routes and automatic
+stopping before signals.
+@end itemize")
+    (license
+     (list license:cc-by-sa3.0 license:agpl3+))
+    (properties
+     `((upstream-name . "orwell/advtrains")))))
-- 
2.33.0


[-- Attachment #4: 0002-gnu-minetest-mesecons-Fix-indentation.patch --]
[-- Type: text/x-patch, Size: 3397 bytes --]

From c7ef72b8648d5800935f9b353d3c03807de08d11 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 7 Sep 2021 12:28:35 +0200
Subject: [PATCH 2/4] gnu: minetest-mesecons: Fix indentation.

* gnu/packages/minetest.scm (minetest-mesecons): Fix indentation.
---
 gnu/packages/minetest.scm | 50 +++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 6f4682ba47..9e48d5c69c 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -304,37 +304,37 @@ and a variety of other stuff.")
   ;; The release on ContentDB does not have its own version number.
   (let ((commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7")
         (revision "0"))
-  (package
-    (name "minetest-mesecons")
-    (version (git-version "1.2.1" revision commit))
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/minetest-mods/mesecons")
-             (commit commit)))
-       (sha256
-        (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645"))
-       (file-name (git-file-name name version))))
-    (build-system minetest-mod-build-system)
-    (home-page "https://mesecons.net")
-    (synopsis
-     "Digital circuitry for Minetest, including wires, buttons and lights")
-    (description
-     "Mesecons is a mod for Minetest implementing various items related
+    (package
+      (name "minetest-mesecons")
+      (version (git-version "1.2.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/minetest-mods/mesecons")
+               (commit commit)))
+         (sha256
+          (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645"))
+         (file-name (git-file-name name version))))
+      (build-system minetest-mod-build-system)
+      (home-page "https://mesecons.net")
+      (synopsis
+       "Digital circuitry for Minetest, including wires, buttons and lights")
+      (description
+       "Mesecons is a mod for Minetest implementing various items related
 to digital circuitry, such as wires, buttons, lights and programmable
 controllers.  Among other things, there are also pistons, solar panels,
 pressure plates and note blocks.
 
 Mesecons has a similar goal to Redstone in Minecraft, but works in its own way,
 with different rules and mechanics.")
-    ;; LGPL for code, CC-BY-SA for textures.
-    ;; The README.md and COPYING.txt disagree about the "+" in license:lgpl3+.
-    ;; For now, assume README.md is correct.  Upstream has been asked to
-    ;; correct the inconsistency:
-    ;; <https://github.com/minetest-mods/mesecons/issues/575>.
-    (license (list license:lgpl3+ license:cc-by-sa3.0))
-    (properties `((upstream-name . "Jeija/mesecons"))))))
+      ;; LGPL for code, CC-BY-SA for textures.
+      ;; The README.md and COPYING.txt disagree about the "+" in license:lgpl3+.
+      ;; For now, assume README.md is correct.  Upstream has been asked to
+      ;; correct the inconsistency:
+      ;; <https://github.com/minetest-mods/mesecons/issues/575>.
+      (license (list license:lgpl3+ license:cc-by-sa3.0))
+      (properties `((upstream-name . "Jeija/mesecons"))))))
 
 (define-public minetest-mineclone
   (package
-- 
2.33.0


[-- Attachment #5: 0001-gnu-minetest-data-Fix-indentation.patch --]
[-- Type: text/x-patch, Size: 1510 bytes --]

From 04d842a8355b9b9dedcfc51b78c3baccdcdb1e64 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 7 Sep 2021 12:27:59 +0200
Subject: [PATCH 1/4] gnu: minetest-data: Fix indentation.

* gnu/packages/minetest.scm (minetest-data): Fix indentation.
---
 gnu/packages/minetest.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 5453f4d16a..6f4682ba47 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -154,8 +154,8 @@ in different ways.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/minetest/minetest_game")
-                     (commit version)))
+                    (url "https://github.com/minetest/minetest_game")
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -172,8 +172,8 @@ in different ways.")
                                        "/share/minetest/games/minetest_game")))
                      (mkdir-p install-dir)
                      (copy-recursively
-                       (assoc-ref %build-inputs "source")
-                       install-dir)
+                      (assoc-ref %build-inputs "source")
+                      install-dir)
                      #t))))
     (synopsis "Main game data for the Minetest game engine")
     (description
-- 
2.33.0

[bug#50425] [PATCH] gnu: Add minetest-advtrains.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

Vivien Kraus schreef op do 16-09-2021 om 10:39 [+0200]:
> Sorry, the last patches contained an error: (string-append "release-"
> "2.3.1") insntead of (string-append "release-" version), please
> consider these ones instead:

These patches look good to me.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

bug#50425: [PATCH] gnu: Add minetest-advtrains.

[Ludovic Courtès]

Hi,

Maxime Devos <maximedevos@telenet.be> skribis:

> Vivien Kraus schreef op do 16-09-2021 om 10:39 [+0200]:
>> Sorry, the last patches contained an error: (string-append "release-"
>> "2.3.1") insntead of (string-append "release-" version), please
>> consider these ones instead:
>
> These patches look good to me.

Awesome.  Applied with minor formatting tweaks.

Thanks Vivien & Maxime!

Ludo’.