[bug#72874] [PATCH 0/8] gnu: Add toml-test.

[bug#72874] [PATCH 0/8] gnu: Add toml-test.

[gemmaro]

Hello,

This adds toml-test command line tool and its dependencies.

Thank you,

gemmaro (8):
  gnu: Add go-zgo-at-runewidth.
  gnu: Add go-zgo-at-termtext.
  gnu: Add go-zgo-at-zstd.
  gnu: Add go-zgo-at-zli.
  gnu: Add go-zgo-at-jfmt.
  gnu: Add jfmt.
  gnu: Add go-github-com-toml-lang-toml-test.
  gnu: Add toml-test.

 gnu/packages/golang-xyz.scm | 180 ++++++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)


base-commit: 09fe58e08cb1ff9be93752b018c5dd55c8ef9498
-- 
2.45.2

[bug#72874] [PATCH 1/8] gnu: Add go-zgo-at-runewidth.

[gemmaro]

* gnu/packages/golang-xyz.scm (go-zgo-at-runewidth): New variable.

Change-Id: I7c03b7e89ba45e8ce63cc482a4f860bdf839f727
---
 gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 796341a66b..3607f09de2 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -45,6 +45,7 @@
 ;;; Copyright © 2024 Luis Higino <luishenriquegh2701@gmail.com>
 ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
 ;;; Copyright © 2024 Spencer Peters <spencerpeters@protonmail.com>
+;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6905,6 +6906,30 @@ (define-public go-mvdan-cc-editorconfig
 defined in @url{https://editorconfig.org/,https://editorconfig.org/}.")
     (license license:bsd-3)))
 
+(define-public go-zgo-at-runewidth
+  (package
+    (name "go-zgo-at-runewidth")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/arp242/runewidth")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "17wbzwak831z04kj4xdvh2q78k3in3kay009n0yj8nlwn1p126ph"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "zgo.at/runewidth"))
+    (home-page "https://github.com/arp242/runewidth")
+    (synopsis "Get fixed width of the character or string")
+    (description
+     "@samp{runewidth} provides functions to get fixed width of the
+character or string.")
+    (license license:expat)))
+
 ;;;
 ;;; Executables:
 ;;;
-- 
2.45.2

[bug#72874] [PATCH 2/8] gnu: Add go-zgo-at-termtext.

[gemmaro]

* gnu/packages/golang-xyz.scm (go-zgo-at-termtext): New variable.

Change-Id: I19ec0dc06dda0289cb3aaa43de025fa447da8e6c
---
 gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 3607f09de2..ccb6dbd374 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6930,6 +6930,31 @@ (define-public go-zgo-at-runewidth
 character or string.")
     (license license:expat)))
 
+(define-public go-zgo-at-termtext
+  (package
+    (name "go-zgo-at-termtext")
+    (version "1.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/arp242/termtext")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0czhvcx6crmwfl6555l9hgl6gq21ykwr4bg2dqksc71qmv6b27hh"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "zgo.at/termtext"))
+    (propagated-inputs (list go-zgo-at-runewidth go-github-com-rivo-uniseg))
+    (home-page "https://github.com/arp242/termtext")
+    (synopsis "Deal with monospace text as interpreted by terminals")
+    (description
+     "Package @samp{termtext} deals with monospace text as interpreted by
+terminals.")
+    (license license:expat)))
+
 ;;;
 ;;; Executables:
 ;;;
-- 
2.45.2

[bug#72874] [PATCH 3/8] gnu: Add go-zgo-at-zstd.

[gemmaro]

* gnu/packages/golang-xyz.scm (go-zgo-at-zstd): New variable.

Change-Id: Ib9662c07d532944eba9da2c7b62c81fae656846a
---
 gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index ccb6dbd374..220d556915 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6955,6 +6955,30 @@ (define-public go-zgo-at-termtext
 terminals.")
     (license license:expat)))
 
+(define-public go-zgo-at-zstd
+  (package
+    (name "go-zgo-at-zstd")
+    (version "0.0.0-20240827020003-f7ed9341ec67")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/arp242/zstd")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0cfpj3fqpg0v36h07iwjfb3v61phla5hlqbinpvh3g8r7rljxqxm"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "zgo.at/zstd"))
+    (home-page "https://github.com/arp242/zstd")
+    (synopsis "Extensions to Go's standard library")
+    (description
+     "Package @samp{zstd} is a collection of extensions to Go's standard
+library.")
+    (license license:expat)))
+
 ;;;
 ;;; Executables:
 ;;;
-- 
2.45.2

[bug#72874] [PATCH 4/8] gnu: Add go-zgo-at-zli.

[gemmaro]

* gnu/packages/golang-xyz.scm (go-zgo-at-zli): New variable.

Change-Id: Ia9ed0ffe30933848ecda0c9130f02285407572b1
---
 gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 220d556915..cc9f4e56d9 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6955,6 +6955,31 @@ (define-public go-zgo-at-termtext
 terminals.")
     (license license:expat)))
 
+(define-public go-zgo-at-zli
+  (package
+    (name "go-zgo-at-zli")
+    (version "0.0.0-20240614180544-47534b1ce136")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/arp242/zli")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0jbh3p5xljd9y3334fczf8lfp0hdjnsi086hmkfnfh9w8k1h3b2r"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "zgo.at/zli"))
+    (home-page "https://github.com/arp242/zli")
+    (synopsis "Go library for writing command line interface programs")
+    (description
+     "@samp{zli} is a Go library for writing command line interface
+programs.  It includes flag parsing, color escape codes, various
+helpful utility functions, and makes testing fairly easy.")
+    (license license:expat)))
+
 (define-public go-zgo-at-zstd
   (package
     (name "go-zgo-at-zstd")
-- 
2.45.2

[bug#72874] [PATCH 5/8] gnu: Add go-zgo-at-jfmt.

[gemmaro]

* gnu/packages/golang-xyz.scm (go-zgo-at-jfmt): New variable.

Change-Id: I3b8d37bf30dd4f1a1da657c5279a5e6efab55aea
---
 gnu/packages/golang-xyz.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index cc9f4e56d9..1c37fe0355 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6906,6 +6906,38 @@ (define-public go-mvdan-cc-editorconfig
 defined in @url{https://editorconfig.org/,https://editorconfig.org/}.")
     (license license:bsd-3)))
 
+(define-public go-zgo-at-jfmt
+  (package
+    (name "go-zgo-at-jfmt")
+    (version "0.0.0-20240531161922-a97493b8db3c")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/arp242/jfmt")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0vm38kp46m1drxx16prbjwrc575vv7819ci16p96i0mksnnlfxj3"))
+       (modules '((guix build utils)))
+       ;; TODO: some tests fail.
+       (snippet '(begin
+                   (delete-file "testdata/escape.json")
+                   (delete-file "testdata/toml-test-key-escapes.json")
+                   (delete-file
+                    "testdata/toml-test-string-quoted-unicode.json")))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "zgo.at/jfmt"))
+    (propagated-inputs (list go-zgo-at-zstd go-zgo-at-zli go-zgo-at-termtext))
+    (home-page "https://github.com/arp242/jfmt")
+    (synopsis "JSON formatter written in Go")
+    (description
+     "@samp{jfmt} is a JSON formatter.  It tries to be a little smarter
+about what should be on a single line, and so on.")
+    (license license:expat)))
+
 (define-public go-zgo-at-runewidth
   (package
     (name "go-zgo-at-runewidth")
-- 
2.45.2

[bug#72874] [PATCH 6/8] gnu: Add jfmt.

[gemmaro]

* gnu/packages/golang-xyz.scm (jfmt): New variable.

Change-Id: I73a979407e2497a8b8a4a50d1efae04a269c2822
---
 gnu/packages/golang-xyz.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 1c37fe0355..ca5830c3e8 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -7198,6 +7198,16 @@ (define-public go-ulid
                     " This package provides an command line interface (CLI)
 tool."))))
 
+(define-public jfmt
+  (package/inherit go-zgo-at-jfmt
+    (name "jfmt")
+    (arguments (list #:install-source? #f
+                     #:import-path "zgo.at/jfmt/cmd/jfmt"
+                     #:unpack-path "zgo.at/jfmt"))
+    (description
+     (string-append (package-description go-zgo-at-jfmt)
+                    "  This package provides a command line interface (CLI) tool."))))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.45.2

[bug#72874] [PATCH 7/8] gnu: Add go-github-com-toml-lang-toml-test.

[gemmaro]

* gnu/packages/golang-xyz.scm (go-github-com-toml-lang-toml-test): New variable.

Change-Id: I287cc46f371597e8557cb4eb255391d2c6766ddf
---
 gnu/packages/golang-xyz.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index ca5830c3e8..28480e6930 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6202,6 +6202,32 @@ (define-public go-github-com-tkuchiki-go-timezone
 @end itemize")
     (license license:expat)))
 
+(define-public go-github-com-toml-lang-toml-test
+  (package
+    (name "go-github-com-toml-lang-toml-test")
+    (version "1.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/toml-lang/toml-test")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "188xcsxgn20pjnddfn3mvx7wak030xdgkhxkhjiijfap37gbv6df"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/toml-lang/toml-test"))
+    (propagated-inputs (list go-zgo-at-zli go-zgo-at-jfmt
+                             go-github-com-burntsushi-toml))
+    (home-page "https://github.com/toml-lang/toml-test")
+    (synopsis "Installation")
+    (description
+     "@samp{toml-test} is a language-agnostic test suite to verify the
+correctness of @url{https://toml.io,TOML} parsers and writers.")
+    (license license:expat)))
+
 (define-public go-github-com-vitrun-qart
   (let ((commit "bf64b92db6b05651d6c25a3dabf2d543b360c0aa")
         (revision "0"))
-- 
2.45.2

[bug#72874] [PATCH 8/8] gnu: Add toml-test.

[gemmaro]

* gnu/packages/golang-xyz.scm (toml-test): New variable.

Change-Id: Ie8a9497fb8e12889b7d018ee3236ebec2de2bce7
---
 gnu/packages/golang-xyz.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 28480e6930..ec44ae0d38 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -82,6 +82,7 @@ (define-module (gnu packages golang-xyz)
   #:use-module (gnu packages golang-maths)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages specifications))
 
 ;;; Commentary:
@@ -7234,6 +7235,18 @@ (define-public jfmt
      (string-append (package-description go-zgo-at-jfmt)
                     "  This package provides a command line interface (CLI) tool."))))
 
+(define-public toml-test
+  (package/inherit go-github-com-toml-lang-toml-test
+    (name "toml-test")
+    (arguments (list #:install-source? #f
+                     #:import-path
+                     "github.com/toml-lang/toml-test/cmd/toml-test"
+                     #:unpack-path "github.com/toml-lang/toml-test"))
+    (native-inputs (list python-3 jfmt))
+    (description (string-append (package-description
+                                 go-github-com-toml-lang-toml-test)
+                  "  This package provides a command line interface (CLI) tool."))))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.45.2

bug#72874: [PATCH 0/8] gnu: Add toml-test.

[Sharlatan Hellseher]

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


Hi,

Thank you for the patches.

Applied as 98aed3b9f8..d3a25d8608 to master.

- patches [8/8][100%]
  - [X] [PATCH 1/8] gnu: Add go-zgo-at-runewidth.
    - Adjust description
  - [X] [PATCH 2/8] gnu: Add go-zgo-at-termtext.
  - [X] [PATCH 3/8] gnu: Add go-zgo-at-zstd.
    - Enable all tests
    - Update to the latest
  - [X] [PATCH 4/8] gnu: Add go-zgo-at-zli.
    - Update to the latest
  - [X] [PATCH 5/8] gnu: Add go-zgo-at-jfmt.
    - Move test data deletion to the phase
    - Report upstream
  - [X] [PATCH 6/8] gnu: Add jfmt.
    - Rename to go-jfmt as it's quite new project and might have similar name clash.
    - Sort alphabetically
  - [X] [PATCH 7/8] gnu: Add go-github-com-toml-lang-toml-test.
    - Place to gnu/check.scm
    - Rename to toml-test
    - Build just binary as the project looks like a program rather than a library
  - [X] [PATCH 8/8] gnu: Add toml-test.
    - Do no apply, see above

--
Oleg

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