From 6e65eb3cad1d1148eade9ed2228cdea90d531a94 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 2 Jul 2018 00:08:54 +0200 Subject: gnu: cdogs-sdl: Update to 0.6.7. * gnu/packages/games.scm (cdogs-sdl): Update to 0.6.7. [source]: Use version tag. --- gnu/packages/games.scm | 71 ++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 37 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5f43aa154c..0796e48001 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3666,46 +3666,43 @@ emerges from a sewer hole and pulls her below ground.") license:cc-by-sa3.0))))) (define-public cdogs-sdl - ;; XXX: Use version 0.6.7 when it's available. - (let ((commit "bab2031369b9ea2dbeb7eedbde10a43dd8ca83db") - (revision "1")) - (package - (name "cdogs-sdl") - (version (git-version "0.6.6" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cxong/cdogs-sdl.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "09sfqhrrffhvxbhigvrxfmai52w01w3f9kjmixjhqvqlkhn77c9n")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - (list (string-append "-DCDOGS_DATA_DIR=" - (assoc-ref %outputs "out") - "/share/cdogs-sdl/")))) - (inputs - `(("mesa" ,mesa) - ("sdl2" ,sdl2) - ("sdl2-image" ,sdl2-image) - ("sdl2-mixer" ,sdl2-mixer))) - (home-page "https://cxong.github.io/cdogs-sdl/") - (synopsis "Classic overhead run-and-gun game") - (description "C-Dogs SDL is a classic overhead run-and-gun game, + (package + (name "cdogs-sdl") + (version "0.6.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cxong/cdogs-sdl.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1frafzsj3f83xkmn4llr7g728c82lcqi424ini1hv3gv5zjgpa15")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list (string-append "-DCDOGS_DATA_DIR=" + (assoc-ref %outputs "out") + "/share/cdogs-sdl/")))) + (inputs + `(("mesa" ,mesa) + ("sdl2" ,sdl2) + ("sdl2-image" ,sdl2-image) + ("sdl2-mixer" ,sdl2-mixer))) + (home-page "https://cxong.github.io/cdogs-sdl/") + (synopsis "Classic overhead run-and-gun game") + (description "C-Dogs SDL is a classic overhead run-and-gun game, supporting up to 4 players in co-op and deathmatch modes. Customize your player, choose from many weapons, and blast, slide and slash your way through over 100 user-created campaigns.") - ;; GPLv2+ for code (includes files under BSD-2 and BSD-3), - ;; CC0/CC-BY/CC-BY-SA for assets. - (license (list license:gpl2+ - license:bsd-2 - license:bsd-3 - license:cc0 - license:cc-by3.0 - license:cc-by-sa3.0))))) + ;; GPLv2+ for code (includes files under BSD-2 and BSD-3), + ;; CC0/CC-BY/CC-BY-SA for assets. + (license (list license:gpl2+ + license:bsd-2 + license:bsd-3 + license:cc0 + license:cc-by3.0 + license:cc-by-sa3.0)))) (define-public kiki (package -- cgit v1.2.3 From e402a66b07c12aadf5eed1472110684831f1f498 Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Mon, 2 Jul 2018 17:10:50 +0200 Subject: gnu: teeworlds: Add missing dependency. * gnu/packages/games.scm (teeworlds)[native-inputs]: Add pkg-config. Signed-off-by: Ricardo Wurmus --- gnu/packages/games.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0796e48001..41c4396add 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018 Nicolas Goaziou ;;; Copyright © 2018 okapi +;;; Copyright © 2018 Tim Gesthuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -3880,7 +3881,8 @@ settings.link.libs:Add(\"wavpack\")\n")) ("zlib" ,zlib))) (native-inputs `(("bam" ,bam) - ("python" ,python-2))) + ("python" ,python-2) + ("pkg-config" ,pkg-config))) (home-page "https://www.teeworlds.com") (synopsis "2D retro multiplayer shooter game") (description "Teeworlds is an online multiplayer game. Battle with up to -- cgit v1.2.3 From 4ef3490d443ed4a2af8a002a65a26f7259268825 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 2 Jul 2018 00:49:37 +0200 Subject: gnu: bambam: Update to 0.6. * gnu/packages/games.scm (bambam): Update to 0.6. --- 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 41c4396add..1559f31797 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3199,7 +3199,7 @@ programmers may also add their own favorite language.") (define-public bambam (package (name "bambam") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) @@ -3208,7 +3208,7 @@ programmers may also add their own favorite language.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "10w110mjdwbvddzihh9rganvvjr5jfiz8cs9n7w12zndwwcc3ria")))) + "05jwhk30pi1iwkfwy707w73c8jgbizqjpgi7y0jhsrx56pxl6mds")))) (build-system python-build-system) (arguments `(#:python ,python-2 -- cgit v1.2.3 From 63e708f4681cc8e2bdf2e5b2a3b2599bb823551b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 2 Jul 2018 00:51:54 +0200 Subject: gnu: bambam: Don't use unstable tarball. * gnu/packages/games.scm (bambam)[source]: Use GIT-FETCH. --- gnu/packages/games.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1559f31797..b3cac4191f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3202,13 +3202,14 @@ programmers may also add their own favorite language.") (version "0.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/porridge/bambam/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/porridge/bambam") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "05jwhk30pi1iwkfwy707w73c8jgbizqjpgi7y0jhsrx56pxl6mds")))) + "08hcd0gzia3pz7fzk4pqc5kbq1074j4q0jcmbpgvr7n623nj2xa5")))) (build-system python-build-system) (arguments `(#:python ,python-2 -- cgit v1.2.3 From 2926e950ce47b09699dfd17efc5b565c26c20f08 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 2 Jul 2018 11:04:28 -0400 Subject: gnu: Add freedink-dfarc. * gnu/packages/games.scm (freedink-dfarc): New variable. --- gnu/packages/games.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b3cac4191f..96b45b9e8d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1172,7 +1172,28 @@ To that extent, it also includes a front-end for managing all of your D-Mods.") "This package contains the game data of GNU Freedink.") (license license:gpl3+))) -;; TODO: Add freedink-dfarc when there's a wxWidgets package. +(define-public freedink-dfarc + (package + (name "freedink-dfarc") + (version "3.14") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/freedink/dfarc-" + version ".tar.gz")) + (sha256 + (base32 + "1yp8n3w426xnlp10xk06vfi2y3k9xrcfyck7s7qs1v0ys7n284d5")))) + (build-system gnu-build-system) + (native-inputs + `(("intltool" ,intltool))) + (inputs + `(("bzip2" ,bzip2) + ("wxwidgets" ,wxwidgets))) + (home-page "https://www.gnu.org/software/freedink/") + (synopsis "Front-end for managing and playing Dink Modules") + (description "DFArc makes it easy to play and manage the GNU FreeDink game +and its numerous D-Mods.") + (license license:gpl3+))) (define-public freedink ;; This is a wrapper that tells the engine where to find the data. -- cgit v1.2.3 From 940c2c5c14745b9559f83fca07db74aaa3f14c5e Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 3 Jul 2018 10:57:50 +0200 Subject: gnu: openrct2: Update to 0.2.0. * gnu/packages/games.scm (openrct2): Update to 0.2.0. [configure-flags]: Add -DDOWNLOAD_OBJECTS=OFF configure flag. [arguments]: Add 'fixgcc7, 'get-rid-of-errors phases. [native-inputs]: Add gcc@7. --- gnu/packages/games.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 96b45b9e8d..8e0dfcb8ff 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) #:use-module (gnu packages game-development) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gimp) @@ -2321,7 +2322,7 @@ Transport Tycoon Deluxe.") (define-public openrct2 (package (name "openrct2") - (version "0.1.1") + (version "0.2.0") (source (origin (method url-fetch) @@ -2329,11 +2330,12 @@ Transport Tycoon Deluxe.") version ".tar.gz")) (sha256 (base32 - "1bahkzlf9k92cc4zs4nk4wy59323kiw8d3wm0vjps3kp7iznqyjx")) + "1yrbjra27n2xxb1x47v962lc3qi8gwm5ws4f97952nvn533zrwxz")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DDOWNLOAD_TITLE_SEQUENCES=OFF") + `(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF" + "-DDOWNLOAD_TITLE_SEQUENCES=OFF") #:tests? #f ; Tests require network. #:phases (modify-phases %standard-phases @@ -2342,14 +2344,23 @@ Transport Tycoon Deluxe.") (let ((titles (assoc-ref inputs "openrct2-title-sequences")) (objects (assoc-ref inputs "openrct2-objects"))) ;; Fix some references to /usr/share. - ;; Change to Platform.Linux.cpp on 0.1.2+ - (substitute* "src/openrct2/platform/linux.c" + (substitute* "src/openrct2/platform/Platform.Linux.cpp" (("/usr/share") (string-append (assoc-ref %outputs "out") "/share"))) (copy-recursively (string-append titles "/share/openrct2/title-sequences") "data/title") (copy-recursively (string-append objects - "/share/openrct2/objects") "data/object"))))))) + "/share/openrct2/objects") "data/object")))) + (add-before 'configure 'fixgcc7 + (lambda _ + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") + #t)) + (add-after 'fixgcc7 'get-rid-of-errors + (lambda _ + ;; Don't treat warnings as errors. + (substitute* "CMakeLists.txt" + (("-Werror") ""))))))) (inputs `(("curl" ,curl) ("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -2365,7 +2376,8 @@ Transport Tycoon Deluxe.") ("speexdsp" ,speexdsp) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("gcc" ,gcc-7) + ("pkg-config" ,pkg-config))) (home-page "https://github.com/OpenRCT2/OpenRCT2") (synopsis "Free software re-implementation of RollerCoaster Tycoon 2") (description "OpenRCT2 is a free software re-implementation of -- cgit v1.2.3 From 4108886b09e3b0175ba063d70cdaeb2237598def Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 3 Jul 2018 09:48:59 +0200 Subject: gnu: vkquake: Add vulkan-headers. * gnu/packages/games.scm (vkquake)[inputs]: Add vulkan-headers. --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8e0dfcb8ff..4af0b52e82 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4646,7 +4646,8 @@ some graphical niceities, and numerous bug-fixes and other improvements.") #t)))) ,@(strip-keyword-arguments '(#:make-flags #:phases) (package-arguments quakespasm)))) - (inputs `(("vulkan-loader" ,vulkan-loader) + (inputs `(("vulkan-headers" ,vulkan-headers) + ("vulkan-loader" ,vulkan-loader) ,@(package-inputs quakespasm))) (description "vkquake is a modern engine for id software's Quake 1. It includes support for 64 bit CPUs, custom music playback, a new sound driver, -- cgit v1.2.3 From 9a0d324a1629145a64c6f28082843564d66c6bcc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 Jul 2018 10:49:09 +0300 Subject: gnu: angband: Update to 4.1.2. * gnu/packages/games.scm (angband): Update to 4.1.2. [source]: Parameterize source uri. [arguments]: Use custom 'autogen.sh phase to replace 'bootstrap phase. --- gnu/packages/games.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4af0b52e82..a3c770a0ba 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -955,15 +955,16 @@ that beneath its ruins lay buried an ancient evil.") (define-public angband (package (name "angband") - (version "4.0.5") + (version "4.1.2") (source (origin (method url-fetch) - (uri (string-append "http://rephial.org/downloads/4.0/" - "angband-" version ".tar.gz")) + (uri (string-append "http://rephial.org/downloads/" + (version-major+minor version) + "/angband-" version ".tar.gz")) (sha256 (base32 - "0lpq2kms7hp421vrasx2bkkn9w08kr581ldwik3v0hlq6h7rlxhd")) + "0ahfzb66ihxvkxcbhcib816x40sdsp26b3ravr1xqp44w1whkg1h")) (modules '((guix build utils))) (snippet ;; So, some of the sounds/graphics/tilesets are under different @@ -987,11 +988,11 @@ that beneath its ruins lay buried an ancient evil.") #:configure-flags (list (string-append "--bindir=" %output "/bin")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen.sh + (replace 'bootstrap (lambda _ (substitute* "acinclude.m4" (("ncursesw5-config") "ncursesw6-config")) - (zero? (system* "sh" "autogen.sh"))))))) + (invoke "sh" "autogen.sh")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake))) -- cgit v1.2.3 From 3bd0d1866159fa208e640d2ae2c0dffecfc76dd1 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 17 Jul 2018 11:07:58 -0700 Subject: gnu: Add nethack. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (nethack): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/games.scm | 119 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a3c770a0ba..dc07f8da3c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -87,6 +87,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages less) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libedit) #:use-module (gnu packages libunwind) @@ -665,6 +666,124 @@ removed lines to all opponents. There is also a Demo mode in which you can watch your CPU playing while enjoying a cup of tea!") (license license:gpl2+))) +(define-public nethack + (package + (name "nethack") + (version "3.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://www.nethack.org/download/" + version "/" name "-361-src.tgz")) + (sha256 + (base32 "1dha0ijvxhx7c9hr0452h93x81iiqsll8bc9msdnp7xdqcfbz32b")))) + (inputs + `(("ncurses" ,ncurses) + ("bison" ,bison) + ("flex" ,flex) + ("less" ,less))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-paths + (lambda _ + (substitute* "sys/unix/nethack.sh" + (("^ *cd .*$") "")) + (substitute* "sys/unix/Makefile.utl" + (("^YACC *=.*$") "YACC = bison -y\n") + (("^LEX *=.*$") "LEX = flex\n") + (("^# CC = gcc") "CC = gcc")) + (substitute* "sys/unix/hints/linux" + (("/bin/gzip") (string-append + (assoc-ref %build-inputs "gzip") + "/bin/gzip")) + (("^WINTTYLIB=.*") "WINTTYLIB=-lncurses")) + (substitute* "include/config.h" + (("^.*define CHDIR.*$") "")) + (substitute* "sys/unix/Makefile.src" + (("^# CC = gcc") "CC = gcc")) + #t)) + (replace 'configure + (lambda _ + (let ((bash (string-append + (assoc-ref %build-inputs "bash") + "/bin/bash"))) + (with-directory-excursion "sys/unix" + (substitute* "setup.sh" (("/bin/sh") bash)) + (invoke bash "setup.sh" "hints/linux")) + #t))) + (add-after 'install 'fixup-paths + (lambda _ + (let* ((output (assoc-ref %outputs "out")) + (nethack-script (string-append output "/bin/nethack"))) + (mkdir-p (string-append output "/games/lib/nethackuserdir")) + (for-each + (lambda (file) + (rename-file + (string-append output "/games/lib/nethackdir/" file) + (string-append output "/games/lib/nethackuserdir/" + file))) + '("xlogfile" "logfile" "perm" "record" "save")) + (mkdir-p (string-append output "/bin")) + (call-with-output-file nethack-script + (lambda (port) + (format port "#!~a/bin/sh +PATH=~a:$PATH +if [ ! -d ~~/.config/nethack ]; then + mkdir -p ~~/.config/nethack + cp -r ~a/games/lib/nethackuserdir/* ~~/.config/nethack + chmod -R +w ~~/.config/nethack +fi + +RUNDIR=$(mktemp -d) + +cleanup() { + rm -rf $RUNDIR +} +trap cleanup EXIT + +cd $RUNDIR +for i in ~~/.config/nethack/*; do + ln -s $i $(basename $i) +done +for i in ~a/games/lib/nethackdir/*; do + ln -s $i $(basename $i) +done +~a/games/nethack" + (assoc-ref %build-inputs "bash") + (list->search-path-as-string + (list + (string-append + (assoc-ref %build-inputs "coreutils") "/bin") + (string-append + (assoc-ref %build-inputs "less") "/bin")) + ":") + output + output + output))) + (chmod nethack-script #o555) + #t))) + (delete 'check)))) + (home-page "https://nethack.org") + (synopsis "Classic dungeon crawl game") + (description "NetHack is a single player dungeon exploration game that runs +on a wide variety of computer systems, with a variety of graphical and text +interfaces all using the same game engine. Unlike many other Dungeons & +Dragons-inspired games, the emphasis in NetHack is on discovering the detail of +the dungeon and not simply killing everything in sight - in fact, killing +everything in sight is a good way to die quickly. Each game presents a +different landscape - the random number generator provides an essentially +unlimited number of variations of the dungeon and its denizens to be discovered +by the player in one of a number of characters: you can pick your race, your +role, and your gender.") + (license + (license:fsdg-compatible + "https://nethack.org/common/license.html")))) + (define-public prboom-plus (package (name "prboom-plus") -- cgit v1.2.3 From df35e7154236e0aff1ff2720a5b12d7c4df72ad1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 18 Jul 2018 00:12:13 +0200 Subject: gnu: nethack: Make builds bit-reproducible. * gnu/packages/games.scm (nethack)[arguments]: In 'patch-paths' phase, define REPRODUCIBLE_BUILD in config.h and set SOURCE_DATE_EPOCH. --- gnu/packages/games.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dc07f8da3c..ca86703a83 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -673,9 +673,8 @@ watch your CPU playing while enjoying a cup of tea!") (source (origin (method url-fetch) - (uri (string-append - "https://www.nethack.org/download/" - version "/" name "-361-src.tgz")) + (uri (string-append "https://www.nethack.org/download/" + version "/" name "-361-src.tgz")) (sha256 (base32 "1dha0ijvxhx7c9hr0452h93x81iiqsll8bc9msdnp7xdqcfbz32b")))) (inputs @@ -703,7 +702,15 @@ watch your CPU playing while enjoying a cup of tea!") "/bin/gzip")) (("^WINTTYLIB=.*") "WINTTYLIB=-lncurses")) (substitute* "include/config.h" - (("^.*define CHDIR.*$") "")) + (("^.*define CHDIR.*$") "") + (("^/\\* *#*define *REPRODUCIBLE_BUILD *\\*/") + ;; Honor SOURCE_DATE_EPOCH. + "#define REPRODUCIBLE_BUILD")) + + ;; Note: 'makedefs' rejects and ignores dates that are too old + ;; or too new, so we must choose something reasonable here. + (setenv "SOURCE_DATE_EPOCH" "1531865062") + (substitute* "sys/unix/Makefile.src" (("^# CC = gcc") "CC = gcc")) #t)) -- cgit v1.2.3 From 8eb49ec52754ac7ab0a67588d79dfd99817cd135 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 21 Jul 2018 23:00:57 -0400 Subject: gnu: minetest: Update to 0.4.17. * gnu/packages/games.scm (minetest-data, minetest): Update to 0.4.17. --- gnu/packages/games.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ca86703a83..ab1e3fde4c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1575,7 +1575,7 @@ match, cannon keep, and grave-itation pit.") (define minetest-data (package (name "minetest-data") - (version "0.4.16") + (version "0.4.17") (source (origin (method url-fetch) (uri (string-append @@ -1584,7 +1584,7 @@ match, cannon keep, and grave-itation pit.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0nibpm600rbv9dg1zgcsl5grlbqx0b5l6cg1lp6sqkwvjialb4ga")))) + "0pa9skjwbq27aky6dgr7g3mb0a7c5rpa6xmz2qh0nm618z5hgazh")))) (build-system trivial-build-system) (native-inputs `(("source" ,source) @@ -1617,7 +1617,7 @@ match, cannon keep, and grave-itation pit.") (define-public minetest (package (name "minetest") - (version "0.4.16") + (version "0.4.17") (source (origin (method url-fetch) (uri (string-append @@ -1626,7 +1626,7 @@ match, cannon keep, and grave-itation pit.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0mbnf1ma4gsw9ah68ply04059xkfx5psdxwalxp78sgmx4ypkwqf")))) + "0wpbad5bssbbgspgdcq3hhq4bhckrj53nhymsz34d8g01j0csr46")))) (build-system cmake-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 1bb962b4d75fcf9d7aae204d0b2ecd7884c3a3e6 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 22 Jul 2018 20:47:10 -0400 Subject: gnu: hyperrogue: Update to 10.4j. * gnu/packages/games.scm (hyperrogue): Update to 10.4j. [arguments]: Modify 'configure' phase and substitute invoke for system*. --- gnu/packages/games.scm | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ab1e3fde4c..4dbdfae819 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3472,7 +3472,7 @@ throwing people around in pseudo-randomly generated buildings.") (define-public hyperrogue (package (name "hyperrogue") - (version "10.0g") + (version "10.4j") ;; When updating this package, be sure to update the "hyperrogue-data" ;; origin in native-inputs. (source (origin @@ -3483,7 +3483,7 @@ throwing people around in pseudo-randomly generated buildings.") "-src.tgz")) (sha256 (base32 - "0f68pcnsgl406dhm91ckn3f364bar9m9i5njp9vrmvhvv9p2icy0")))) + "0909p4xvbi1c2jc5rdgrf8b1c60fmsaapabsi6yyglh5znkf0k27")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -3495,7 +3495,6 @@ throwing people around in pseudo-randomly generated buildings.") (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") "/include/SDL")))) - ;; Fix font and music paths. (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -3505,17 +3504,18 @@ throwing people around in pseudo-randomly generated buildings.") "/share/fonts/truetype")) (dejavu-font "DejaVuSans-Bold.ttf") (music-file "hyperrogue-music.txt")) + ;; Fix font and music paths. (substitute* "basegraph.cpp" ((dejavu-font) (string-append dejavu-dir "/" dejavu-font))) - (substitute* "sound.cpp" - (((string-append "\\./" music-file)) - (string-append share-dir "/" music-file)) - (("sounds/") - (string-append share-dir "/sounds/"))) (substitute* music-file (("\\*/") (string-append share-dir "/sounds/")))) + ;; Fix Makefile. + (substitute* "Makefile" + (("g\\+\\+ langen.cpp") + "g++ langen.cpp ${CXXFLAGS}") + (("savepng.c") "savepng.cpp")) #t)) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) @@ -3532,21 +3532,18 @@ throwing people around in pseudo-randomly generated buildings.") (out (assoc-ref outputs "out")) (sounds (string-append out "/share/hyperrogue/sounds")) (unzip (string-append (assoc-ref inputs "unzip") "/bin/unzip"))) - (and - ;; Extract media license information into sounds directory. - (zero? - (system* unzip "-j" data - (string-append - "hyperrogue" - (string-join (string-split ,version #\.) "") - "/sounds/credits.txt") "-d" sounds)) - ;; Extract sounds and music into sounds directory. - (zero? - (system* "unzip" "-j" data - (string-append - "hyperrogue" - (string-join (string-split ,version #\.) "") - "/*.ogg") "-d" sounds))))))))) + ;; Extract media license information into sounds directory. + (invoke unzip "-j" data + (string-append + "hyperrogue" + (string-join (string-split ,version #\.) "") + "/sounds/credits.txt") "-d" sounds) + ;; Extract sounds and music into sounds directory. + (invoke "unzip" "-j" data + (string-append + "hyperrogue" + (string-join (string-split ,version #\.) "") + "/*.ogg") "-d" sounds))))))) (native-inputs `(("hyperrogue-data" ,(origin @@ -3558,7 +3555,7 @@ throwing people around in pseudo-randomly generated buildings.") "-win.zip")) (sha256 (base32 - "0bnp077qvlmxjlz1jjd6kpghlv9flxc19ac1xq3m3wyq1w9p3pab")))) + "0w61iv2rn93hi0q3hxyyyf9xcr8vi9zd7fjvpz5adpgf94jm3zsc")))) ("unzip" ,unzip))) (inputs `(("font-dejavu" ,font-dejavu) -- cgit v1.2.3 From 8fca43e2df08fc465a44e200bd5df4b14c0aa213 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 23 Jul 2018 13:51:48 -0400 Subject: gnu: wesnoth: Update to 1.14.4 [fixes CVE-2018-1999023]. * gnu/packages/games.scm (wesnoth): Update to 1.14.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 4dbdfae819..1082dadae6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1957,7 +1957,7 @@ falling, themeable graphics and sounds, and replays.") (define-public wesnoth (package (name "wesnoth") - (version "1.14.3") + (version "1.14.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" @@ -1966,7 +1966,7 @@ falling, themeable graphics and sounds, and replays.") name "-" version ".tar.bz2")) (sha256 (base32 - "06648041nr77sgzr7jpmcn37cma3hp41qynp50xzddx28l17zwg9")))) + "1hw1ap8xxpdwyx1sf8fm1g75p6724y3hwb4kpvyqbsq7bwfwsb9i")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no check target -- cgit v1.2.3