[bug#50275] [PATCH 1/4] gnu: Add go-github-com-gdamore-tcell-v2.

[bug#50275] [PATCH 1/4] gnu: Add go-github-com-gdamore-tcell-v2.

[jgart via Guix-patches via]

From: Guix Together <jgart@dismail.de>

* gnu/packages/golang.scm (go-github-com-gdamore-tcell-v2): New variable.

Co-authored-by: Arun Isaac <arunisaac@systemreboot.net>
Co-authored-by: Brice Waegeneire <brice@waegenei.re>
Co-authored-by: jgart <jgart@dismail.de>
Co-authored-by: Julien Lepiller <julien@lepiller.eu>
---
 gnu/packages/golang.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 72579d6bd2..f52343345b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5257,6 +5257,38 @@ formatting.  It also favors portability, and includes support for all POSIX
 systems.")
       (license license:expat))))
 
+(define-public go-github-com-gdamore-tcell-v2
+    (package
+      (inherit go-github-com-gdamore-tcell)
+      (name "go-github-com-gdamore-tcell")
+      (version "2.3.1")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/gdamore/tcell")
+               (commit (string-append "v" version))))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0ypbl5080q9sd3irad8mv7zlg4242i8pmg5xyhbyq95kymwibaid"))))
+      (arguments
+       `(#:import-path "github.com/gdamore/tcell/v2"
+         #:phases
+         (modify-phases %standard-phases
+           (add-before 'reset-gzip-timestamps 'make-files-writable
+             (lambda* (#:key outputs #:allow-other-keys)
+               ;; Make sure .gz files are writable so that the
+               ;; 'reset-gzip-timestamps' phase can do its work.
+               (let ((out (assoc-ref outputs "out")))
+                 (for-each make-file-writable
+                           (find-files out "\\.gz$"))
+                 #t))))))
+      (propagated-inputs
+       `(("go-golang-org-x-term" ,go-golang-org-x-term)
+         ("go-golang-org-x-sys" ,go-golang-org-x-sys)
+         ,@(package-inputs go-github-com-gdamore-tcell)))))
+
 (define-public go-github-com-mattn-go-shellwords
   (let ((commit "2444a32a19f450fabaa0bb3e96a703f15d9a97d2")
         (version "1.0.5")
-- 
2.33.0

[bug#50276] [PATCH 2/4] gnu: Add go-github-com-anaseto-gruid-tcell.

[jgart via Guix-patches via]

From: Guix Together <jgart@dismail.de>

* gnu/packages/games.scm (go-github-com-anaseto-gruid-tcell): New variable.

Co-authored-by: Arun Isaac <arunisaac@systemreboot.net>
Co-authored-by: Brice Waegeneire <brice@waegenei.re>
Co-authored-by: jgart <jgart@dismail.de>
Co-authored-by: Julien Lepiller <julien@lepiller.eu>
---
 gnu/packages/games.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 07a61f2c0b..262b85edc0 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -131,6 +131,7 @@
   #:use-module (gnu packages gnu-doc)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gnuzilla)
+  #:use-module (gnu packages golang)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages gsasl)
@@ -9373,6 +9374,36 @@ and bring the war to your enemy.")
                    license:expat license:fdl1.3+ license:public-domain
                    license:zlib))))
 
+(define-public go-github-com-anaseto-gruid-tcell
+  (package
+    (name "go-github-com-anaseto-gruid-tcell")
+    (version "0.1.1")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/anaseto/gruid-tcell")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "09ajr9mbldjfc44qprplbf8dr8yhlbn2nfnas2z62m9wmklc0qiv"))))
+    (build-system go-build-system)
+    (arguments
+      '(#:import-path "github.com/anaseto/gruid-tcell"))
+    (propagated-inputs
+      `(("go-github-com-gdamore-tcell-v2"
+         ,go-github-com-gdamore-tcell-v2)
+        ("go-github-com-anaseto-gruid"
+         ,go-github-com-anaseto-gruid)))
+    (home-page
+      "https://github.com/anaseto/gruid-tcell")
+    (synopsis "Gruid driver using the tcell library")
+    (description
+"The gruid-tcell module provides a gruid driver for building terminal 
+full-window applications.")
+    (license license:isc)))
+
 (define-public harmonist
   (package
     (name "harmonist")
-- 
2.33.0

bug#50276: [PATCH 2/4] gnu: Add go-github-com-anaseto-gruid-tcell.

[Maxim Cournoyer]

Hi,

This came out as patch 2, but depends on patch 3 :-).

jgart <jgart@dismail.de> writes:

> From: Guix Together <jgart@dismail.de>
>
> * gnu/packages/games.scm (go-github-com-anaseto-gruid-tcell): New variable.
>
> Co-authored-by: Arun Isaac <arunisaac@systemreboot.net>
> Co-authored-by: Brice Waegeneire <brice@waegenei.re>
> Co-authored-by: jgart <jgart@dismail.de>
> Co-authored-by: Julien Lepiller <julien@lepiller.eu>
> ---
>  gnu/packages/games.scm | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 07a61f2c0b..262b85edc0 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -131,6 +131,7 @@
>    #:use-module (gnu packages gnu-doc)
>    #:use-module (gnu packages gnupg)
>    #:use-module (gnu packages gnuzilla)
> +  #:use-module (gnu packages golang)
>    #:use-module (gnu packages gperf)
>    #:use-module (gnu packages graphics)
>    #:use-module (gnu packages gsasl)
> @@ -9373,6 +9374,36 @@ and bring the war to your enemy.")
>                     license:expat license:fdl1.3+ license:public-domain
>                     license:zlib))))
>  
> +(define-public go-github-com-anaseto-gruid-tcell
> +  (package
> +    (name "go-github-com-anaseto-gruid-tcell")
> +    (version "0.1.1")
> +    (source
> +      (origin
> +        (method git-fetch)
> +        (uri (git-reference
> +               (url "https://github.com/anaseto/gruid-tcell")
> +               (commit (string-append "v" version))))
> +        (file-name (git-file-name name version))
> +        (sha256
> +          (base32
> +            "09ajr9mbldjfc44qprplbf8dr8yhlbn2nfnas2z62m9wmklc0qiv"))))
> +    (build-system go-build-system)
> +    (arguments
> +      '(#:import-path "github.com/anaseto/gruid-tcell"))
> +    (propagated-inputs
> +      `(("go-github-com-gdamore-tcell-v2"
> +         ,go-github-com-gdamore-tcell-v2)
> +        ("go-github-com-anaseto-gruid"
> +         ,go-github-com-anaseto-gruid)))
> +    (home-page
> +      "https://github.com/anaseto/gruid-tcell")
> +    (synopsis "Gruid driver using the tcell library")
> +    (description
> +"The gruid-tcell module provides a gruid driver for building terminal 
> +full-window applications.")
> +    (license license:isc)))
> +
>  (define-public harmonist
>    (package
>      (name "harmonist")

I fixed the indentation using Emacs and compressed the fields as bit,
like so:

1 file changed, 15 insertions(+), 19 deletions(-)
gnu/packages/games.scm | 34 +++++++++++++++-------------------

modified   gnu/packages/games.scm
@@ -9407,29 +9407,25 @@ application.")
     (name "go-github-com-anaseto-gruid-tcell")
     (version "0.1.1")
     (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/anaseto/gruid-tcell")
-               (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-          (base32
-            "09ajr9mbldjfc44qprplbf8dr8yhlbn2nfnas2z62m9wmklc0qiv"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/anaseto/gruid-tcell")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "09ajr9mbldjfc44qprplbf8dr8yhlbn2nfnas2z62m9wmklc0qiv"))))
     (build-system go-build-system)
     (arguments
-      '(#:import-path "github.com/anaseto/gruid-tcell"))
+     '(#:import-path "github.com/anaseto/gruid-tcell"))
     (propagated-inputs
-      `(("go-github-com-gdamore-tcell-v2"
-         ,go-github-com-gdamore-tcell-v2)
-        ("go-github-com-anaseto-gruid"
-         ,go-github-com-anaseto-gruid)))
-    (home-page
-      "https://github.com/anaseto/gruid-tcell")
+     `(("go-github-com-gdamore-tcell-v2" ,go-github-com-gdamore-tcell-v2)
+       ("go-github-com-anaseto-gruid" ,go-github-com-anaseto-gruid)))
+    (home-page "https://github.com/anaseto/gruid-tcell")
     (synopsis "Gruid driver using the tcell library")
-    (description
-"The gruid-tcell module provides a gruid driver for building terminal 
-full-window applications.")
+    (description "The gruid-tcell module provides a Gruid driver for building
+terminal full-window applications.")
     (license license:isc)))

There also was an odd white space in the description; I capitalized
"Gruid".

Applied along go-github-com-anaseto-gruid, for which I did I applied a
similar treatment and pushed as efb756554939e4caa7bb2998b99ab6a95c43a4ec.

Thank you!

Maxim

[bug#50277] [PATCH 3/4] gnu: Add go-github-com-anaseto-gruid.

[jgart via Guix-patches via]

From: Guix Together <jgart@dismail.de>

* gnu/packages/games.scm (go-github-com-anaseto-gruid): New variable.

Co-authored-by: Arun Isaac <arunisaac@systemreboot.net>
Co-authored-by: Brice Waegeneire <brice@waegenei.re>
Co-authored-by: jgart <jgart@dismail.de>
Co-authored-by: Julien Lepiller <julien@lepiller.eu>
---
 gnu/packages/games.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 262b85edc0..468f59ec5a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9374,6 +9374,36 @@ and bring the war to your enemy.")
                    license:expat license:fdl1.3+ license:public-domain
                    license:zlib))))
 
+(define-public go-github-com-anaseto-gruid
+  (package
+    (name "go-github-com-anaseto-gruid")
+    (version "0.21.1")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/anaseto/gruid")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "0rvsavkvg2hziwdh8sjk3n5v92m5mfjb8v9m7ch22maxfwq5kv6y"))))
+    (build-system go-build-system)
+    (arguments
+      '(#:import-path "github.com/anaseto/gruid"))
+    (propagated-inputs
+      `(("go-golang-org-x-image" ,go-golang-org-x-image)))
+    (home-page "https://github.com/anaseto/gruid")
+    (synopsis "Cross-platform grid-based UI and game framework")
+    (description
+"The gruid module provides packages for easily building grid-based
+ applications in Go.  The library abstracts rendering and input for
+ different platforms. There are drivers available for terminal apps ,
+ native graphical apps and browser apps.  The original application for the
+ library was creating grid-based games, but it's also well-suited for any
+ grid-based application.")
+    (license license:isc)))
+
 (define-public go-github-com-anaseto-gruid-tcell
   (package
     (name "go-github-com-anaseto-gruid-tcell")
-- 
2.33.0

[bug#50277] This one can be closed since it was merged

[jgart via Guix-patches via]

Just a friendly reminder that this issue can be closed since it was merged in f48156dc
 
 _________________________________________ 
/ 3B1D 7F19 E36B B60C 0F5B 2CA9 A52A A2B4 \
\ 77B6 DD35                               /
 ----------------------------------------- 
        \   ^__^
         \  (oo)\_______
            (__)\       )\/\
                ||----w |
                ||     ||

bug#50277: This one can be closed since it was merged

[Maxim Cournoyer]

Hello!

jgart <jgart@dismail.de> writes:

> Just a friendly reminder that this issue can be closed since it was merged in f48156dc
>  
>  _________________________________________ 
> / 3B1D 7F19 E36B B60C 0F5B 2CA9 A52A A2B4 \
> \ 77B6 DD35                               /
>  ----------------------------------------- 
>         \   ^__^
>          \  (oo)\_______
>             (__)\       )\/\
>                 ||----w |
>                 ||     ||

Thanks for the reminder!

I'm closing it by replying with the CC adjusted from
50277@debbugs.gnu.org to 50277-done@debbugs.gnu.org :-).

Maxim

[bug#50278] [PATCH 4/4] gnu: harmonist: Update to 0.4.1.

[jgart via Guix-patches via]

From: Guix Together <jgart@dismail.de>

* gnu/packages/games.scm (harmonist): Update to 0.4.1.
[propagated-inputs]: Add go-github-com-gdamore-tcell-v2,
 go-github-com-anaseto-gruid , and  go-github-com-anaseto-gruid-tcell.

Co-authored-by: Arun Isaac <arunisaac@systemreboot.net>
Co-authored-by: Brice Waegeneire <brice@waegenei.re>
Co-authored-by: jgart <jgart@dismail.de>
Co-authored-by: Julien Lepiller <julien@lepiller.eu>
---
 gnu/packages/games.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 468f59ec5a..5ca6769379 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9437,7 +9437,7 @@ full-window applications.")
 (define-public harmonist
   (package
     (name "harmonist")
-    (version "0.3.0")
+    (version "0.4.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -9446,12 +9446,15 @@ full-window applications.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "146wiyanag0zqj6fhyll2sw6sydnnll8mgxhhqf9sjqsl2rx4s5r"))))
+                "17ai39pw9xq4asfvhs0whx07hljlivygazbwrxjrnxwrn06483hr"))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "git.tuxfamily.org/harmonist/harmonist"))
     (inputs
-     `(("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go)))
+     `(("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)))
     (home-page "https://harmonist.tuxfamily.org/")
     (synopsis "Stealth coffee-break roguelike game")
     (description "Harmonist: Dayoriah Clan Infiltration is a stealth
-- 
2.33.0

[bug#50278] Acknowledgement ([PATCH 4/4] gnu: harmonist: Update to 0.4.1.)

[jgart via Guix-patches via]

On Mon, 30 Aug 2021 16:42:04 +0000 help-debbugs@gnu.org (GNU bug Tracking System) wrote:

Hi, this was part of our work from the Guix Meetup this past Saturday.

I accidentally sent the patches with git send-email as different issues instead of just one.

Patches from issues 50275 - 50278 (4 patches) were meant to be grouped together.

Let me know if you'd like me to regroup/resend them or if it is fine this time around.

all best,
 
 _________________________________________ 
/ 3B1D 7F19 E36B B60C 0F5B 2CA9 A52A A2B4 \
\ 77B6 DD35                               /
 ----------------------------------------- 
        \   ^__^
         \  (oo)\_______
            (__)\       )\/\
                ||----w |
                ||     ||

[bug#50278] [PATCH 4/4] gnu: harmonist: Update to 0.4.1.

[Maxim Cournoyer]

Hi,

jgart <jgart@dismail.de> writes:

> On Mon, 30 Aug 2021 16:42:04 +0000 help-debbugs@gnu.org (GNU bug Tracking System) wrote:
>
> Hi, this was part of our work from the Guix Meetup this past Saturday.
>
> I accidentally sent the patches with git send-email as different issues instead of just one.
>
> Patches from issues 50275 - 50278 (4 patches) were meant to be grouped together.
>
> Let me know if you'd like me to regroup/resend them or if it is fine this time around.
>
> all best,

It's fine this time around!

Thanks,

Maxim

bug#50278: [PATCH 4/4] gnu: harmonist: Update to 0.4.1.

[Maxim Cournoyer]

Hi again,

jgart <jgart@dismail.de> writes:

> From: Guix Together <jgart@dismail.de>
>
> * gnu/packages/games.scm (harmonist): Update to 0.4.1.
> [propagated-inputs]: Add go-github-com-gdamore-tcell-v2,
>  go-github-com-anaseto-gruid , and  go-github-com-anaseto-gruid-tcell.
                              ^ space before comma
                                     ^2 spaces

I adjusted the commit message to fix the above, and pushed as
26119328aa.

Thank you!

Maxim

bug#50275: [PATCH 1/4] gnu: Add go-github-com-gdamore-tcell-v2.

[Maxim Cournoyer]

Hello!

jgart <jgart@dismail.de> writes:

> From: Guix Together <jgart@dismail.de>
>
> * gnu/packages/golang.scm (go-github-com-gdamore-tcell-v2): New variable.
>
> Co-authored-by: Arun Isaac <arunisaac@systemreboot.net>
> Co-authored-by: Brice Waegeneire <brice@waegenei.re>
> Co-authored-by: jgart <jgart@dismail.de>
> Co-authored-by: Julien Lepiller <julien@lepiller.eu>

This is awesome!

> ---
>  gnu/packages/golang.scm | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
> index 72579d6bd2..f52343345b 100644
> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm
> @@ -5257,6 +5257,38 @@ formatting.  It also favors portability, and includes support for all POSIX
>  systems.")
>        (license license:expat))))
>  
> +(define-public go-github-com-gdamore-tcell-v2
> +    (package
> +      (inherit go-github-com-gdamore-tcell)
> +      (name "go-github-com-gdamore-tcell")
> +      (version "2.3.1")
> +      (source
> +       (origin
> +         (method git-fetch)
> +         (uri (git-reference
> +               (url "https://github.com/gdamore/tcell")
> +               (commit (string-append "v" version))))
> +         (file-name (git-file-name name version))
> +         (sha256
> +          (base32
> +           "0ypbl5080q9sd3irad8mv7zlg4242i8pmg5xyhbyq95kymwibaid"))))
> +      (arguments
> +       `(#:import-path "github.com/gdamore/tcell/v2"
> +         #:phases
> +         (modify-phases %standard-phases
> +           (add-before 'reset-gzip-timestamps 'make-files-writable
> +             (lambda* (#:key outputs #:allow-other-keys)
> +               ;; Make sure .gz files are writable so that the
> +               ;; 'reset-gzip-timestamps' phase can do its work.
> +               (let ((out (assoc-ref outputs "out")))
> +                 (for-each make-file-writable
> +                           (find-files out "\\.gz$"))
> +                 #t))))))

Note that you can preemptively start loosing the trailing #t; the
warning will vanish after the guix-core-updates-frozen branch is merged
into master.

> +      (propagated-inputs
> +       `(("go-golang-org-x-term" ,go-golang-org-x-term)
> +         ("go-golang-org-x-sys" ,go-golang-org-x-sys)
> +         ,@(package-inputs go-github-com-gdamore-tcell)))))
> +
>  (define-public go-github-com-mattn-go-shellwords
>    (let ((commit "2444a32a19f450fabaa0bb3e96a703f15d9a97d2")
>          (version "1.0.5")

LGTM.  I fixed the license of the parent package (it should have been
Apache 2.0) and pushed as cc71a54e9f900e905192f794c7bc5346c445e651.

Closing.

Maxim