From 096897889f54f1649c2c18f27d62f9f00207334e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 23:36:02 +0200 Subject: gnu: solarus: Update to 1.6.5. * gnu/packages/games.scm (solarus): Update to 1.6.5. (solarus-quest-editor)[source]: Update hash. [arguments]: Remove obsolete 'fix-qt-build phase. --- gnu/packages/games.scm | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3f909aad4b..048784ab2c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2325,7 +2325,7 @@ and defeat them with your bubbles!") (name "solarus") ;; XXX: When updating this package, please also update hash in ;; `solarus-quest-editor' below. - (version "1.6.4") + (version "1.6.5") (source (origin (method git-fetch) @@ -2334,7 +2334,7 @@ and defeat them with your bubbles!") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1n6l91yyqjx0pz4w1lp3yybpq0fs2yjswfcm8c1wjfkxwiznbdxi")))) + (base32 "0ny9dgqphjv2l39rff2621hnrzpf8qin8vmnv7jdz20azjk4m8id")))) (build-system cmake-build-system) (arguments `(#:phases @@ -2393,19 +2393,9 @@ in mind.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn")))) + (base32 "1pvjgd4faxii5sskw1h55lw90hlbazhwni8nxyywzrmkjbq7irm0")))) (arguments - `(#:tests? #false ;no test - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-qt-build - ;; XXX: Fix build with Qt 5.15. It has been applied upstream as - ;; 81d5c7f1 and can be removed at next upgrade. - (lambda _ - (substitute* "src/entities/jumper.cpp" - (("#include " all) - (string-append all "\n" "#include \n"))) - #t))))) + `(#:tests? #false)) ; no test suite (inputs `(("solarus" ,solarus) ,@(package-inputs solarus))) -- cgit v1.2.3 From 018b6b46f1adcc2f2d7ce2b15ca66e998a9f2f44 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 9 Apr 2021 13:36:58 -0400 Subject: gnu: freeciv: Update to 2.6.4. * gnu/packages/games.scm (freeciv): Update to 2.6.4. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 048784ab2c..74cf9260df 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5849,7 +5849,7 @@ for Un*x systems with X11.") (define-public freeciv (package (name "freeciv") - (version "2.6.3") + (version "2.6.4") (source (origin (method url-fetch) @@ -5861,7 +5861,7 @@ for Un*x systems with X11.") (version-major+minor version) "/" version "/freeciv-" version ".tar.bz2"))) (sha256 - (base32 "1lgq7wcbhwpy2yqdw4biwfmp5q8fh7lhlwxcgm0fpaapfl12whvp")))) + (base32 "1kn122f57wn5a8ryxaz73dlbd5m93mqx3bqmmz2lkgdccrvrbns0")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From f0ca97f56ff565798b53a1187c25e0ae428e59a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:54:29 +0200 Subject: gnu: bsd-games: Fix typo in description. * gnu/packages/games.scm (bsd-games)[description]: Fix typo, and delete stray comma. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 74cf9260df..3e35479aae 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -743,7 +743,7 @@ battlestar (explore the world around, starting from dying spaceship), phantasia (role-play as an rogue), trek (hunt the Klingons, and save the Federation), and wump (hunt the big smelly Wumpus in a dark cave). -Quizes: arithmetic, and quiz.") +Quizzes: arithmetic and quiz.") ;; "Auxiliary and data files, distributed with the games in NetBSD, but ;; not bearing copyright notices, probably fall under the terms of the UCB ;; or NetBSD copyrights and licences. The file "fortune/Notes" contains a -- cgit v1.2.3 From 9d7577d5d808b6091ccecf6abb8b37b0dbe828b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Apr 2021 23:46:30 +0200 Subject: gnu: edgar: Update to 1.34. * gnu/packages/games.scm (edgar): Update to 1.34. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3e35479aae..150792bca5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8740,7 +8740,7 @@ where the player draws runes in real time to effect the desired spell.") (define-public edgar (package (name "edgar") - (version "1.33") + (version "1.34") (source (origin (method url-fetch) @@ -8748,7 +8748,7 @@ where the player draws runes in real time to effect the desired spell.") (string-append "https://github.com/riksweeney/edgar/releases/download/" version "/edgar-" version "-1.tar.gz")) (sha256 - (base32 "1mbx7dvizdca4g1blcv3bdh6yxd13k47rkya4rdzg0nvvz24m175")))) + (base32 "1121rq5wk3g8rs413av84s2kcy6qj6maspgy2vsxs36c2jd3yygl")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; there are no tests #:make-flags -- cgit v1.2.3 From e737e74ec0d739f16d41343c4f787d0b9155955b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Apr 2021 00:24:00 +0200 Subject: gnu: minetest: Update to 5.4.1. * gnu/packages/games.scm (minetest, minetest-data): Update to 5.4.1. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 150792bca5..dbc72446b2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3454,7 +3454,7 @@ match, cannon keep, and grave-itation pit.") (define-public minetest (package (name "minetest") - (version "5.4.0") + (version "5.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -3463,7 +3463,7 @@ match, cannon keep, and grave-itation pit.") (file-name (git-file-name name version)) (sha256 (base32 - "1a17g6cmxrscnqwpwrd4w2ck3dgvplyfq4kzyimilfpqar1q69j9")) + "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8")) (modules '((guix build utils))) (snippet '(begin @@ -3551,7 +3551,7 @@ in different ways.") (file-name (git-file-name name version)) (sha256 (base32 - "11dz36z0pj2r7i8xm8v5lskzws81ckj6sc0avlmvdl8qdc9x83w5")))) + "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) -- cgit v1.2.3 From c5e149a9d9cf25c68da817f46ea0cbf5442d39bd Mon Sep 17 00:00:00 2001 From: Trevor Hass Date: Tue, 13 Apr 2021 22:05:08 -0500 Subject: gnu: minetest: Fix absolute path to 'rm' command. * gnu/packages/games.scm (minetest)[patch-sources]: Substitute '/bin/rm' path. [inputs]: Add coreutils. Signed-off-by: Leo Prikler --- gnu/packages/games.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dbc72446b2..91ac839aee 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -52,7 +52,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020, 2021 Michael Rohleder -;;; Copyright © 2020 Trevor Hass +;;; Copyright © 2020, 2021 Trevor Hass ;;; Copyright © 2020, 2021 Leo Prikler ;;; Copyright © 2020 Lu hux ;;; Copyright © 2020 Tomás Ortín Fernández @@ -3486,8 +3486,13 @@ match, cannon keep, and grave-itation pit.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-sources - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/filesys.cpp" + ;; Use store-path for "rm" instead of non-existing FHS path. + (("\"/bin/rm\"") + (string-append "\"" (assoc-ref inputs "coreutils") "/bin/rm\""))) (substitute* "src/CMakeLists.txt" + ;; Let minetest binary remain in build directory. (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") "")) (substitute* "src/unittest/test_servermodmanager.cpp" ;; do no override MINETEST_SUBGAME_PATH @@ -3511,7 +3516,8 @@ match, cannon keep, and grave-itation pit.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("curl" ,curl) + `(("coreutils" ,coreutils) + ("curl" ,curl) ("freetype" ,freetype) ("gettext" ,gettext-minimal) ("gmp" ,gmp) -- cgit v1.2.3