diff options
author | Marius Bakke <marius@gnu.org> | 2021-09-17 01:25:52 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-09-17 01:25:52 +0200 |
commit | 5c3cb22c9b2810669999e044b2de5e9331011a83 (patch) | |
tree | 3276e19cc1a0af3cece6ce4f2bfa930901888bb4 /gnu/packages/minetest.scm | |
parent | c896287ce5eff968a0b323f3a069653a64b96b4c (diff) | |
parent | 2a054d29dcfd4b68ed3914886b637f93ac7a0a72 (diff) | |
download | guix-patches-5c3cb22c9b2810669999e044b2de5e9331011a83.tar guix-patches-5c3cb22c9b2810669999e044b2de5e9331011a83.tar.gz |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/chez.scm
gnu/packages/docbook.scm
gnu/packages/ebook.scm
gnu/packages/gnome.scm
gnu/packages/linux.scm
gnu/packages/networking.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/tex.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/dune.scm
guix/build-system/go.scm
guix/build-system/linux-module.scm
guix/packages.scm
Diffstat (limited to 'gnu/packages/minetest.scm')
-rw-r--r-- | gnu/packages/minetest.scm | 125 |
1 files changed, 96 insertions, 29 deletions
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 5453f4d16a..fd1439d4d2 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 @@ -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 @@ -624,3 +624,70 @@ 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 @code{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"))))) + +(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"))))) |