From 924e6993aa5df0ca9002ccdf2e4f5589e3d721bc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 21:16:58 +0100 Subject: gnu: openrct2-objects: Update to 1.0.9. * gnu/packages/games.scm (openrct2-objects): Update to 1.0.9. --- gnu/packages/games.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 46b58e352c..1b6c8940e5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2556,7 +2556,7 @@ Transport Tycoon Deluxe.") (define openrct2-objects (package (name "openrct2-objects") - (version "1.0.6") + (version "1.0.9") (source (origin (method url-fetch) @@ -2564,8 +2564,7 @@ Transport Tycoon Deluxe.") version "/objects.zip")) (file-name (string-append name "-" version ".zip")) (sha256 - (base32 - "00kfy95zx6g4ldr6br5p7bwkwfx6pw9v78fd3rvghjnwyvf5fhki")))) + (base32 "02apb8h553m7d6jvysgb1zahvxc1yzyygfca2iclb21b3fhpsas4")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) -- cgit v1.2.3 From 6457509c73800797c8aeca290950e9cdedc3036d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Mar 2019 21:32:24 +0100 Subject: gnu: openrct2: Update to 0.2.2. * gnu/packages/games.scm (openrct2): Update to 0.2.2. [arguments]: Re-indent. --- gnu/packages/games.scm | 55 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1b6c8940e5..d28dbaac9e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2596,45 +2596,46 @@ Transport Tycoon Deluxe.") (define-public openrct2 (package (name "openrct2") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/OpenRCT2/OpenRCT2/archive/v" version ".tar.gz")) (sha256 - (base32 - "1fxzk037xphpyk7vv5jfrcz739zrj86p43pnf5gjjv9rjxwv7m8f")) + (base32 "0yxaphgfq85piaacnnfy6lrvmnqmfj1891rxlkl5ndngq0zh0ysb")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF" "-DDOWNLOAD_TITLE_SEQUENCES=OFF") - #:tests? #f ; Tests require network. + #:tests? #f ; tests require network access #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-usr-share-paths&add-data - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((titles (assoc-ref inputs "openrct2-title-sequences")) - (objects (assoc-ref inputs "openrct2-objects"))) - ;; Fix some references to /usr/share. - (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")))) - (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") ""))))))) + (modify-phases %standard-phases + (add-after 'unpack 'fix-usr-share-paths&add-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((titles (assoc-ref inputs "openrct2-title-sequences")) + (objects (assoc-ref inputs "openrct2-objects"))) + ;; Fix some references to /usr/share. + (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")))) + (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) -- cgit v1.2.3 From 8044e58473a401e5ab978f067ebe3f252b9655b2 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 16 Mar 2019 20:19:13 +0100 Subject: gnu: Add arx-libertatis. * gnu/packages/games.scm (arx-libertatis): New variable. --- gnu/packages/games.scm | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d28dbaac9e..2d335a64f9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -143,6 +143,7 @@ #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages web) + #:use-module (gnu packages wget) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) @@ -6276,3 +6277,83 @@ game field is extended to 4D space, which has to filled up by the gamer with 4D hyper cubes.") (license license:gpl3))) +(define-public arx-libertatis + (package + (name "arx-libertatis") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "http://arx-libertatis.org/files/arx-libertatis-" + version ".tar.xz")) + (sha256 + (base32 + "0hjfxlsmp8wwqr06snv2dlly2s79ra0d9aw49gkp6rn8m50b9bc2")))) + (build-system cmake-build-system) + (outputs '("out" "installer")) + (arguments + '(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-install-helper-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((p7zip (assoc-ref inputs "p7zip")) + (innoextract (assoc-ref inputs "innoextract")) + (wget (assoc-ref inputs "wget")) + (zenity (assoc-ref inputs "zenity"))) + (substitute* "scripts/arx-install-data" + (("have innoextract") + (string-append "have " innoextract "/bin/innoextract")) + (("then innoextract") + (string-append "then " innoextract "/bin/innoextract")) + (("else innoextract") + (string-append "else " innoextract "/bin/innoextract")) + (("for _extract_zip_sz in 7za 7z") + (string-append "for _extract_zip_sz in " p7zip "/bin/7za")) + (("else if have 7z") + (string-append "else if have " p7zip "/bin/7za")) + (("7z x -tiso") + (string-append p7zip "/bin/7z x -tiso")) + (("if have wget") + (string-append "if have " wget "/bin/wget")) + (("wget -O") + (string-append wget "/bin/wget -O")) + (("for backend in \\$preferred zenity") + (string-append "for backend in $preferred " zenity "/bin/zenity")) + (("zenity +--title") + (string-append zenity "/bin/zenity --title")) + (("^zenity\\)") + (string-append zenity "/bin/zenity)")))) + #t)) + (add-after 'install 'move-installer + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (installer (assoc-ref outputs "installer"))) + (mkdir-p (string-append installer "/bin")) + (rename-file (string-append out "/bin/arx-install-data") + (string-append installer "/bin/arx-install-data")))))))) + (inputs + `(("sdl" ,sdl) ; Switch to sdl2 in >1.1.2. + ("mesa" ,mesa) ; Switch to libepoxy in >1.1.2. + ("glew" ,glew) + ("openal" ,openal) + ("zlib" ,zlib) + ("boost" ,boost) + ("glm" ,glm) + ("freetype" ,freetype) + ;; The following are only needed by the arx-install-data script. + ("p7zip" ,p7zip) ; Install-helper uses it to extract ISO and .cab archives. + ("zenity" ,zenity) ; GUI for install-helper. + ("wget" ,wget) ; Used by the install-helper to download the patch. + ;; The install-helper needs it to extract the patch. + ("innoextract" ,innoextract))) + (home-page "https://arx-libertatis.org/") + (synopsis "Port of Arx Fatalis, a first-person role-playing game") + (description "Arx Libertatis is a cross-platform, open source port of Arx +Fatalis, a 2002 first-person role-playing game / dungeon crawler developed by +Arkane Studios. This port however does not include the game data, so you need +to obtain a copy of the original Arx Fatalis or its demo to play Arx +Libertatis. Arx Fatalis features crafting, melee and ranged combat, as well +as a unique casting system where the player draws runes in real time to effect +the desired spell.") + (license license:gpl3+))) -- cgit v1.2.3 From a953423a8c3e10f94885a63c57489703edca49ee Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 16 Mar 2019 20:27:15 +0100 Subject: gnu: Add missing copyright. * gnu/packages/games.scm: Do it. --- gnu/packages/games.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2d335a64f9..360cbe8c1d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2018 Madalin Ionel-Patrascu ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2019 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 19c0cdb9e6271956015232421ef7f63a1ad001ae Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 17 Mar 2019 21:52:51 +0300 Subject: gnu: tome4: Fix build. * gnu/packages/games.scm (tome4)[source]: Patch 'src/tgl.h' in snippet. --- gnu/packages/games.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 360cbe8c1d..74fc452e32 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2019 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -4828,6 +4829,8 @@ Crowther & Woods, its original authors, in 1995. It has been known as (("#elif defined(__FreeBSD__)" line) (string-append line " || defined(__GNUC__)"))) + (substitute* '("src/tgl.h") + (("#include ") "")) #t)))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From 47956fa0c24efcdcba3493f0231c30e9a39ec7df Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 14 Mar 2019 09:33:38 +0000 Subject: Correct name and email address for ng0. * .mailmap, Makefile.am, doc/guix.de.texi, doc/guix.fr.texi, doc/guix.texi, etc/completion/fish/guix.fish, gnu/packages/accessibility.scm, gnu/packages/admin.scm, gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/cinnamon.scm, gnu/packages/compression.scm, gnu/packages/crypto.scm, gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm, gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm, gnu/packages/enlightenment.scm, gnu/packages/erlang.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm, gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/gtk.scm, gnu/packages/guile-wm.scm,gnu/packages/guile-xyz.scm, gnu/packages/haskell-check.scm, gnu/packages/haskell-crypto.scm, gnu/packages/haskell.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm, gnu/packages/libcanberra.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm, gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm, gnu/packages/ncurses.scm, gnu/packages/networking.scm, gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm, gnu/packages/perl-check.scm, gnu/packages/perl.scm, gnu/packages/python-compression.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python-xyz.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm, gnu/packages/telephony.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm, gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm, gnu/services/desktop.scm, gnu/services/version-control.scm, gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Correct name and email address for ng0. Signed-off-by: Tobias Geerinckx-Rice --- 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 74fc452e32..b9deda7bf9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2015, 2016, 2017 Alex Kost ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016, 2017 Rodger Fox -;;; Copyright © 2016, 2017, 2018 Nils Gillmann +;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2016 Albin Söderqvist ;;; Copyright © 2016, 2017, 2018 Kei Kebreau ;;; Copyright © 2016 Alex Griffin -- cgit v1.2.3 From 4cb0b5bfd784a314a97172e93c19b8c4493caf98 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Mar 2019 14:08:02 -0400 Subject: gnu: OpenTTD: Mention 'game' in synopsis. Suggested by swedebugia . * gnu/packages/games.scm (openttd-engine)[synopsis]: Mention 'game'. --- 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 b9deda7bf9..ed8aef8bf9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2338,7 +2338,7 @@ world}, @uref{http://evolonline.org, Evol Online} and ("sdl" ,sdl) ("xz" ,xz) ("zlib" ,zlib))) - (synopsis "Transportation economics simulator") + (synopsis "Transportation economics simulator game") (description "OpenTTD is a game in which you transport goods and passengers by land, water and air. It is a re-implementation of Transport Tycoon Deluxe with many enhancements including multiplayer mode, -- cgit v1.2.3 From 47903653081f35b58722b624040a8de118d7f3c8 Mon Sep 17 00:00:00 2001 From: nee Date: Fri, 15 Mar 2019 23:04:15 +0100 Subject: gnu: Add edgar. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (edgar): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/games.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ed8aef8bf9..56dc96de8f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2017, 2018 Arun Isaac ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2017 nee +;;; Copyright © 2017, 2019 nee ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2018 Rutger Helling @@ -6361,3 +6361,50 @@ Libertatis. Arx Fatalis features crafting, melee and ranged combat, as well as a unique casting system where the player draws runes in real time to effect the desired spell.") (license license:gpl3+))) + +(define-public edgar + (package + (name "edgar") + (version "1.30") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/riksweeney/edgar/releases/download/" + version "/edgar-" version "-1.tar.gz")) + (sha256 + (base32 + "0bhbs33dg0nb8wqlh6px1jj41j05f89ngdqwdkffabmjk7wq5isx")))) + (build-system gnu-build-system) + (arguments '(#:tests? #f ; there are no tests + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "BIN_DIR=" (assoc-ref %outputs "out") "/bin/")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'fix-env + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" (string-append (assoc-ref inputs "sdl") + "/include/SDL/")) + #t))))) + (inputs `(("sdl" ,sdl) + ("sdl-img" ,sdl-image) + ("sdl-mixer" ,sdl-mixer) + ("sdl-ttf" ,sdl-ttf) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("gnu-gettext" ,gnu-gettext) + ("libtool" ,libtool) + ("which" ,which))) + (synopsis "2d action platformer game") + (description "The Legend of Edgar is a 2D platform game with a persistent world. +When Edgar's father fails to return home after venturing out one dark and stormy night, +Edgar fears the worst: he has been captured by the evil sorcerer who lives in +a fortress beyond the forbidden swamp.") + (home-page "https://www.parallelrealities.co.uk/games/edgar/") + (license license:gpl2+))) -- cgit v1.2.3 From 1c4d4196c2b21d4880c4bd97ea3ec28d2b05e2b3 Mon Sep 17 00:00:00 2001 From: nee Date: Fri, 15 Mar 2019 22:13:12 +0100 Subject: gnu: cataclysm-dda: Update to 0.D. * gnu/packages/games.scm (cataclysm-dda): Update to 0.D. --- gnu/packages/games.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 56dc96de8f..e750d0657e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -259,13 +259,10 @@ canyons and wait for the long I-shaped block to clear four rows at a time.") (license license:gpl3+))) (define-public cataclysm-dda - (let ((commit "0b2c194e5c6a06f4fbf14a0ec1260e0f3cf2567c") - (revision "2")) + (let ((commit "9c732a5de48928691ab863d3ab275ca7b0e522fc")) (package (name "cataclysm-dda") - ;; This denotes the version released after the 0.C release. - ;; Revert to a normal version number if updating to stable version 0.D. - (version (git-version "0.C" revision commit)) + (version "0.D") (source (origin (method git-fetch) (uri (git-reference @@ -273,7 +270,7 @@ canyons and wait for the long I-shaped block to clear four rows at a time.") (commit commit))) (sha256 (base32 - "1yzsn0y2g27bvbxjvivjyjhkmf2w5na1qqw5qfkswcfqqwym2y33")) + "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3