From bf17046d8bfe6b87163470c6df0e89053d7aa5bd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 15 Feb 2025 15:13:43 +0000 Subject: [PATCH] gnu: harmonist: Update to 0.5.1. SDL variant was proposed in #57390 on <2022-08-24>. * gnu/packages/games.scm (harmonist): Update to 0.5.1. [source]: Project has been migrated to Codeberg, reflect it in URL. [arguments] : Skip source installation as it's a final program. : Adjust it according to go.mod file. [inputs]: Remove go-github-com-gdamore-tcell-v2, go-github-com-nsf-termbox-go, go-github-com-anaseto-gruid, and go-github-com-anaseto-gruid-tcell. [native-inputs]: Add go-codeberg-org-anaseto-gruid, go-codeberg-org-anaseto-gruid-js, go-codeberg-org-anaseto-gruid-sdl, go-codeberg-org-anaseto-gruid-tcell, and go-github-com-gdamore-tcell-v2. [description]: Adjust fill-column indentation. (harmonist-sdl): New variable. Co-authored-by: Cairn Change-Id: Id0409c9b75a828dc1daebb41c80fc64e012b74e3 --- gnu/packages/games.scm | 61 +++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 17766deb7cf..0bb7ddb8a01 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -75,6 +75,7 @@ ;;; Copyright © 2022-2024 Maxim Cournoyer ;;; Copyright © 2022 Hendursaga ;;; Copyright © 2022 Parnikkapore +;;; Copyright © 2022 Cairn ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Florian Pelz ;;; Copyright © 2023 Ivana Drazovic @@ -85,6 +86,7 @@ ;;; Copyright © 2024 James Smith ;;; Copyright © 2024 Jan Wielkiewicz ;;; Copyright © 2024 Ashvith Shetty +;;; Copyright © 2025 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -10671,34 +10673,49 @@ terminal full-window applications.") (define-public harmonist (package (name "harmonist") - (version "0.4.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.tuxfamily.org/harmonist/harmonist.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "17ai39pw9xq4asfvhs0whx07hljlivygazbwrxjrnxwrn06483hr")))) + (version "0.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/anaseto/harmonist") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gn9zmnjw1f4xbdk281cmxh7swxc16i663q8pzn5s135gdg6qgdm")))) (build-system go-build-system) (arguments - '(#:import-path "git.tuxfamily.org/harmonist/harmonist")) - (inputs - `(("go-github-com-gdamore-tcell-v2" ,go-github-com-gdamore-tcell-v2) - ("go-github-com-nsf-termbox-go" ,go-github-com-nsf-termbox-go) - ("go-github-com-anaseto-gruid" ,go-github-com-anaseto-gruid) - ("go-github-com-anaseto-gruid-tcell" ,go-github-com-anaseto-gruid-tcell))) + (list + #:install-source? #f + #:import-path "codeberg.org/anaseto/harmonist")) + (native-inputs + (list go-codeberg-org-anaseto-gruid + go-codeberg-org-anaseto-gruid-js + go-codeberg-org-anaseto-gruid-sdl + go-codeberg-org-anaseto-gruid-tcell + go-github-com-gdamore-tcell-v2)) (home-page "https://harmonist.tuxfamily.org/") (synopsis "Stealth coffee-break roguelike game") - (description "Harmonist: Dayoriah Clan Infiltration is a stealth -coffee-break roguelike game. The game has a heavy focus on tactical -positioning, light and noise mechanisms, making use of various terrain types -and cones of view for monsters. Aiming for a replayable streamlined experience, -the game avoids complex inventory management and character building, relying -on items and player adaptability for character progression.") + (description + "Harmonist: Dayoriah Clan Infiltration is a stealth coffee-break +roguelike game. The game has a heavy focus on tactical positioning, light and +noise mechanisms, making use of various terrain types and cones of view for +monsters. Aiming for a replayable streamlined experience, the game avoids +complex inventory management and character building, relying on items and +player adaptability for character progression.") (license license:isc))) +(define-public harmonist-sdl + (package/inherit harmonist + (name "harmonist-sdl") + (arguments + (substitute-keyword-arguments (package-arguments harmonist) + ((#:tests? _ #t) #f) + ((#:build-flags _ #'()) #~(list "--tags=sdl")))) + (native-inputs + (modify-inputs (package-native-inputs harmonist) + (prepend pkg-config))))) + (define-public gnurobots (package (name "gnurobots")