all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: gemmaro <gemmaro.dev@gmail.com>, 68199@debbugs.gnu.org
Cc: 宋文武 <iyzsong@envs.net>
Subject: [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps.
Date: Fri, 05 Jan 2024 18:52:24 +0100	[thread overview]
Message-ID: <5f8c2c05663d2ce85472490363144fc2f7f7c15c.camel@gmail.com> (raw)
In-Reply-To: <3c76ff811b93f7e84067c1e2247e6b9acec829a4.1704239998.git.gemmaro.dev@gmail.com>

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@qq.com>
>  ;;; Copyright © 2023 Florian Pelz <pelzflorian@pelzflorian.de>
>  ;;; Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
> -;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
> +;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@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

  parent reply	other threads:[~2024-01-05 17:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-02  1:04 [bug#68199] [PATCH 0/3] gnu: taisei: Update to 1.4 gemmaro
2024-01-02  1:07 ` [bug#68199] [PATCH 1/3] gnu: taisei: Reformat with guix style gemmaro
2024-01-02 21:02   ` Liliana Marie Prikler
2024-01-02  1:07 ` [bug#68199] [PATCH 2/3] gnu: taisei: Use gexps gemmaro
2024-01-02 21:02   ` Liliana Marie Prikler
2024-01-02  1:07 ` [bug#68199] [PATCH 3/3] gnu: taisei: Update to 1.4 gemmaro
2024-01-02 23:59 ` [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps gemmaro
2024-01-02 23:59   ` [bug#68199] [PATCH v2 2/2] gnu: taisei: Update to 1.4 gemmaro
2024-01-05 17:52   ` Liliana Marie Prikler [this message]
2024-01-06  2:20 ` [bug#68199] [PATCH v3 1/2] gnu: taisei: Use gexps gemmaro
2024-01-06  2:20   ` [bug#68199] [PATCH v3 2/2] gnu: taisei: Update to 1.4 gemmaro
2024-01-07  9:30     ` bug#68199: " Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5f8c2c05663d2ce85472490363144fc2f7f7c15c.camel@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=68199@debbugs.gnu.org \
    --cc=gemmaro.dev@gmail.com \
    --cc=iyzsong@envs.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.