Package: guix-patches;
Reported by: gemmaro <gemmaro.dev <at> gmail.com>
Date: Tue, 2 Jan 2024 01:06:01 UTC
Severity: normal
Tags: patch
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68199 in the body.
You can then email your comments to 68199 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:bug#68199; Package guix-patches.
(Tue, 02 Jan 2024 01:06:01 GMT) Full text and rfc822 format available.gemmaro <gemmaro.dev <at> gmail.com>:liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org.
(Tue, 02 Jan 2024 01:06:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: gemmaro <gemmaro.dev <at> gmail.com> To: guix-patches <at> gnu.org Cc: gemmaro <gemmaro.dev <at> gmail.com> Subject: [PATCH 0/3] gnu: taisei: Update to 1.4. Date: Tue, 2 Jan 2024 10:04:27 +0900
Hello, This updates Taisei to version 1.4. The package definition is reformatted and uses gexps in advance. Regards, gemmaro (3): gnu: taisei: Reformat with guix style. gnu: taisei: Use gexps. gnu: taisei: Update to 1.4. gnu/packages/games.scm | 61 +++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 30 deletions(-) base-commit: 86b5fa100992527c434616482ba9cfd92b636d12 -- 2.41.0
liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:bug#68199; Package guix-patches.
(Tue, 02 Jan 2024 01:09:01 GMT) Full text and rfc822 format available.Message #8 received at 68199 <at> debbugs.gnu.org (full text, mbox):
From: gemmaro <gemmaro.dev <at> gmail.com> To: 68199 <at> debbugs.gnu.org Cc: gemmaro <gemmaro.dev <at> gmail.com> Subject: [PATCH 1/3] gnu: taisei: Reformat with guix style. Date: Tue, 2 Jan 2024 10:07:49 +0900
* gnu/packages/games.scm (taisei): Reformat with guix style.
Change-Id: If542566f43e581968f73537e90101a18d3b1bca1
---
gnu/packages/games.scm | 56 ++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c7813790a1..c26b9ef2c9 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -78,7 +78,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
;;; Copyright © 2023 Florian Pelz <pelzflorian <at> pelzflorian.de>
;;; Copyright © 2023 Ivana Drazovic <iv.dra <at> hotmail.com>
-;;; Copyright © 2023 gemmaro <gemmaro.dev <at> gmail.com>
+;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev <at> gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3390,46 +3390,44 @@ (define-public taisei
(origin
(method url-fetch)
(uri (string-append "https://github.com/taisei-project/"
- "taisei/releases/download/v" version
- "/taisei-v" version ".tar.xz"))
+ "taisei/releases/download/v"
+ version
+ "/taisei-v"
+ version
+ ".tar.xz"))
(sha256
(base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
(build-system meson-build-system)
(arguments
- `(#:build-type "release" ;comment out for bug-reporting (and cheats)
- #:configure-flags
- (list "-Dr_default=gles30"
- "-Dr_gles20=true"
- "-Dr_gles30=true"
- "-Dshader_transpiler=true")))
- (native-inputs
- (list pkg-config python python-docutils python-pygments))
- (inputs
- (list cglm
- freetype
- libpng
- libwebp
- libzip
- mesa
- openssl
- opusfile
- sdl2
- sdl2-mixer
- shaderc
- spirv-cross
- zlib))
+ `(#:build-type "release" ;comment out for bug-reporting (and cheats)
+ #:configure-flags (list "-Dr_default=gles30" "-Dr_gles20=true"
+ "-Dr_gles30=true" "-Dshader_transpiler=true")))
+ (native-inputs (list pkg-config python python-docutils python-pygments))
+ (inputs (list cglm
+ freetype
+ libpng
+ libwebp
+ libzip
+ mesa
+ openssl
+ opusfile
+ sdl2
+ sdl2-mixer
+ shaderc
+ spirv-cross
+ zlib))
(home-page "https://taisei-project.org/")
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
(description
"The player controls a character (one of three: Good, Bad, and Dead),
dodges the missiles (lots of it cover the screen, but the character's hitbox
is very small), and shoot at the adversaries that keep appear on the screen.")
- (license (list ;;game
+ (license (list ;game
license:expat
- ;;resources/00-taisei.pkgdir/bgm/
- ;;atlas/portraits/
+ ;; resources/00-taisei.pkgdir/bgm/
+ ;; atlas/portraits/
license:cc-by4.0
- ;;miscellaneous
+ ;; miscellaneous
license:cc0
license:public-domain))))
--
2.41.0
liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:bug#68199; Package guix-patches.
(Tue, 02 Jan 2024 01:09:02 GMT) Full text and rfc822 format available.Message #11 received at 68199 <at> debbugs.gnu.org (full text, mbox):
From: gemmaro <gemmaro.dev <at> gmail.com> To: 68199 <at> debbugs.gnu.org Cc: gemmaro <gemmaro.dev <at> gmail.com> Subject: [PATCH 2/3] gnu: taisei: Use gexps. Date: Tue, 2 Jan 2024 10:07:50 +0900
* gnu/packages/games.scm (taisei)[arguments]: Use gexps.
Change-Id: I0732c0ecca482e5ab2c553b3c2d75e8003a9d781
---
gnu/packages/games.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c26b9ef2c9..1bfa8e19b8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3399,9 +3399,10 @@ (define-public taisei
(base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
(build-system meson-build-system)
(arguments
- `(#:build-type "release" ;comment out for bug-reporting (and cheats)
- #:configure-flags (list "-Dr_default=gles30" "-Dr_gles20=true"
- "-Dr_gles30=true" "-Dshader_transpiler=true")))
+ (list
+ #:build-type "release" ;comment out for bug-reporting (and cheats)
+ #:configure-flags #~(list "-Dr_default=gles30" "-Dr_gles20=true"
+ "-Dr_gles30=true" "-Dshader_transpiler=true")))
(native-inputs (list pkg-config python python-docutils python-pygments))
(inputs (list cglm
freetype
--
2.41.0
liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:bug#68199; Package guix-patches.
(Tue, 02 Jan 2024 01:09:02 GMT) Full text and rfc822 format available.Message #14 received at 68199 <at> debbugs.gnu.org (full text, mbox):
From: gemmaro <gemmaro.dev <at> gmail.com> To: 68199 <at> debbugs.gnu.org Cc: gemmaro <gemmaro.dev <at> gmail.com> Subject: [PATCH 3/3] gnu: taisei: Update to 1.4. Date: Tue, 2 Jan 2024 10:07:51 +0900
* gnu/packages/games.scm (taisei): Update to 1.4.
Change-Id: Ic83c4b9f77affe7782b62812be86f3c376c7ef28
---
gnu/packages/games.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 1bfa8e19b8..87e4b1c6ad 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -193,6 +193,7 @@ (define-module (gnu packages games)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-compression)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
@@ -3385,12 +3386,12 @@ (define-public talkfilters
(define-public taisei
(package
(name "taisei")
- (version "1.3.2")
+ (version "1.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/taisei-project/"
- "taisei/releases/download/v"
+ "taisei/releases/download/"
version
"/taisei-v"
version
@@ -3416,7 +3417,8 @@ (define-public taisei
sdl2-mixer
shaderc
spirv-cross
- zlib))
+ zlib
+ (list zstd "lib")))
(home-page "https://taisei-project.org/")
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
(description
--
2.41.0
guix-patches <at> gnu.org:bug#68199; Package guix-patches.
(Tue, 02 Jan 2024 21:03:02 GMT) Full text and rfc822 format available.Message #17 received at 68199 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: gemmaro <gemmaro.dev <at> gmail.com>, 68199 <at> debbugs.gnu.org Cc: 宋文武 <iyzsong <at> envs.net> Subject: Re: [bug#68199] [PATCH 1/3] gnu: taisei: Reformat with guix style. Date: Tue, 02 Jan 2024 22:02:22 +0100
Am Dienstag, dem 02.01.2024 um 10:07 +0900 schrieb gemmaro: > * gnu/packages/games.scm (taisei): Reformat with guix style. > > Change-Id: If542566f43e581968f73537e90101a18d3b1bca1 > --- > gnu/packages/games.scm | 56 ++++++++++++++++++++-------------------- > -- > 1 file changed, 27 insertions(+), 29 deletions(-) > > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm > index c7813790a1..c26b9ef2c9 100644 > --- a/gnu/packages/games.scm > +++ b/gnu/packages/games.scm > @@ -78,7 +78,7 @@ > ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com> > ;;; Copyright © 2023 Florian Pelz <pelzflorian <at> pelzflorian.de> > ;;; Copyright © 2023 Ivana Drazovic <iv.dra <at> hotmail.com> > -;;; Copyright © 2023 gemmaro <gemmaro.dev <at> gmail.com> > +;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev <at> gmail.com> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -3390,46 +3390,44 @@ (define-public taisei > (origin > (method url-fetch) > (uri (string-append "https://github.com/taisei-project/" > - "taisei/releases/download/v" version > - "/taisei-v" version ".tar.xz")) > + "taisei/releases/download/v" > + version > + "/taisei-v" > + version > + ".tar.xz")) > (sha256 > (base32 > "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v")))) > (build-system meson-build-system) > (arguments > - `(#:build-type "release" ;comment out for bug-reporting > (and cheats) > - #:configure-flags > - (list "-Dr_default=gles30" > - "-Dr_gles20=true" > - "-Dr_gles30=true" > - "-Dshader_transpiler=true"))) > - (native-inputs > - (list pkg-config python python-docutils python-pygments)) > - (inputs > - (list cglm > - freetype > - libpng > - libwebp > - libzip > - mesa > - openssl > - opusfile > - sdl2 > - sdl2-mixer > - shaderc > - spirv-cross > - zlib)) > + `(#:build-type "release" ;comment out for bug-reporting (and > cheats) > + #:configure-flags (list "-Dr_default=gles30" "- > Dr_gles20=true" > + "-Dr_gles30=true" "- > Dshader_transpiler=true"))) > + (native-inputs (list pkg-config python python-docutils python- > pygments)) > + (inputs (list cglm > + freetype > + libpng > + libwebp > + libzip > + mesa > + openssl > + opusfile > + sdl2 > + sdl2-mixer > + shaderc > + spirv-cross > + zlib)) > (home-page "https://taisei-project.org/") > (synopsis "Shoot'em up fangame and libre clone of Touhou > Project") > (description > "The player controls a character (one of three: Good, Bad, and > Dead), > dodges the missiles (lots of it cover the screen, but the > character's hitbox > is very small), and shoot at the adversaries that keep appear on the > screen.") > - (license (list ;;game > + (license (list ;game This comment looks out of place. > license:expat > - ;;resources/00-taisei.pkgdir/bgm/ > - ;;atlas/portraits/ > + ;; resources/00-taisei.pkgdir/bgm/ > + ;; atlas/portraits/ > license:cc-by4.0 > - ;;miscellaneous > + ;; miscellaneous > license:cc0 > license:public-domain)))) > Other than that LGTM.
guix-patches <at> gnu.org:bug#68199; Package guix-patches.
(Tue, 02 Jan 2024 21:04:01 GMT) Full text and rfc822 format available.Message #20 received at 68199 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: gemmaro <gemmaro.dev <at> gmail.com>, 68199 <at> debbugs.gnu.org Cc: 宋文武 <iyzsong <at> envs.net> Subject: Re: [bug#68199] [PATCH 2/3] gnu: taisei: Use gexps. Date: Tue, 02 Jan 2024 22:02:59 +0100
Am Dienstag, dem 02.01.2024 um 10:07 +0900 schrieb gemmaro: > * gnu/packages/games.scm (taisei)[arguments]: Use gexps. > > Change-Id: I0732c0ecca482e5ab2c553b3c2d75e8003a9d781 > --- > gnu/packages/games.scm | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm > index c26b9ef2c9..1bfa8e19b8 100644 > --- a/gnu/packages/games.scm > +++ b/gnu/packages/games.scm > @@ -3399,9 +3399,10 @@ (define-public taisei > (base32 > "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v")))) > (build-system meson-build-system) > (arguments > - `(#:build-type "release" ;comment out for bug-reporting (and > cheats) > - #:configure-flags (list "-Dr_default=gles30" "- > Dr_gles20=true" > - "-Dr_gles30=true" "- > Dshader_transpiler=true"))) > + (list > + #:build-type "release" ;comment out for bug-reporting (and > cheats) > + #:configure-flags #~(list "-Dr_default=gles30" "- > Dr_gles20=true" > + "-Dr_gles30=true" "- > Dshader_transpiler=true"))) > (native-inputs (list pkg-config python python-docutils python- > pygments)) > (inputs (list cglm > freetype You can (and I argue should) squash this onto the previous restyling commit. Cheers
liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:bug#68199; Package guix-patches.
(Wed, 03 Jan 2024 00:03:01 GMT) Full text and rfc822 format available.Message #23 received at 68199 <at> debbugs.gnu.org (full text, mbox):
From: gemmaro <gemmaro.dev <at> gmail.com> To: 68199 <at> debbugs.gnu.org Cc: gemmaro <gemmaro.dev <at> gmail.com> Subject: [PATCH v2 1/2] gnu: taisei: Use gexps. Date: Wed, 3 Jan 2024 08:59:58 +0900
* gnu/packages/games.scm (taisei): Reformat with guix style.
[arguments]: Use gexps.
Change-Id: If542566f43e581968f73537e90101a18d3b1bca1
---
gnu/packages/games.scm | 66 +++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c7813790a1..4bbe97c3f9 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -78,7 +78,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
;;; Copyright © 2023 Florian Pelz <pelzflorian <at> pelzflorian.de>
;;; Copyright © 2023 Ivana Drazovic <iv.dra <at> hotmail.com>
-;;; Copyright © 2023 gemmaro <gemmaro.dev <at> gmail.com>
+;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev <at> gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3390,48 +3390,48 @@ (define-public taisei
(origin
(method url-fetch)
(uri (string-append "https://github.com/taisei-project/"
- "taisei/releases/download/v" version
- "/taisei-v" version ".tar.xz"))
+ "taisei/releases/download/v"
+ version
+ "/taisei-v"
+ version
+ ".tar.xz"))
(sha256
(base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
(build-system meson-build-system)
(arguments
- `(#:build-type "release" ;comment out for bug-reporting (and cheats)
- #:configure-flags
- (list "-Dr_default=gles30"
- "-Dr_gles20=true"
- "-Dr_gles30=true"
- "-Dshader_transpiler=true")))
- (native-inputs
- (list pkg-config python python-docutils python-pygments))
- (inputs
- (list cglm
- freetype
- libpng
- libwebp
- libzip
- mesa
- openssl
- opusfile
- sdl2
- sdl2-mixer
- shaderc
- spirv-cross
- zlib))
+ (list
+ #:build-type "release" ;comment out for bug-reporting (and cheats)
+ #:configure-flags #~(list "-Dr_default=gles30" "-Dr_gles20=true"
+ "-Dr_gles30=true" "-Dshader_transpiler=true")))
+ (native-inputs (list pkg-config python python-docutils python-pygments))
+ (inputs (list cglm
+ freetype
+ libpng
+ libwebp
+ libzip
+ mesa
+ openssl
+ opusfile
+ sdl2
+ sdl2-mixer
+ shaderc
+ spirv-cross
+ zlib))
(home-page "https://taisei-project.org/")
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
(description
"The player controls a character (one of three: Good, Bad, and Dead),
dodges the missiles (lots of it cover the screen, but the character's hitbox
is very small), and shoot at the adversaries that keep appear on the screen.")
- (license (list ;;game
- license:expat
- ;;resources/00-taisei.pkgdir/bgm/
- ;;atlas/portraits/
- license:cc-by4.0
- ;;miscellaneous
- license:cc0
- license:public-domain))))
+ (license (list
+ ;; game
+ license:expat
+ ;; resources/00-taisei.pkgdir/bgm/
+ ;; atlas/portraits/
+ license:cc-by4.0
+ ;; miscellaneous
+ license:cc0
+ license:public-domain))))
(define-public cmatrix
(package
base-commit: 86b5fa100992527c434616482ba9cfd92b636d12
--
2.41.0
liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:bug#68199; Package guix-patches.
(Wed, 03 Jan 2024 00:03:02 GMT) Full text and rfc822 format available.Message #26 received at 68199 <at> debbugs.gnu.org (full text, mbox):
From: gemmaro <gemmaro.dev <at> gmail.com> To: 68199 <at> debbugs.gnu.org Cc: gemmaro <gemmaro.dev <at> gmail.com> Subject: [PATCH v2 2/2] gnu: taisei: Update to 1.4. Date: Wed, 3 Jan 2024 08:59:59 +0900
* gnu/packages/games.scm (taisei): Update to 1.4.
Change-Id: Ic83c4b9f77affe7782b62812be86f3c376c7ef28
---
gnu/packages/games.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 4bbe97c3f9..84aa17b3be 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -193,6 +193,7 @@ (define-module (gnu packages games)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-compression)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
@@ -3385,12 +3386,12 @@ (define-public talkfilters
(define-public taisei
(package
(name "taisei")
- (version "1.3.2")
+ (version "1.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/taisei-project/"
- "taisei/releases/download/v"
+ "taisei/releases/download/"
version
"/taisei-v"
version
@@ -3416,7 +3417,8 @@ (define-public taisei
sdl2-mixer
shaderc
spirv-cross
- zlib))
+ zlib
+ (list zstd "lib")))
(home-page "https://taisei-project.org/")
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
(description
--
2.41.0
guix-patches <at> gnu.org:bug#68199; Package guix-patches.
(Fri, 05 Jan 2024 17:53:01 GMT) Full text and rfc822 format available.Message #29 received at 68199 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: gemmaro <gemmaro.dev <at> gmail.com>, 68199 <at> debbugs.gnu.org Cc: 宋文武 <iyzsong <at> envs.net> Subject: Re: [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps. Date: Fri, 05 Jan 2024 18:52:24 +0100
Am Mittwoch, dem 03.01.2024 um 08:59 +0900 schrieb gemmaro: > * gnu/packages/games.scm (taisei): Reformat with guix style. > [arguments]: Use gexps. > > Change-Id: If542566f43e581968f73537e90101a18d3b1bca1 > --- > gnu/packages/games.scm | 66 +++++++++++++++++++++------------------- > -- > 1 file changed, 33 insertions(+), 33 deletions(-) > > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm > index c7813790a1..4bbe97c3f9 100644 > --- a/gnu/packages/games.scm > +++ b/gnu/packages/games.scm > @@ -78,7 +78,7 @@ > ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com> > ;;; Copyright © 2023 Florian Pelz <pelzflorian <at> pelzflorian.de> > ;;; Copyright © 2023 Ivana Drazovic <iv.dra <at> hotmail.com> > -;;; Copyright © 2023 gemmaro <gemmaro.dev <at> gmail.com> > +;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev <at> gmail.com> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -3390,48 +3390,48 @@ (define-public taisei > (origin > (method url-fetch) > (uri (string-append "https://github.com/taisei-project/" > - "taisei/releases/download/v" version > - "/taisei-v" version ".tar.xz")) > + "taisei/releases/download/v" > + version > + "/taisei-v" > + version > + ".tar.xz")) That's a false positive in guix style, keep it as-is. > (sha256 > (base32 > "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v")))) > (build-system meson-build-system) > (arguments > - `(#:build-type "release" ;comment out for bug-reporting > (and cheats) > - #:configure-flags > - (list "-Dr_default=gles30" > - "-Dr_gles20=true" > - "-Dr_gles30=true" > - "-Dshader_transpiler=true"))) > - (native-inputs > - (list pkg-config python python-docutils python-pygments)) > - (inputs > - (list cglm > - freetype > - libpng > - libwebp > - libzip > - mesa > - openssl > - opusfile > - sdl2 > - sdl2-mixer > - shaderc > - spirv-cross > - zlib)) > + (list > + #:build-type "release" ;comment out for bug-reporting (and > cheats) > + #:configure-flags #~(list "-Dr_default=gles30" "- > Dr_gles20=true" > + "-Dr_gles30=true" "- > Dshader_transpiler=true"))) Here, having one flag per line actually helps, so split it. > + (native-inputs (list pkg-config python python-docutils python- > pygments)) > + (inputs (list cglm > + freetype > + libpng > + libwebp > + libzip > + mesa > + openssl > + opusfile > + sdl2 > + sdl2-mixer > + shaderc > + spirv-cross > + zlib)) The same-line/next-line list is not too big of a deal, it can go either way. > (home-page "https://taisei-project.org/") > (synopsis "Shoot'em up fangame and libre clone of Touhou > Project") > (description > "The player controls a character (one of three: Good, Bad, and > Dead), > dodges the missiles (lots of it cover the screen, but the > character's hitbox > is very small), and shoot at the adversaries that keep appear on the > screen.") > - (license (list ;;game > - license:expat > - ;;resources/00-taisei.pkgdir/bgm/ > - ;;atlas/portraits/ > - license:cc-by4.0 > - ;;miscellaneous > - license:cc0 > - license:public-domain)))) > + (license (list > + ;; game > + license:expat > + ;; resources/00-taisei.pkgdir/bgm/ > + ;; atlas/portraits/ > + license:cc-by4.0 > + ;; miscellaneous > + license:cc0 > + license:public-domain)))) This hunk LGTM. Cheers
liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:bug#68199; Package guix-patches.
(Sat, 06 Jan 2024 02:23:02 GMT) Full text and rfc822 format available.Message #32 received at 68199 <at> debbugs.gnu.org (full text, mbox):
From: gemmaro <gemmaro.dev <at> gmail.com> To: 68199 <at> debbugs.gnu.org Cc: gemmaro <gemmaro.dev <at> gmail.com> Subject: [PATCH v3 2/2] gnu: taisei: Update to 1.4. Date: Sat, 6 Jan 2024 11:20:52 +0900
* gnu/packages/games.scm (taisei): Update to 1.4.
Change-Id: Ic83c4b9f77affe7782b62812be86f3c376c7ef28
---
gnu/packages/games.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 07f1b8552d..26df49fb40 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -193,6 +193,7 @@ (define-module (gnu packages games)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-compression)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
@@ -3385,12 +3386,12 @@ (define-public talkfilters
(define-public taisei
(package
(name "taisei")
- (version "1.3.2")
+ (version "1.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/taisei-project/"
- "taisei/releases/download/v" version
+ "taisei/releases/download/" version
"/taisei-v" version ".tar.xz"))
(sha256
(base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
@@ -3417,7 +3418,8 @@ (define-public taisei
sdl2-mixer
shaderc
spirv-cross
- zlib))
+ zlib
+ (list zstd "lib")))
(home-page "https://taisei-project.org/")
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
(description
--
2.41.0
liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:bug#68199; Package guix-patches.
(Sat, 06 Jan 2024 02:23:02 GMT) Full text and rfc822 format available.Message #35 received at 68199 <at> debbugs.gnu.org (full text, mbox):
From: gemmaro <gemmaro.dev <at> gmail.com> To: 68199 <at> debbugs.gnu.org Cc: gemmaro <gemmaro.dev <at> gmail.com> Subject: [PATCH v3 1/2] gnu: taisei: Use gexps. Date: Sat, 6 Jan 2024 11:20:51 +0900
* gnu/packages/games.scm (taisei)[arguments]: Use gexps.
[license]: Reformat with guix style.
Change-Id: I717a7e408f5ae274c5aafa0f3e20bb7bca377b3a
---
gnu/packages/games.scm | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8117886583..07f1b8552d 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -78,7 +78,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
;;; Copyright © 2023 Florian Pelz <pelzflorian <at> pelzflorian.de>
;;; Copyright © 2023 Ivana Drazovic <iv.dra <at> hotmail.com>
-;;; Copyright © 2023 gemmaro <gemmaro.dev <at> gmail.com>
+;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev <at> gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3396,12 +3396,12 @@ (define-public taisei
(base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
(build-system meson-build-system)
(arguments
- `(#:build-type "release" ;comment out for bug-reporting (and cheats)
- #:configure-flags
- (list "-Dr_default=gles30"
- "-Dr_gles20=true"
- "-Dr_gles30=true"
- "-Dshader_transpiler=true")))
+ (list
+ #:build-type "release" ;comment out for bug-reporting (and cheats)
+ #:configure-flags #~(list "-Dr_default=gles30"
+ "-Dr_gles20=true"
+ "-Dr_gles30=true"
+ "-Dshader_transpiler=true")))
(native-inputs
(list pkg-config python python-docutils python-pygments))
(inputs
@@ -3424,14 +3424,15 @@ (define-public taisei
"The player controls a character (one of three: Good, Bad, and Dead),
dodges the missiles (lots of it cover the screen, but the character's hitbox
is very small), and shoot at the adversaries that keep appear on the screen.")
- (license (list ;;game
- license:expat
- ;;resources/00-taisei.pkgdir/bgm/
- ;;atlas/portraits/
- license:cc-by4.0
- ;;miscellaneous
- license:cc0
- license:public-domain))))
+ (license (list
+ ;; game
+ license:expat
+ ;; resources/00-taisei.pkgdir/bgm/
+ ;; atlas/portraits/
+ license:cc-by4.0
+ ;; miscellaneous
+ license:cc0
+ license:public-domain))))
(define-public cmatrix
(package
base-commit: c0e21e523d93081153a2ffc91e5a9f06afe62b91
--
2.41.0
Liliana Marie Prikler <liliana.prikler <at> gmail.com>:gemmaro <gemmaro.dev <at> gmail.com>:Message #40 received at 68199-done <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: gemmaro <gemmaro.dev <at> gmail.com>, 68199-done <at> debbugs.gnu.org Cc: 宋文武 <iyzsong <at> envs.net> Subject: Re: [bug#68199] [PATCH v3 2/2] gnu: taisei: Update to 1.4. Date: Sun, 07 Jan 2024 10:30:23 +0100
Am Samstag, dem 06.01.2024 um 11:20 +0900 schrieb gemmaro: > * gnu/packages/games.scm (taisei): Update to 1.4. > > Change-Id: Ic83c4b9f77affe7782b62812be86f3c376c7ef28 > --- Corrected URL, hash, native-inputs and inputs. Then pushed. Cheers
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Sun, 04 Feb 2024 12:24:10 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.