[bug#47769] [PATCH 0/6] Add wally-cli

[bug#47769] [PATCH 0/6] Add wally-cli

[Martin Becze]

This patch set adds wally-cli.


Martin Becze (6):
  gnu: Add go-gopkg-in-cheggaaa-pb-v1.
  gnu: Added go-github-com-logrusorgru-aurora.
  gnu: Added go-github-com-caarlos0-spin.
  gnu: Added go-github-com-marcinbor85-gohex.
  gnu: Added go-github-com-google-gousb.
  gnu: Added wally-cli.

 gnu/packages/flashing-tools.scm |  32 +++++++++
 gnu/packages/golang.scm         | 112 +++++++++++++++++++++++++++++++-
 2 files changed, 143 insertions(+), 1 deletion(-)

-- 
2.31.1

[bug#47769] [PATCH 1/6] gnu: Add go-gopkg-in-cheggaaa-pb-v1.

[Martin Becze]

* gnu/packages/golang.scm (go-gopkg-in-cheggaaa-pb-v1): New variable.
---
 gnu/packages/golang.scm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6502740220..da61c4b8f2 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -22,7 +22,7 @@
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020 raingloom <raingloom@riseup.net>
-;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2020, 2021 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;;
@@ -6419,6 +6419,23 @@ inspired by the causal messaging system in the Pony programming language.")
 the terminal.")
     (license license:bsd-3)))
 
+(define-public go-gopkg-in-cheggaaa-pb-v1
+  (package
+    (inherit go-github-com-cheggaaa-pb)
+    (name "go-gopkg-in-cheggaaa-pb-v1")
+    (version "1.0.28")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gopkg.in/cheggaaa/pb.v1.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "13a66cqbpdif804qj12z9ad8r24va9q41gfk71qbc4zg1wsxs3rh"))))
+    (arguments
+     '(#:import-path "gopkg.in/cheggaaa/pb.v1"))))
+
 (define-public go-github-com-gologme-log
   ;; this is the same as v1.2.0, only the LICENSE file changed
   (let ((commit "720ba0b3ccf0a91bc6018c9967a2479f93f56a55"))
-- 
2.31.1

[bug#47769] [PATCH 2/6] gnu: Added go-github-com-logrusorgru-aurora.

[Martin Becze]

* gnu/packages/golang.scm (go-github-com-logrusorgru-aurora): New variable.
---
 gnu/packages/golang.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index da61c4b8f2..3c9698f887 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6735,6 +6735,28 @@ compressed streams in Go.")
     (home-page "https://github.com/ulikunitz/xz")
     (license license:bsd-3)))
 
+(define-public go-github-com-logrusorgru-aurora
+  (package
+    (name "go-github-com-logrusorgru-aurora")
+    (version "3.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/logrusorgru/aurora.git")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "0z7cgj8gl69271d0ag4f4yjbsvbrnfibc96cs01spqf5krv2rzjc"))
+       (file-name (git-file-name name version))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/logrusorgru/aurora"))
+    (home-page "https://github.com/logrusorgru/aurora")
+    (synopsis "Ultimate ANSI colors for Golang")
+    (description "This package provides ANSI colors for Golang.  The package
+supports Printf/Sprintf etc.")
+    (license license:unlicense)))
+
 (define-public go-github-com-songmu-gitconfig
   (package
     (name "go-github-com-songmu-gitconfig")
-- 
2.31.1

[bug#47769] [PATCH 3/6] gnu: Added go-github-com-caarlos0-spin.

[Martin Becze]

* gnu/packages/golang.scm (go-github-com-caarlos0-spin): New variable.
---
 gnu/packages/golang.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3c9698f887..05bec7ea3c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6757,6 +6757,27 @@ compressed streams in Go.")
 supports Printf/Sprintf etc.")
     (license license:unlicense)))
 
+(define-public go-github-com-caarlos0-spin
+  (package
+    (name "go-github-com-caarlos0-spin")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/caarlos0-graveyard/spin.git")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "1pnijds4145j8nsxvq8203r2sg2pbk7x8prkdg2ilghhrzqj6vyc"))
+       (file-name (git-file-name name version))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/caarlos0/spin"))
+    (home-page "https://github.com/caarlos0-graveyard/spin")
+    (synopsis "Simple spinner for cli apps")
+    (description "A very simple spinner for cli golang apps.")
+    (license license:expat)))
+
 (define-public go-github-com-songmu-gitconfig
   (package
     (name "go-github-com-songmu-gitconfig")
-- 
2.31.1

[bug#47769] [PATCH 3/6] gnu: Added go-github-com-caarlos0-spin.

[Nicolò Balzarotti]

Hi! I had the wally-cli patch floating around, but did not submit it
because of this package

Martin Becze <mjbecze@riseup.net> writes:

> * gnu/packages/golang.scm (go-github-com-caarlos0-spin): New variable.
> ---
> +    (license license:expat)))
> +

I cannot find the license in the repo, I opened an issue with no
response
https://github.com/caarlos0-graveyard/spin/issues/8

How do you know it's expat?

[bug#47769] [PATCH 3/6] gnu: Added go-github-com-caarlos0-spin.

[Martin Becze]

uff go catch. I think I put that in there for a place holder and forgot 
about it. Not sure what to do here. B/c the code looks pretty abandoned.

On 4/14/21 4:55 PM, Nicolò Balzarotti wrote:
> 
> Hi! I had the wally-cli patch floating around, but did not submit it
> because of this package
> 
> Martin Becze <mjbecze@riseup.net> writes:
> 
>> * gnu/packages/golang.scm (go-github-com-caarlos0-spin): New variable.
>> ---
>> +    (license license:expat)))
>> +
> 
> I cannot find the license in the repo, I opened an issue with no
> response
> https://github.com/caarlos0-graveyard/spin/issues/8
> 
> How do you know it's expat?
> 

[bug#47769] [PATCH 3/6] gnu: Added go-github-com-caarlos0-spin.

[Nicolò Balzarotti]

Martin Becze <mjbecze@riseup.net> writes:

> uff go catch. I think I put that in there for a place holder and forgot 
> about it. Not sure what to do here. B/c the code looks pretty abandoned.
I told upstream about the problem here[fn:1] let's see

[fn:1] https://github.com/zsa/wally-cli/pull/7

[bug#47769] [PATCH 4/6] gnu: Added go-github-com-marcinbor85-gohex.

[Martin Becze]

* gnu/packages/golang.scm (go-github-com-marcinbor85-gohex): New variable.
---
 gnu/packages/golang.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 05bec7ea3c..b218f3fa4a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6778,6 +6778,29 @@ supports Printf/Sprintf etc.")
     (description "A very simple spinner for cli golang apps.")
     (license license:expat)))
 
+(define-public go-github-com-marcinbor85-gohex
+  (let ((commit "baab2527a9a2a4abb3dc06baabedfa5e0268b8d8")
+        (revision "1"))
+    (package
+      (name "go-github-com-marcinbor85-gohex")
+      (version (git-version "0.0.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/marcinbor85/gohex")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "06v4cc6ld6vvxd4xm9k6l49lhcd9ncq7xfx35mj5b9r96ih49fiz"))
+                (file-name (git-file-name name version))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "github.com/marcinbor85/gohex"))
+      (home-page "https://godoc.org/github.com/marcinbor85/gohex")
+      (synopsis "Parse Intel hex files")
+      (description "A Go library for parsing Intel HEX files.")
+      (license license:expat))))
+
 (define-public go-github-com-songmu-gitconfig
   (package
     (name "go-github-com-songmu-gitconfig")
-- 
2.31.1

[bug#47769] [PATCH 5/6] gnu: Added go-github-com-google-gousb.

[Martin Becze]

* gnu/packages/golang.scm (go-github-com-google-gousb): New variable.
---
 gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b218f3fa4a..4643859424 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -56,6 +56,7 @@
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages libusb)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
@@ -4660,6 +4661,32 @@ GitHub API v3.")
 create or replace a file or symbolic link.")
     (license license:asl2.0)))
 
+(define-public go-github-com-google-gousb
+  (package
+    (name "go-github-com-google-gousb")
+    (version "2.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/google/gousb.git")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32
+         "1aki6hk009sicrf7gxy5nkjmj4j7lsy0by4kjgd9bwq8ragfyv5x"))
+       (file-name (git-file-name name version))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/google/gousb"))
+    (propagated-inputs
+     `(("pkg-config" ,pkg-config)
+       ("libusb" ,libusb)))
+    (home-page "https://github.com/google/gousb")
+    (synopsis "Wrapping for libusb")
+    (description "The gousb package is an attempt at wrapping the libusb
+library into a Go-like binding.")
+    (license license:asl2.0)))
+
 (define-public go-golang.org-x-sync-errgroup
   (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb")
         (revision "0"))
-- 
2.31.1

[bug#47769] [PATCH 5/6] gnu: Added go-github-com-google-gousb.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

On Wed, 2021-04-14 at 05:20 -0500, Martin Becze wrote:
> +(define-public go-github-com-google-gousb
> +  (package
> +    (name "go-github-com-google-gousb")
> +    (version "2.1.0")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/google/gousb.git")
> +             (commit (string-append "v" version))))
> +       (sha256
> +        (base32
> +         "1aki6hk009sicrf7gxy5nkjmj4j7lsy0by4kjgd9bwq8ragfyv5x"))
> +       (file-name (git-file-name name version))))
> +    (build-system go-build-system)
> +    (arguments
> +     '(#:import-path "github.com/google/gousb"))
> +    (propagated-inputs
> +     `(("pkg-config" ,pkg-config)
> +       ("libusb" ,libusb)))

Most likely, "pkg-config" should be in native-inputs.

I believe there's a linter that checks whether packages should
be in native-inputs, but I'm not sure if pkg-config is detected.
Consider running ./pre-inst-env guix lint go-github-com-google-gousb.

Also, why is "libusb" in "propagated-inputs" and not in "inputs"?
"inputs" is usually preferred over "propagated-inputs", but there
are valid reasons to use "propagated-inputs" instead.

Greetings,
Maime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#47769] [PATCH 6/6] gnu: Added wally-cli.

[Martin Becze]

* gnu/packages/flashing-tools.scm (wally-cli): New variable.
---
 gnu/packages/flashing-tools.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index 4b597dca50..baf9af8715 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2021 Martin Becze <mjbecze@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,6 +33,7 @@
   #:use-module (gnu packages)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system go)
   #:use-module (guix build-system python)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages admin)
@@ -44,6 +46,7 @@
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages groff)
+  #:use-module (gnu packages golang)
   #:use-module (gnu packages pciutils)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages libusb)
@@ -517,3 +520,32 @@ Unifinished Extensible Firmware Interface (UEFI) images.")
 manipulating EPROM load files.  It reads and writes numerous EPROM file
 formats, and can perform many different manipulations.")
     (license license:gpl3+)))
+
+(define-public wally-cli
+  (package
+    (name "wally-cli")
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/zsa/wally-cli.git")
+             (commit (string-append version "-linux"))))
+       (sha256
+        (base32
+         "0xz3z18bbnf736ngjj6jhnp3p2j55m5jhnb2xl6l5hybracfyhm7"))
+       (file-name (git-file-name name version))))
+    (build-system go-build-system)
+    (arguments
+     '(#:tests? #f                      ; tests fail on the linter
+       #:import-path "github.com/zsa/wally-cli"))
+    (native-inputs
+     `(("go-gopkg-in-cheggaaa-pb-v1" ,go-gopkg-in-cheggaaa-pb-v1)
+       ("go-github-com-google-gousb" ,go-github-com-google-gousb)
+       ("go-github-com-marcinbor85-gohex" ,go-github-com-marcinbor85-gohex)
+       ("go-github-com-caarlos0-spin" ,go-github-com-caarlos0-spin)
+       ("go-github-com-logrusorgru-aurora" ,go-github-com-logrusorgru-aurora)))
+    (home-page "https://ergodox-ez.com/pages/wally")
+    (synopsis "Flashing tool for ZSA keyboards")
+    (description "This tool is for flashing custom layouts to ZSA keyboards.")
+    (license license:expat)))
-- 
2.31.1

[bug#47769] [PATCH 6/6] gnu: Added wally-cli.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 799 bytes --]

On Wed, 2021-04-14 at 05:20 -0500, Martin Becze wrote:
> [...]
> +(define-public wally-cli
> +  (package
> +    (name "wally-cli")
> +    (version "2.0.0")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/zsa/wally-cli.git")
> +             (commit (string-append version "-linux"))))
> +       (sha256
> +        (base32
> +         "0xz3z18bbnf736ngjj6jhnp3p2j55m5jhnb2xl6l5hybracfyhm7"))
> +       (file-name (git-file-name name version))))
> +    (build-system go-build-system)
> +    (arguments
> +     '(#:tests? #f                      ; tests fail on the linter

Does upstream know about the failing tests?
Also, consider disabling *only* the known failing tests.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#47769] [PATCH 6/6] gnu: Added wally-cli.

[Nicolò Balzarotti]

Maxime Devos <maximedevos@telenet.be> writes:

> On Wed, 2021-04-14 at 05:20 -0500, Martin Becze wrote:
>> [...]
>> +(define-public wally-cli
>> +  (package
>> +    (name "wally-cli")
>> +    (version "2.0.0")
>> +    (source
>> +     (origin
>> +       (method git-fetch)
>> +       (uri (git-reference
>> +             (url "https://github.com/zsa/wally-cli.git")
>> +             (commit (string-append version "-linux"))))
>> +       (sha256
>> +        (base32
>> +         "0xz3z18bbnf736ngjj6jhnp3p2j55m5jhnb2xl6l5hybracfyhm7"))
>> +       (file-name (git-file-name name version))))
>> +    (build-system go-build-system)
>> +    (arguments
>> +     '(#:tests? #f                      ; tests fail on the linter
>
> Does upstream know about the failing tests?
> Also, consider disabling *only* the known failing tests.

@Martin
I had a patch floating around using this commit:
0cf3dd904c5d67278d04182debb310c370754da6
where I commented that this fixed the tests.
Could you check?  Maybe we can ask upstream if they can tag a new
version.

Thanks, Nicolò

[bug#47769] [PATCH 6/6] gnu: Added wally-cli.

[Martin Becze]

Just checked and it works! +1. Nicolo, is your patch on this list?

On 4/14/21 5:02 PM, Nicolò Balzarotti wrote:
> Maxime Devos <maximedevos@telenet.be> writes:
> 
>> On Wed, 2021-04-14 at 05:20 -0500, Martin Becze wrote:
>>> [...]
>>> +(define-public wally-cli
>>> +  (package
>>> +    (name "wally-cli")
>>> +    (version "2.0.0")
>>> +    (source
>>> +     (origin
>>> +       (method git-fetch)
>>> +       (uri (git-reference
>>> +             (url "https://github.com/zsa/wally-cli.git")
>>> +             (commit (string-append version "-linux"))))
>>> +       (sha256
>>> +        (base32
>>> +         "0xz3z18bbnf736ngjj6jhnp3p2j55m5jhnb2xl6l5hybracfyhm7"))
>>> +       (file-name (git-file-name name version))))
>>> +    (build-system go-build-system)
>>> +    (arguments
>>> +     '(#:tests? #f                      ; tests fail on the linter
>>
>> Does upstream know about the failing tests?
>> Also, consider disabling *only* the known failing tests.
> 
> @Martin
> I had a patch floating around using this commit:
> 0cf3dd904c5d67278d04182debb310c370754da6
> where I commented that this fixed the tests.
> Could you check?  Maybe we can ask upstream if they can tag a new
> version.
> 
> Thanks, Nicolò
> 

[bug#47769] [PATCH 6/6] gnu: Added wally-cli.

[Nicolò Balzarotti]

Martin Becze <mjbecze@riseup.net> writes:

> Just checked and it works! +1. Nicolo, is your patch on this list?
>
Nope, I was waiting for carlos0 to answer to my licensing issue.

bug#47769: [PATCH 0/6] Add wally-cli

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 1110 bytes --]


- accepted-patches [5/5]
  - [X] [PATCH 1/6] gnu: Add go-gopkg-in-cheggaaa-pb-v1.
    - Place in golang-xyz
  - [X] [PATCH 2/6] gnu: Added go-github-com-logrusorgru-aurora.
    - Place in golang-xyz
    - Change version to v2.0.3
  - [X] [PATCH 4/6] gnu: Added go-github-com-marcinbor85-gohex.
    - Place in golang-xyz
  - [X] [PATCH 5/6] gnu: Added go-github-com-google-gousb.
    - Place in libusb
    - Use v1.1.3 tag, see <https://github.com/google/gousb/issues/124>
  - [X] [PATCH 6/6] gnu: Added wally-cli.
    - Use latest commit, see <https://github.com/zsa/wally-cli/pull/7#issuecomment-2027199819>

- rejected-packages [1/1]
  - [X] [PATCH 3/6] gnu: Added go-github-com-caarlos0-spin.
    - Replace with go-github-com-briandowns-spinner, see <https://github.com/zsa/wally-cli/pull/7>.

*** Related issues
- [PATCH 1/6] gnu: Add go-gopkg-in-cheggaaa-pb-v1. https://issues.guix.gnu.org/46076
- [PATCH 6/6] gnu: Added wally-cli. https://issues.guix.gnu.org/46081
- [PATCH 0/5] Add wally-cli https://issues.guix.gnu.org/64778

Pushed with adjustments as 9f0ee9967e..1fb12cac94 to master.

Thanks,
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]