[PATCH 00/16] gnu: Add go-github-com-noahgorstein-jqp.

Done

Details

2 participants

Artyom V. Poptsov
Sharlatan Hellseher

Owner: unassigned

Submitted by: Artyom V. Poptsov

Severity: normal

Debbugs page

Artyom V. Poptsov wrote 4 months ago

Recipients:(address . guix-patches@gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:cover.1732386154.git.poptsov.artyom@gmail.com

This patchset adds "go-github-com-noahgorstein-jqp":
  https://github.com/noahgorstein/jqp

I placed it into "golang-xyz.scm" module for now, although I'm not really sure
if this place is right for this as it is an end program that can be run from a
terminal.

Artyom V. Poptsov (16):
  gnu: Add go-github-com-atotto-clipboard.
  gnu: Add go-github-com-aymanbagabas-go-udiff.
  gnu: Add go-github-com-makenowjust-heredoc.
  gnu: Add go-github-com-kylelemons-godebug-pretty.
  gnu: Add go-github-com-sahilm-fuzzy.
  gnu: Add go-github-com-charmbracelet-x-ansi.
  gnu: Add go-github-com-charmbracelet-x-exp-golden.
  gnu: Add go-github-com-charmbracelet-lipgloss.
  gnu: Add go-github-com-charmbracelet-bubbles.
  gnu: go-github-com-itchyny-gojq: Install the library.
  gnu: gojq: Install the binary only.
  gnu: go-github-com-charmbracelet-bubbletea: Remove input labels.
  gnu: Add go-github-com-charmbracelet-x-term.
  gnu: Add go-github-com-muesli-ansi.
  gnu: go-github-com-charmbracelet-bubbletea: Update to 1.2.3.
  gnu: Add go-github-com-noahgorstein-jqp.

 gnu/packages/golang-xyz.scm | 302 +++++++++++++++++++++++++++++++++++-
 gnu/packages/golang.scm     |  80 ++++++++--
 gnu/packages/web.scm        |   5 +-
 3 files changed, 371 insertions(+), 16 deletions(-)


base-commit: 36f516bfcdf64185f5d70c21a908283be22a34fd
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 01/16] gnu: Add go-github-com-atotto-clipboard.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:b653e021654bb28edea920ae26d808fad5452c8e.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-atotto-clipboard): New variable.

Change-Id: I4a871983f564034045f4b2ba77f2453cfce5cb2b

---

gnu/packages/golang-xyz.scm | 35 ++++++++++++++++++++++++++++++++++-

1 file changed, 34 insertions(+), 1 deletion(-)

Toggle diff (55 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 177ab8a20f..b050c285f3 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -85,7 +85,9 @@ (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 specifications))
+  #:use-module (gnu packages specifications)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages xorg))
 
 ;;; Commentary:
 ;;;
@@ -5735,6 +5737,37 @@ (define-public go-github-com-multiformats-go-varint
 varints.")
     (license license:expat)))
 
+(define-public go-github-com-atotto-clipboard
+  (package
+    (name "go-github-com-atotto-clipboard")
+    (version "0.1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/atotto/clipboard")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ycd8zkgsq9iil9svhlwvhcqwcd7vik73nf8rnyfnn10gpjx97k5"))))
+    (build-system go-build-system)
+    (native-inputs (list xorg-server-for-tests))
+    (propagated-inputs (list xclip))
+    (arguments
+     (list
+      #:import-path "github.com/atotto/clipboard"
+      #:phases #~(modify-phases %standard-phases
+                   (add-before 'check 'start-xorg-server
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       ;; The test suite requires a running X server.
+                       (system "Xvfb :1 &")
+                       (setenv "DISPLAY" ":1"))))))
+    (home-page "https://github.com/atotto/clipboard")
+    (synopsis "Clipboard for Golang")
+    (description
+     "@code{clipboard} provides copying and pasting to the clipboard for Go.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-nats-io-nats-go
   (package
     (name "go-github-com-nats-io-nats-go")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 03/16] gnu: Add go-github-com-makenowjust-heredoc.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:500edbbd5f088ad65b0b53d33cbc108c99ce00d3.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-makenowjust-heredoc): New variable.

Change-Id: I686dfd6a798da764b004a53a562ca788e70f8cd5

---

gnu/packages/golang-xyz.scm | 23 +++++++++++++++++++++++

1 file changed, 23 insertions(+)

Toggle diff (36 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index b050c285f3..50f358ad58 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -4832,6 +4832,29 @@ (define-public go-github-com-logrusorgru-aurora-v4
     (native-inputs
      (list go-github-com-stretchr-testify))))
 
+(define-public go-github-com-makenowjust-heredoc
+  (package
+    (name "go-github-com-makenowjust-heredoc")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/makenowjust/heredoc")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18f21zm8n2wlnkz1ylw8rcxmqxyv2rlz8749yfqggm2m0m2884pj"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/MakeNowJust/heredoc"))
+    (home-page "https://github.com/MakeNowJust/heredoc")
+    (synopsis "Here-documents with indent")
+    (description
+     "Package heredoc provides creation of here-documents from raw strings.")
+    (license license:expat)))
+
 (define-public go-github-com-marcinbor85-gohex
   ;; No release, see <https://github.com/marcinbor85/gohex/issues/5>.
   (let ((commit "baab2527a9a2a4abb3dc06baabedfa5e0268b8d8")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 04/16] gnu: Add go-github-com-kylelemons-godebug-pretty.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:8eaada52036915fa34de556f294b05b5e063d1b2.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-kylelemons-godebug-pretty): New variable.

Change-Id: Icd7d5fd70cf56d1ca74e9a2cfb929a3344128ba7

---

gnu/packages/golang.scm | 8 ++++++++

1 file changed, 8 insertions(+)

Toggle diff (21 lines)diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8dd8350847..f4a14cc427 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4722,6 +4722,14 @@ (define-public go-github-com-kylelemons-godebug
 representation suitable for computing diffs.")
     (license license:asl2.0)))
 
+(define-public go-github-com-kylelemons-godebug-pretty
+  (package
+    (inherit go-github-com-kylelemons-godebug)
+    (name "go-github-com-kylelemons-godebug-pretty")
+    (arguments
+     '(#:import-path "github.com/kylelemons/godebug/pretty"
+       #:unpack-path "github.com/kylelemons/godebug"))))
+
 (define-public go-github-com-kr-text
   (package
     (name "go-github-com-kr-text")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 02/16] gnu: Add go-github-com-aymanbagabas-go-udiff.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:860105737bc46811ebf02673fe44b3a3ea0bf08d.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-aymanbagabas-go-udiff): New variable.

Change-Id: Icac934589b041c9b3b5db0114173d25d0c3f4c34

---

gnu/packages/golang.scm | 28 ++++++++++++++++++++++++++++

1 file changed, 28 insertions(+)

Toggle diff (41 lines)diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 9b3a672887..8dd8350847 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7287,6 +7287,34 @@ (define-public go-github-com-mtibben-androiddnsfix
 (define-public go-github-com-androiddnsfix
   (deprecated-package "go-github-com-androiddnsfix" go-github-com-mtibben-androiddnsfix))
 
+(define-public go-github-com-aymanbagabas-go-udiff
+  (package
+    (name "go-github-com-aymanbagabas-go-udiff")
+    (version "0.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/aymanbagabas/go-udiff")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "09p17r8s5flhq6p69z08345q0y99dpb0yyashlwpgxn45xir7y6g"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/aymanbagabas/go-udiff"))
+    (home-page "https://github.com/aymanbagabas/go-udiff")
+    (synopsis "Diffing library for Golang")
+    (description
+     "@code{udiff} (micro-diff, or µDiff) is a library that implements the
+@url{http://www.xmailserver.org/diff2.pdf, Myers' diffing algorithm}.  It aims to
+provide a minimal API to compute and apply diffs with zero dependencies.  It also
+supports generating diffs in the
+@url{https://www.gnu.org/software/diffutils/manual/html_node/Unified-Format.html,
+Unified Format}.")
+    (license license:expat)))
+
 (define-public go-gopkg-in-ini
   (package
     (name "go-gopkg-in-ini")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 06/16] gnu: Add go-github-com-charmbracelet-x-ansi.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:4639770835113154cd85cc13f951a703c487c72a.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-ansi): New variable.

Change-Id: I1451ae9953bc87475413b83bb636a2df14ddc70c

---

gnu/packages/golang-xyz.scm | 29 +++++++++++++++++++++++++++++

1 file changed, 29 insertions(+)

Toggle diff (42 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 407a47efa6..40a8236fb9 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1498,6 +1498,35 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-x-ansi
+  (package
+    (name "go-github-com-charmbracelet-x-ansi")
+    (version "0.5.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "ansi"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "016s67690dr3w3an6m24q6f4vrmwpk0qd4akvvh1dzpfyf4khxd4"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/ansi"
+      #:unpack-path "github.com/charmbracelet/x"))
+    (propagated-inputs (list go-github-com-rivo-uniseg
+                             go-github-com-lucasb-eyer-go-colorful))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "ANSI escape sequence parser and definitions")
+    (description
+     "@code{ansi} defines common ANSI escape sequences based on the
+@url{https://ecma-international.org/publications-and-standards/standards/ecma-48/,
+ECMA-48} specs.")
+    (license license:expat)))
+
 (define-public go-github-com-chzyer-logex
   (package
     (name "go-github-com-chzyer-logex")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 05/16] gnu: Add go-github-com-sahilm-fuzzy.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:6529cfc54cdd5d909b6cb619db17de38dadbbe94.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-sahilm-fuzzy): New variable.

Change-Id: Iebf4f8c3848e1e08b2860ac69a5a8d816ac260df

---

gnu/packages/golang-xyz.scm | 26 ++++++++++++++++++++++++++

1 file changed, 26 insertions(+)

Toggle diff (39 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 50f358ad58..407a47efa6 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6635,6 +6635,32 @@ (define-public go-github-com-ryanuber-columnize
      "This package implements column-formatted output for Golang.")
     (license license:expat)))
 
+(define-public go-github-com-sahilm-fuzzy
+  (package
+    (name "go-github-com-sahilm-fuzzy")
+    (version "0.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sahilm/fuzzy")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "15j95gm7hcmg09x1b39vc4il8bryv4v0yljvvyq5vyc6iq66qrbz"))))
+    (build-system go-build-system)
+    (native-inputs (list go-github-com-kylelemons-godebug
+                         go-github-com-kylelemons-godebug-pretty))
+    (arguments
+     (list
+      #:import-path "github.com/sahilm/fuzzy"))
+    (home-page "https://github.com/sahilm/fuzzy")
+    (synopsis "Fuzzy string matching for Golang")
+    (description
+     "@code{fuzzy} provides fuzzy string matching optimized for filenames and code
+symbols in the style of Sublime Text, VSCode, @code{IntelliJ} IDEA et al.")
+    (license license:expat)))
+
 (define-public go-github-com-schollz-progressbar-v3
   (package
     (name "go-github-com-schollz-progressbar-v3")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 07/16] gnu: Add go-github-com-charmbracelet-x-exp-golden.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:692059f541c2b8de2cc99b727d22c0a44bdcff1a.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-exp-golden): New variable.

Change-Id: I7fa815433d9a83e4562bdc769312dd05e0a298da

---

gnu/packages/golang-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++

1 file changed, 36 insertions(+)

Toggle diff (49 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 40a8236fb9..2681fec06b 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1527,6 +1527,42 @@ (define-public go-github-com-charmbracelet-x-ansi
 ECMA-48} specs.")
     (license license:expat)))
 
+(define-public go-github-com-charmbracelet-x-exp-golden
+  (package
+    (name "go-github-com-charmbracelet-x-exp-golden")
+    (version "0.0.0-20241121171228-5bc00623ea2f")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "exp/golden"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "016s67690dr3w3an6m24q6f4vrmwpk0qd4akvvh1dzpfyf4khxd4"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/exp/golden"
+      #:unpack-path "github.com/charmbracelet/x/"
+      #:modules '((guix build go-build-system)
+                  (guix build utils))
+      #:phases #~(modify-phases %standard-phases
+                   (add-before 'check 'fix-tests
+                     (lambda _
+                       (invoke "chmod"
+                               "-R"
+                               "+w"
+                               "src/github.com/charmbracelet/x/exp/golden"))))))
+    (propagated-inputs (list go-github-com-aymanbagabas-go-udiff))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "Verify @code{.golden} file equality")
+    (description "Golden files (@code{.golden}) contain the raw expected output of
+tests, which can contain control codes and escape sequences.  @code{golden} package
+provides an API for comparing Golden files.")
+    (license license:expat)))
+
 (define-public go-github-com-chzyer-logex
   (package
     (name "go-github-com-chzyer-logex")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 08/16] gnu: Add go-github-com-charmbracelet-lipgloss.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:301a62af5a064d606727286efd368ff0f072b925.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-lipgloss): New variable.

Change-Id: I73050c96830025ed63be7567873f8faf7573453d

---

gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++

1 file changed, 28 insertions(+)

Toggle diff (41 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 2681fec06b..80771f2263 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1498,6 +1498,34 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-lipgloss
+  (package
+    (name "go-github-com-charmbracelet-lipgloss")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/lipgloss")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0d1aqzsjy0mcliydbfbg223xxpf9646frbj35ac4fisdy3w3n142"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/lipgloss"))
+    (propagated-inputs (list go-github-com-rivo-uniseg
+                             go-github-com-muesli-termenv
+                             go-github-com-charmbracelet-x-exp-golden
+                             go-github-com-charmbracelet-x-ansi
+                             go-github-com-aymanbagabas-go-udiff))
+    (home-page "https://github.com/charmbracelet/lipgloss")
+    (synopsis "Style definitions for nice terminal layouts")
+    (description
+     "Style definitions for nice terminal layouts.  Built with TUIs in mind.")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-x-ansi
   (package
     (name "go-github-com-charmbracelet-x-ansi")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 09/16] gnu: Add go-github-com-charmbracelet-bubbles.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:77fe8859fe61db4e802ab41cb1e09671fa8753ad.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-bubbles): New variable.

Change-Id: I090db91509590ca9a8cab1a209d00bcc12b524e7

---

gnu/packages/golang-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++

1 file changed, 37 insertions(+)

Toggle diff (50 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 80771f2263..7fda1bf613 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1498,6 +1498,43 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-bubbles
+  (package
+    (name "go-github-com-charmbracelet-bubbles")
+    (version "0.20.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/bubbles")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qdcln01bq9lk6r33b8p5d5x850wgd8ddq57n4bg3xn76z2fd657"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/bubbles"))
+    (propagated-inputs (list go-github-com-sahilm-fuzzy
+                             go-github-com-rivo-uniseg
+                             go-github-com-muesli-termenv
+                             go-github-com-mattn-go-runewidth
+                             go-github-com-lucasb-eyer-go-colorful
+                             go-github-com-dustin-go-humanize
+                             go-github-com-charmbracelet-x-exp-golden
+                             go-github-com-charmbracelet-x-ansi
+                             go-github-com-charmbracelet-lipgloss
+                             go-github-com-charmbracelet-harmonica
+                             go-github-com-charmbracelet-bubbletea
+                             go-github-com-atotto-clipboard
+                             go-github-com-makenowjust-heredoc))
+    (home-page "https://github.com/charmbracelet/bubbles")
+    (synopsis "TUI components for Bubble Tea library")
+    (description
+     "@code{bubbles} is a library that provide components for
+@@url{https://github.com/charmbracelet/bubbletea, Bubble Tea} applications.")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-lipgloss
   (package
     (name "go-github-com-charmbracelet-lipgloss")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 10/16] gnu: go-github-com-itchyny-gojq: Install the library.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:abb5b4c12ced021294612b22210073461695cf6f.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/web.scm (go-github-com-itchyny-gojq): Install the library

files instead of "gojq" binary.

Change-Id: I72235e0cfeee81b0e7490ebd9d92d0d36ceb1844

---

gnu/packages/web.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d53815eadb..8245438c3b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5605,7 +5605,7 @@ (define-public go-github-com-itchyny-gojq
     (build-system go-build-system)
     (arguments
      (list
-      #:import-path "github.com/itchyny/gojq/cmd/gojq"
+      #:import-path "github.com/itchyny/gojq/"
       #:unpack-path "github.com/itchyny/gojq"))
     (inputs
      (list go-github-com-google-go-cmp
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 13/16] gnu: Add go-github-com-charmbracelet-x-term.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:3a485e81e4dcf59422d086338e92afc409c0ab9c.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-term): New variable.

Change-Id: I854febc3a3010f39051ee6fbd4a159993043d41e

---

gnu/packages/golang-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (40 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 7fda1bf613..380bcd01f9 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1592,6 +1592,33 @@ (define-public go-github-com-charmbracelet-x-ansi
 ECMA-48} specs.")
     (license license:expat)))
 
+(define-public go-github-com-charmbracelet-x-term
+  (package
+    (name "go-github-com-charmbracelet-x-term")
+    (version "0.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "term"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1shw55110fnn4xz80wmgr18czmiil6z1j064m90iw8c7j9llfzn5"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/term"
+      #:unpack-path "github.com/charmbracelet/x"))
+    (propagated-inputs (list go-github-com-rivo-uniseg
+                             go-golang-org-x-sys))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "Terminal utilities and helpers")
+    (description
+     "@code{term} defines terminal utilities.")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-x-exp-golden
   (package
     (name "go-github-com-charmbracelet-x-exp-golden")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 11/16] gnu: gojq: Install the binary only.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:7e27e070f25bbc3eca9884aee7e876a929d18556.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/web.scm (gojq): Install the binary only.

Change-Id: I6a4d0cbdba385460d7ab43d62fe1897922a7c7e9

---

gnu/packages/web.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 8245438c3b..da23192800 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5627,7 +5627,8 @@ (define-public gojq
     (arguments
      (ensure-keyword-arguments
       (package-arguments go-github-com-itchyny-gojq)
-      (list #:install-source? #f)))))
+      (list #:import-path "github.com/itchyny/gojq/cmd/gojq"
+            #:install-source? #f)))))
 
 (define-public pup
   (let ((revision "1")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 14/16] gnu: Add go-github-com-muesli-ansi.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:d833f671ffb589a1ff49f72351c94a1087ec5980.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-muesli-ansi): New variable.

Change-Id: I3dbbd8af04373997fcb3c60872dff14ab1b2b76a

---

gnu/packages/golang-xyz.scm | 26 ++++++++++++++++++++++++++

1 file changed, 26 insertions(+)

Toggle diff (39 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 380bcd01f9..dce2c9873e 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -5655,6 +5655,32 @@ (define-public go-github-com-msteinert-pam-v2
        ((#:import-path _ "github.com/msteinert/pam")
         "github.com/msteinert/pam/v2")))))
 
+(define-public go-github-com-muesli-ansi
+  (package
+    (name "go-github-com-muesli-ansi")
+    (version "0.0.0-20230316100256-276c6243b2f6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/muesli/ansi")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jr8kgn3vb72jmf4a8n52g876mfpbvk3310p8gsg7jkn338af4m9"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/muesli/ansi"))
+    (propagated-inputs
+     (list go-github-com-mattn-go-runewidth
+           go-github-com-rivo-uniseg))
+    (home-page "https://github.com/muesli/ansi")
+    (synopsis "Raw ANSI sequence helpers")
+    (description
+     "ANSI sequence helpers for working with raw ANSI sequences.")
+    (license license:expat)))
+
 (define-public go-github-com-muesli-cancelreader
   (package
     (name "go-github-com-muesli-cancelreader")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 12/16] gnu: go-github-com-charmbracelet-bubbletea: Remove input labels.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:cc6310855c66d5eb7ad57464190b58b56e46f612.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-charmbracelet-bubbletea):

[propagated-inputs]: Remove input labels.

Change-Id: If2dc587649c4e44aabf025de915655887d04530c

---

gnu/packages/golang.scm | 20 ++++++++++----------

1 file changed, 10 insertions(+), 10 deletions(-)

Toggle diff (33 lines)diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f4a14cc427..84b797e1ff 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7052,16 +7052,16 @@ (define-public go-github-com-charmbracelet-bubbletea
                          (for-each delete-file-recursively
                                    '("examples" "tutorials"))))))))
     (propagated-inputs
-     `(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty)
-       ("github.com/muesli/termenv" ,go-github-com-muesli-termenv)
-       ("github.com/mattn/go-runewidth" ,go-github-com-mattn-go-runewidth)
-       ("go-github-com-muesli-reflow" ,go-github-com-muesli-reflow)
-       ("go-github-com-lucasb-eyer-go-colorful" ,go-github-com-lucasb-eyer-go-colorful)
-       ("github.com/containerd/console" ,go-github-com-containerd-console)
-       ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
-       ("go-golang-org-x-sys" ,go-golang-org-x-sys)
-       ("go-golang-org-x-term" ,go-golang-org-x-term)
-       ("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty)))
+     (list go-github-com-mattn-go-isatty
+           go-github-com-muesli-termenv
+           go-github-com-mattn-go-runewidth
+           go-github-com-muesli-reflow
+           go-github-com-lucasb-eyer-go-colorful
+           go-github-com-containerd-console
+           go-golang-org-x-crypto
+           go-golang-org-x-sys
+           go-golang-org-x-term
+           go-github-com-mattn-go-isatty))
     (home-page "https://github.com/charmbracelet/bubbletea")
     (synopsis "Powerful little TUI framework")
     (description
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 15/16] gnu: go-github-com-charmbracelet-bubbletea: Update to 1.2.3.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:955413e87a58bb79ad108f0df2da786168377d84.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-charmbracelet-bubbletea): Update to 1.2.3.
[propagated-inputs]: Add go-github-com-muesli-ansi, go-github-com-muesli-cancelreader,
go-github-com-charmbracelet-lipgloss,
go-github-com-charmbracelet-x-term,
go-github-com-charmbracelet-x-ansi, and go-golang-org-x-sync.
[arguments] <phases>: Fix tests that are failing due to newer version of
"go-github-com-charmbracelet-x-ansi" package.

Change-Id: Ifdb3074f342b34c07c0e7ab47341b159d1eea0c2
---
 gnu/packages/golang.scm | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

Toggle diff (61 lines)diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 84b797e1ff..322bd4224a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7030,7 +7030,7 @@ (define-public go-github-com-rivo-uniseg
 (define-public go-github-com-charmbracelet-bubbletea
   (package
     (name "go-github-com-charmbracelet-bubbletea")
-    (version "0.13.2")
+    (version "1.2.3")
     (source
      (origin
        (method git-fetch)
@@ -7040,7 +7040,7 @@ (define-public go-github-com-charmbracelet-bubbletea
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1105cggi5fwqx69m0vrhgwx6kaw82w4ahn58sj0a81603c4yvrk0"))))
+         "0ggkl29qixgin5av1mbnwfbb31kmwpczh8pgpjsx9z277fs55mph"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -7050,17 +7050,35 @@ (define-public go-github-com-charmbracelet-bubbletea
                      (lambda* (#:key import-path #:allow-other-keys)
                        (with-directory-excursion (string-append "src/" import-path)
                          (for-each delete-file-recursively
-                                   '("examples" "tutorials"))))))))
+                                   '("examples" "tutorials")))))
+                   (add-before 'check 'fix-tests
+                     (lambda _
+                       ;; XXX: The package requires
+                       ;; "go-github-com-charmbracelet-x-ansi" version 0.4.5; with
+                       ;; the newer version of "ansi", some "bubbletea" screen tests
+                       ;; fail as "ansi" 0.5.2 handles escape sequences a little bit
+                       ;; differently.
+                       (substitute* "src/github.com/charmbracelet/bubbletea/screen_test.go"
+                         (("x1b\\[0K")
+                          "x1b[K")
+                         (("x1b\\[2;0H")
+                          "x1b[2;H")))))))
     (propagated-inputs
      (list go-github-com-mattn-go-isatty
            go-github-com-muesli-termenv
            go-github-com-mattn-go-runewidth
+           go-github-com-muesli-ansi
+           go-github-com-muesli-cancelreader
            go-github-com-muesli-reflow
            go-github-com-lucasb-eyer-go-colorful
+           go-github-com-charmbracelet-lipgloss
+           go-github-com-charmbracelet-x-term
+           go-github-com-charmbracelet-x-ansi
            go-github-com-containerd-console
            go-golang-org-x-crypto
            go-golang-org-x-sys
            go-golang-org-x-term
+           go-golang-org-x-sync
            go-github-com-mattn-go-isatty))
     (home-page "https://github.com/charmbracelet/bubbletea")
     (synopsis "Powerful little TUI framework")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH 16/16] gnu: Add go-github-com-noahgorstein-jqp.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:f492e7e451e0bb9483fcfb60117f2fbe4f76e121.1732386154.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-noahgorstein-jqp): New variable.

Change-Id: I736e039a456960e0e5864d7d197b2a6a823bbe58

---

gnu/packages/golang-xyz.scm | 35 +++++++++++++++++++++++++++++++++++

1 file changed, 35 insertions(+)

Toggle diff (55 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index dce2c9873e..8ea109457f 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -86,6 +86,7 @@ (define-module (gnu packages golang-xyz)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages specifications)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg))
 
@@ -6078,6 +6079,40 @@ (define-public go-github-com-niklasfasching-go-org
 pretty printed rendering in Golang.")
     (license license:expat)))
 
+(define-public go-github-com-noahgorstein-jqp
+  (package
+    (name "go-github-com-noahgorstein-jqp")
+    (version "0.7.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/noahgorstein/jqp")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "11xqh4113gkzp32hd4dg4cvjp40q3hxfh3889wd4bw2snl0alvcb"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.22
+      #:embed-files #~(list ".*.xml")
+      #:import-path "github.com/noahgorstein/jqp"))
+    (propagated-inputs (list go-github-com-spf13-viper
+                             go-github-com-spf13-cobra
+                             go-github-com-muesli-termenv
+                             go-github-com-itchyny-gojq
+                             go-github-com-itchyny-timefmt-go
+                             go-github-com-charmbracelet-lipgloss
+                             go-github-com-charmbracelet-bubbletea
+                             go-github-com-charmbracelet-bubbles
+                             go-github-com-atotto-clipboard
+                             go-github-com-alecthomas-chroma-v2))
+    (home-page "https://github.com/noahgorstein/jqp")
+    (synopsis "jqp")
+    (description "a TUI playground for exploring jq.")
+    (license license:expat)))
+
 (define-public go-github-com-nsqio-go-diskqueue
   (package
     (name "go-github-com-nsqio-go-diskqueue")
-- 
2.46.0

Sharlatan Hellseher wrote 4 months ago

[PATCH 00/16] gnu: Add go-github-com-noahgorstein-jqp.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:874j3xoa33.fsf@gmail.com

Hi,

Thanks for the patches!

After a intial review of package placement there are some comments:

Better sutes for (gnu packages xdisorg), there are golang packages, and

it prevent importing xdisorg and xorg into golang-xyz.

Toggle snippet (3 lines)

+(define-public go-github-com-atotto-clipboard

What's going on here, maybe repack go-github-com-kylelemons-godebug to

include all modules, wdyt?

Toggle snippet (3 lines)

+(define-public go-github-com-kylelemons-godebug-pretty

Please, no new packages to golang.scm

Toggle snippet (3 lines)

+(define-public go-github-com-aymanbagabas-go-udiff

Please follow the style ;-)

Toggle snippet (8 lines)

+ (native-inputs (list go-github-com-kylelemons-godebug

+ go-github-com-kylelemons-godebug-pretty))

+ (arguments

+ (list

+ #:import-path "github.com/sahilm/fuzzy"))

Nixe to see that new go-import works with #:subdir!

Toggle snippet (3 lines)

+(define-public go-github-com-charmbracelet-x-exp-golden

There is a guile funcion for that:

Toggle snippet (11 lines)+      #:modules '((guix build go-build-system)
+                  (guix build utils))
+      #:phases #~(modify-phases %standard-phases
+                   (add-before 'check 'fix-tests
+                     (lambda _
+                       (invoke "chmod"
+                               "-R"
+                               "+w"
+                               "src/github.com/charmbracelet/x/exp/golden"))))))

For any like this, please sort alphabetically:

Toggle snippet (15 lines)+    (propagated-inputs (list go-github-com-sahilm-fuzzy
+                             go-github-com-rivo-uniseg
+                             go-github-com-muesli-termenv
+                             go-github-com-mattn-go-runewidth
+                             go-github-com-lucasb-eyer-go-colorful
+                             go-github-com-dustin-go-humanize
+                             go-github-com-charmbracelet-x-exp-golden
+                             go-github-com-charmbracelet-x-ansi
+                             go-github-com-charmbracelet-lipgloss
+                             go-github-com-charmbracelet-harmonica
+                             go-github-com-charmbracelet-bubbletea
+                             go-github-com-atotto-clipboard
+                             go-github-com-makenowjust-heredoc))

It might be a good case for dedicated issues to split library out of

binary, I can take it.

Toggle snippet (3 lines)

[PATCH 10/16] gnu: go-github-com-itchyny-gojq: Install the library.

Description might need to be a little longer than synopsis, check the

code docstring sometimes modules documented well outside of README:

Toggle snippet (6 lines)

+ (synopsis "Terminal utilities and helpers")

+ (description

+ "@code{term} defines terminal utilities.")

+ (license license:expat)))

Feel free to move to coresponded golang-* module:

Toggle snippet (5 lines)

[PATCH 12/16] gnu: go-github-com-charmbracelet-bubbletea: Remove input labels.

[PATCH 15/16] gnu: go-github-com-charmbracelet-bubbletea: Update to 1.2.3.

Let's keep it in web to reduce module cyles:

Toggle snippet (3 lines)

[PATCH 16/16] gnu: Add go-github-com-noahgorstein-jqp.

In v2 I'll check license and package internals

Thanks,

Oleg

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 01/16] gnu: Add go-github-com-atotto-clipboard.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:a4c05791a07854423b4913ed7f7a1e2aa18f4523.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-atotto-clipboard): New variable.

Change-Id: I4a871983f564034045f4b2ba77f2453cfce5cb2b

---

gnu/packages/xdisorg.scm | 31 +++++++++++++++++++++++++++++++

1 file changed, 31 insertions(+)

Toggle diff (46 lines)diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index a75e9cd6ba..b7d8b1dd99 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1817,6 +1817,37 @@ (define-public gammastep
 less if you are working in front of the screen at night.")
     (license license:gpl3)))
 
+(define-public go-github-com-atotto-clipboard
+  (package
+    (name "go-github-com-atotto-clipboard")
+    (version "0.1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/atotto/clipboard")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ycd8zkgsq9iil9svhlwvhcqwcd7vik73nf8rnyfnn10gpjx97k5"))))
+    (build-system go-build-system)
+    (native-inputs (list xorg-server-for-tests))
+    (propagated-inputs (list xclip))
+    (arguments
+     (list
+      #:import-path "github.com/atotto/clipboard"
+      #:phases #~(modify-phases %standard-phases
+                   (add-before 'check 'start-xorg-server
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       ;; The test suite requires a running X server.
+                       (system "Xvfb :1 &")
+                       (setenv "DISPLAY" ":1"))))))
+    (home-page "https://github.com/atotto/clipboard")
+    (synopsis "Clipboard for Golang")
+    (description
+     "@code{clipboard} provides copying and pasting to the clipboard for Go.")
+    (license license:bsd-3)))
+
 (define-public xscreensaver
   (package
     (name "xscreensaver")

base-commit: 047967c42f237695d5af2af53321c70f157685a3
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 02/16] gnu: Add go-github-com-aymanbagabas-go-udiff.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:323354dea728d447339d65c941aa02754c090dd3.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-aymanbagabas-go-udiff): New variable.

Change-Id: Icac934589b041c9b3b5db0114173d25d0c3f4c34

---

gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++

1 file changed, 28 insertions(+)

Toggle diff (41 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 177ab8a20f..29dbc189e1 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1101,6 +1101,34 @@ (define-public go-github-com-aymanbagabas-go-osc52-v2
 clipboard.")
     (license license:expat)))
 
+(define-public go-github-com-aymanbagabas-go-udiff
+  (package
+    (name "go-github-com-aymanbagabas-go-udiff")
+    (version "0.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/aymanbagabas/go-udiff")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "09p17r8s5flhq6p69z08345q0y99dpb0yyashlwpgxn45xir7y6g"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/aymanbagabas/go-udiff"))
+    (home-page "https://github.com/aymanbagabas/go-udiff")
+    (synopsis "Diffing library for Golang")
+    (description
+     "@code{udiff} (micro-diff, or µDiff) is a library that implements the
+@url{http://www.xmailserver.org/diff2.pdf, Myers' diffing algorithm}.  It aims to
+provide a minimal API to compute and apply diffs with zero dependencies.  It also
+supports generating diffs in the
+@url{https://www.gnu.org/software/diffutils/manual/html_node/Unified-Format.html,
+Unified Format}.")
+    (license license:expat)))
+
 (define-public go-github-com-benbjohnson-clock
   (package
     (name "go-github-com-benbjohnson-clock")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 04/16] gnu: Add go-github-com-kylelemons-godebug-pretty.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:10168ef471c8b7a9a366d5a5302267e0cd3b5a72.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-kylelemons-godebug-pretty): New variable.

Change-Id: Icd7d5fd70cf56d1ca74e9a2cfb929a3344128ba7

---

gnu/packages/golang.scm | 8 ++++++++

1 file changed, 8 insertions(+)

Toggle diff (21 lines)diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 9b3a672887..9670e16104 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4722,6 +4722,14 @@ (define-public go-github-com-kylelemons-godebug
 representation suitable for computing diffs.")
     (license license:asl2.0)))
 
+(define-public go-github-com-kylelemons-godebug-pretty
+  (package
+    (inherit go-github-com-kylelemons-godebug)
+    (name "go-github-com-kylelemons-godebug-pretty")
+    (arguments
+     '(#:import-path "github.com/kylelemons/godebug/pretty"
+       #:unpack-path "github.com/kylelemons/godebug"))))
+
 (define-public go-github-com-kr-text
   (package
     (name "go-github-com-kr-text")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 03/16] gnu: Add go-github-com-makenowjust-heredoc.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:42325c0b0e7a4fd3eef4727f23d0c2d8213024e3.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-makenowjust-heredoc): New variable.

Change-Id: I686dfd6a798da764b004a53a562ca788e70f8cd5

---

gnu/packages/golang-xyz.scm | 23 +++++++++++++++++++++++

1 file changed, 23 insertions(+)

Toggle diff (36 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 29dbc189e1..94d2492c68 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -4858,6 +4858,29 @@ (define-public go-github-com-logrusorgru-aurora-v4
     (native-inputs
      (list go-github-com-stretchr-testify))))
 
+(define-public go-github-com-makenowjust-heredoc
+  (package
+    (name "go-github-com-makenowjust-heredoc")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/makenowjust/heredoc")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18f21zm8n2wlnkz1ylw8rcxmqxyv2rlz8749yfqggm2m0m2884pj"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/MakeNowJust/heredoc"))
+    (home-page "https://github.com/MakeNowJust/heredoc")
+    (synopsis "Here-documents with indent")
+    (description
+     "Package heredoc provides creation of here-documents from raw strings.")
+    (license license:expat)))
+
 (define-public go-github-com-marcinbor85-gohex
   ;; No release, see <https://github.com/marcinbor85/gohex/issues/5>.
   (let ((commit "baab2527a9a2a4abb3dc06baabedfa5e0268b8d8")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 05/16] gnu: Add go-github-com-sahilm-fuzzy.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:babd28361c802b82237de424d6a8677ff7d596f5.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-sahilm-fuzzy): New variable.

Change-Id: Iebf4f8c3848e1e08b2860ac69a5a8d816ac260df

---

gnu/packages/golang-xyz.scm | 26 ++++++++++++++++++++++++++

1 file changed, 26 insertions(+)

Toggle diff (39 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 94d2492c68..a8c84c9e55 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6630,6 +6630,32 @@ (define-public go-github-com-ryanuber-columnize
      "This package implements column-formatted output for Golang.")
     (license license:expat)))
 
+(define-public go-github-com-sahilm-fuzzy
+  (package
+    (name "go-github-com-sahilm-fuzzy")
+    (version "0.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sahilm/fuzzy")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "15j95gm7hcmg09x1b39vc4il8bryv4v0yljvvyq5vyc6iq66qrbz"))))
+    (build-system go-build-system)
+    (native-inputs
+     (list go-github-com-kylelemons-godebug
+           go-github-com-kylelemons-godebug-pretty))
+    (arguments
+     (list #:import-path "github.com/sahilm/fuzzy"))
+    (home-page "https://github.com/sahilm/fuzzy")
+    (synopsis "Fuzzy string matching for Golang")
+    (description
+     "@code{fuzzy} provides fuzzy string matching optimized for filenames and code
+symbols in the style of Sublime Text, VSCode, @code{IntelliJ} IDEA et al.")
+    (license license:expat)))
+
 (define-public go-github-com-schollz-progressbar-v3
   (package
     (name "go-github-com-schollz-progressbar-v3")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 06/16] gnu: Add go-github-com-charmbracelet-x-ansi.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:0ece8158562f3d15c64185871007b775594a3e8c.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-ansi): New variable.

Change-Id: I1451ae9953bc87475413b83bb636a2df14ddc70c

---

gnu/packages/golang-xyz.scm | 29 +++++++++++++++++++++++++++++

1 file changed, 29 insertions(+)

Toggle diff (42 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index a8c84c9e55..d4e34a19b4 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1524,6 +1524,35 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-x-ansi
+  (package
+    (name "go-github-com-charmbracelet-x-ansi")
+    (version "0.5.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "ansi"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "016s67690dr3w3an6m24q6f4vrmwpk0qd4akvvh1dzpfyf4khxd4"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/ansi"
+      #:unpack-path "github.com/charmbracelet/x"))
+    (propagated-inputs (list go-github-com-rivo-uniseg
+                             go-github-com-lucasb-eyer-go-colorful))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "ANSI escape sequence parser and definitions")
+    (description
+     "@code{ansi} defines common ANSI escape sequences based on the
+@url{https://ecma-international.org/publications-and-standards/standards/ecma-48/,
+ECMA-48} specs.")
+    (license license:expat)))
+
 (define-public go-github-com-chzyer-logex
   (package
     (name "go-github-com-chzyer-logex")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 07/16] gnu: Add go-github-com-charmbracelet-x-exp-golden.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:d934f3d64ffc13abf3b0c2ec1b2718789cfcb52f.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-exp-golden): New variable.

Change-Id: I7fa815433d9a83e4562bdc769312dd05e0a298da

---

gnu/packages/golang-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++

1 file changed, 36 insertions(+)

Toggle diff (49 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index d4e34a19b4..61ead1981d 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1553,6 +1553,42 @@ (define-public go-github-com-charmbracelet-x-ansi
 ECMA-48} specs.")
     (license license:expat)))
 
+(define-public go-github-com-charmbracelet-x-exp-golden
+  (package
+    (name "go-github-com-charmbracelet-x-exp-golden")
+    (version "0.0.0-20241121171228-5bc00623ea2f")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "exp/golden"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "016s67690dr3w3an6m24q6f4vrmwpk0qd4akvvh1dzpfyf4khxd4"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/exp/golden"
+      #:unpack-path "github.com/charmbracelet/x/"
+      #:phases #~(modify-phases %standard-phases
+                   (add-before 'check 'fix-tests
+                     (lambda _
+                       (let ((dir "src/github.com/charmbracelet/x/exp/golden"))
+                         (for-each (lambda (f)
+                                     (if (file-is-directory? f)
+                                         (chmod f #o666)
+                                         (chmod f #o644)))
+                                   (find-files dir))))))))
+    (propagated-inputs (list go-github-com-aymanbagabas-go-udiff))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "Verify @code{.golden} file equality")
+    (description "Golden files (@code{.golden}) contain the raw expected output of
+tests, which can contain control codes and escape sequences.  @code{golden} package
+provides an API for comparing Golden files.")
+    (license license:expat)))
+
 (define-public go-github-com-chzyer-logex
   (package
     (name "go-github-com-chzyer-logex")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 09/16] gnu: Add go-github-com-charmbracelet-bubbles.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:efaf2b5a37370a82e35bd8859ed6a98b626e9fcb.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-bubbles): New variable.

Change-Id: I090db91509590ca9a8cab1a209d00bcc12b524e7

---

gnu/packages/golang-xyz.scm | 39 ++++++++++++++++++++++++++++++++++++-

1 file changed, 38 insertions(+), 1 deletion(-)

Toggle diff (59 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 4097cdd42a..f362595ec8 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -85,7 +85,8 @@ (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 specifications))
+  #:use-module (gnu packages specifications)
+  #:use-module (gnu packages xdisorg))
 
 ;;; Commentary:
 ;;;
@@ -1524,6 +1525,42 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-bubbles
+  (package
+    (name "go-github-com-charmbracelet-bubbles")
+    (version "0.20.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/bubbles")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qdcln01bq9lk6r33b8p5d5x850wgd8ddq57n4bg3xn76z2fd657"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:import-path "github.com/charmbracelet/bubbles"))
+    (propagated-inputs (list go-github-com-atotto-clipboard
+                             go-github-com-charmbracelet-bubbletea
+                             go-github-com-charmbracelet-harmonica
+                             go-github-com-charmbracelet-lipgloss
+                             go-github-com-charmbracelet-x-ansi
+                             go-github-com-charmbracelet-x-exp-golden
+                             go-github-com-dustin-go-humanize
+                             go-github-com-lucasb-eyer-go-colorful
+                             go-github-com-makenowjust-heredoc
+                             go-github-com-mattn-go-runewidth
+                             go-github-com-muesli-termenv
+                             go-github-com-rivo-uniseg
+                             go-github-com-sahilm-fuzzy))
+    (home-page "https://github.com/charmbracelet/bubbles")
+    (synopsis "TUI components for Bubble Tea library")
+    (description
+     "@code{bubbles} is a library that provide components for
+@@url{https://github.com/charmbracelet/bubbletea, Bubble Tea} applications.")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-lipgloss
   (package
     (name "go-github-com-charmbracelet-lipgloss")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 08/16] gnu: Add go-github-com-charmbracelet-lipgloss.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:539cf5ae3e8f770d1f9aa043f08146b5a3b6e874.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-lipgloss): New variable.

Change-Id: I73050c96830025ed63be7567873f8faf7573453d

---

gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++

1 file changed, 28 insertions(+)

Toggle diff (41 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 61ead1981d..4097cdd42a 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1524,6 +1524,34 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-lipgloss
+  (package
+    (name "go-github-com-charmbracelet-lipgloss")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/lipgloss")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0d1aqzsjy0mcliydbfbg223xxpf9646frbj35ac4fisdy3w3n142"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/lipgloss"))
+    (propagated-inputs (list go-github-com-aymanbagabas-go-udiff
+                             go-github-com-charmbracelet-x-ansi
+                             go-github-com-charmbracelet-x-exp-golden
+                             go-github-com-muesli-termenv
+                             go-github-com-rivo-uniseg))
+    (home-page "https://github.com/charmbracelet/lipgloss")
+    (synopsis "Style definitions for nice terminal layouts")
+    (description
+     "Style definitions for nice terminal layouts.  Built with TUIs in mind.")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-x-ansi
   (package
     (name "go-github-com-charmbracelet-x-ansi")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 11/16] gnu: gojq: Install the binary only.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:d17140480be6087d774c11e87d9e14829221ab30.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/web.scm (gojq): Install the binary only.

Change-Id: I6a4d0cbdba385460d7ab43d62fe1897922a7c7e9

---

gnu/packages/web.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 8245438c3b..da23192800 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5627,7 +5627,8 @@ (define-public gojq
     (arguments
      (ensure-keyword-arguments
       (package-arguments go-github-com-itchyny-gojq)
-      (list #:install-source? #f)))))
+      (list #:import-path "github.com/itchyny/gojq/cmd/gojq"
+            #:install-source? #f)))))
 
 (define-public pup
   (let ((revision "1")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 10/16] gnu: go-github-com-itchyny-gojq: Install the library.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:49554632698f8c4c18456f9be208b4cf9b69514c.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/web.scm (go-github-com-itchyny-gojq): Install the library

files instead of "gojq" binary.

Change-Id: I72235e0cfeee81b0e7490ebd9d92d0d36ceb1844

---

gnu/packages/web.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d53815eadb..8245438c3b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5605,7 +5605,7 @@ (define-public go-github-com-itchyny-gojq
     (build-system go-build-system)
     (arguments
      (list
-      #:import-path "github.com/itchyny/gojq/cmd/gojq"
+      #:import-path "github.com/itchyny/gojq/"
       #:unpack-path "github.com/itchyny/gojq"))
     (inputs
      (list go-github-com-google-go-cmp
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 13/16] gnu: Add go-github-com-charmbracelet-x-term.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:5532a4c8248acd461596e4063d671b891facbc8c.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-term): New variable.

Change-Id: I854febc3a3010f39051ee6fbd4a159993043d41e

---

gnu/packages/golang-xyz.scm | 33 +++++++++++++++++++++++++++++++++

1 file changed, 33 insertions(+)

Toggle diff (46 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index f362595ec8..0f5605901f 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1618,6 +1618,39 @@ (define-public go-github-com-charmbracelet-x-ansi
 ECMA-48} specs.")
     (license license:expat)))
 
+(define-public go-github-com-charmbracelet-x-term
+  (package
+    (name "go-github-com-charmbracelet-x-term")
+    (version "0.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "term"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1shw55110fnn4xz80wmgr18czmiil6z1j064m90iw8c7j9llfzn5"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/term"
+      #:unpack-path "github.com/charmbracelet/x"))
+    (propagated-inputs (list go-github-com-rivo-uniseg
+                             go-golang-org-x-sys))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "Terminal utilities and helpers")
+    (description
+     "@code{term} provides an API for working with terminals that includes:
+@itemize
+@item Switching a terminal to the raw mode.
+@item Getting, setting and restoring the state of a terminal.
+@item Getting size of a terminal.
+@item Reading passwords from a terminal without a local echo.
+@end itemize")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-x-exp-golden
   (package
     (name "go-github-com-charmbracelet-x-exp-golden")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 12/16] gnu: go-github-com-charmbracelet-bubbletea: Remove input labels.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:27323549f9e611bbada9c282bca6240497acb006.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-charmbracelet-bubbletea):

[propagated-inputs]: Remove input labels.

Change-Id: If2dc587649c4e44aabf025de915655887d04530c

---

gnu/packages/golang.scm | 20 ++++++++++----------

1 file changed, 10 insertions(+), 10 deletions(-)

Toggle diff (33 lines)diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 9670e16104..df5111922b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7052,16 +7052,16 @@ (define-public go-github-com-charmbracelet-bubbletea
                          (for-each delete-file-recursively
                                    '("examples" "tutorials"))))))))
     (propagated-inputs
-     `(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty)
-       ("github.com/muesli/termenv" ,go-github-com-muesli-termenv)
-       ("github.com/mattn/go-runewidth" ,go-github-com-mattn-go-runewidth)
-       ("go-github-com-muesli-reflow" ,go-github-com-muesli-reflow)
-       ("go-github-com-lucasb-eyer-go-colorful" ,go-github-com-lucasb-eyer-go-colorful)
-       ("github.com/containerd/console" ,go-github-com-containerd-console)
-       ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
-       ("go-golang-org-x-sys" ,go-golang-org-x-sys)
-       ("go-golang-org-x-term" ,go-golang-org-x-term)
-       ("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty)))
+     (list go-github-com-mattn-go-isatty
+           go-github-com-muesli-termenv
+           go-github-com-mattn-go-runewidth
+           go-github-com-muesli-reflow
+           go-github-com-lucasb-eyer-go-colorful
+           go-github-com-containerd-console
+           go-golang-org-x-crypto
+           go-golang-org-x-sys
+           go-golang-org-x-term
+           go-github-com-mattn-go-isatty))
     (home-page "https://github.com/charmbracelet/bubbletea")
     (synopsis "Powerful little TUI framework")
     (description
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 14/16] gnu: Add go-github-com-muesli-ansi.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:bc86d4ca381601823a68779d6a7d2e49eab66cba.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-muesli-ansi): New variable.

Change-Id: I3dbbd8af04373997fcb3c60872dff14ab1b2b76a

---

gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (38 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 0f5605901f..7a2c78192a 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -5687,6 +5687,31 @@ (define-public go-github-com-msteinert-pam-v2
        ((#:import-path _ "github.com/msteinert/pam")
         "github.com/msteinert/pam/v2")))))
 
+(define-public go-github-com-muesli-ansi
+  (package
+    (name "go-github-com-muesli-ansi")
+    (version "0.0.0-20230316100256-276c6243b2f6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/muesli/ansi")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jr8kgn3vb72jmf4a8n52g876mfpbvk3310p8gsg7jkn338af4m9"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:import-path "github.com/muesli/ansi"))
+    (propagated-inputs
+     (list go-github-com-mattn-go-runewidth
+           go-github-com-rivo-uniseg))
+    (home-page "https://github.com/muesli/ansi")
+    (synopsis "Raw ANSI sequence helpers")
+    (description
+     "ANSI sequence helpers for working with raw ANSI sequences.")
+    (license license:expat)))
+
 (define-public go-github-com-muesli-cancelreader
   (package
     (name "go-github-com-muesli-cancelreader")
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 15/16] gnu: go-github-com-charmbracelet-bubbletea: Update to 1.2.3.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:4a8985f97204d40f187337d99609ea13419c1131.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-charmbracelet-bubbletea): Update to 1.2.3.
[propagated-inputs]: Add go-github-com-muesli-ansi,
go-github-com-muesli-cancelreader, go-github-com-charmbracelet-lipgloss,
go-github-com-charmbracelet-x-term, go-github-com-charmbracelet-x-ansi, and
go-golang-org-x-sync.  Sort inputs alphabetically.
[arguments] <phases>: Fix tests that are failing due to newer version of
"go-github-com-charmbracelet-x-ansi" package.

Change-Id: Ifdb3074f342b34c07c0e7ab47341b159d1eea0c2
---
 gnu/packages/golang.scm | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

Toggle diff (68 lines)diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index df5111922b..401626326b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7030,7 +7030,7 @@ (define-public go-github-com-rivo-uniseg
 (define-public go-github-com-charmbracelet-bubbletea
   (package
     (name "go-github-com-charmbracelet-bubbletea")
-    (version "0.13.2")
+    (version "1.2.3")
     (source
      (origin
        (method git-fetch)
@@ -7040,7 +7040,7 @@ (define-public go-github-com-charmbracelet-bubbletea
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1105cggi5fwqx69m0vrhgwx6kaw82w4ahn58sj0a81603c4yvrk0"))))
+         "0ggkl29qixgin5av1mbnwfbb31kmwpczh8pgpjsx9z277fs55mph"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -7050,18 +7050,36 @@ (define-public go-github-com-charmbracelet-bubbletea
                      (lambda* (#:key import-path #:allow-other-keys)
                        (with-directory-excursion (string-append "src/" import-path)
                          (for-each delete-file-recursively
-                                   '("examples" "tutorials"))))))))
+                                   '("examples" "tutorials")))))
+                   (add-before 'check 'fix-tests
+                     (lambda _
+                       ;; XXX: The package requires
+                       ;; "go-github-com-charmbracelet-x-ansi" version 0.4.5; with
+                       ;; the newer version of "ansi", some "bubbletea" screen tests
+                       ;; fail as "ansi" 0.5.2 handles escape sequences a little bit
+                       ;; differently.
+                       (substitute* "src/github.com/charmbracelet/bubbletea/screen_test.go"
+                         (("x1b\\[0K")
+                          "x1b[K")
+                         (("x1b\\[2;0H")
+                          "x1b[2;H")))))))
     (propagated-inputs
-     (list go-github-com-mattn-go-isatty
-           go-github-com-muesli-termenv
+     (list go-github-com-charmbracelet-lipgloss
+           go-github-com-charmbracelet-x-ansi
+           go-github-com-charmbracelet-x-term
+           go-github-com-containerd-console
+           go-github-com-lucasb-eyer-go-colorful
+           go-github-com-mattn-go-isatty
+           go-github-com-mattn-go-isatty
            go-github-com-mattn-go-runewidth
+           go-github-com-muesli-ansi
+           go-github-com-muesli-cancelreader
            go-github-com-muesli-reflow
-           go-github-com-lucasb-eyer-go-colorful
-           go-github-com-containerd-console
+           go-github-com-muesli-termenv
            go-golang-org-x-crypto
+           go-golang-org-x-sync
            go-golang-org-x-sys
-           go-golang-org-x-term
-           go-github-com-mattn-go-isatty))
+           go-golang-org-x-term))
     (home-page "https://github.com/charmbracelet/bubbletea")
     (synopsis "Powerful little TUI framework")
     (description
-- 
2.46.0

Artyom V. Poptsov wrote 4 months ago

[PATCH v2 16/16] gnu: Add go-github-com-noahgorstein-jqp.

Recipients:(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:81d7e9cad0718d063ebaacfbfaa552e7df84f219.1732444026.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-noahgorstein-jqp): New variable.

Change-Id: I736e039a456960e0e5864d7d197b2a6a823bbe58

---

gnu/packages/golang-xyz.scm | 37 ++++++++++++++++++++++++++++++++++++-

1 file changed, 36 insertions(+), 1 deletion(-)

Toggle diff (57 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 7a2c78192a..b137729ca2 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -86,7 +86,8 @@ (define-module (gnu packages golang-xyz)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages specifications)
-  #:use-module (gnu packages xdisorg))
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages web))
 
 ;;; Commentary:
 ;;;
@@ -6078,6 +6079,40 @@ (define-public go-github-com-niklasfasching-go-org
 pretty printed rendering in Golang.")
     (license license:expat)))
 
+(define-public go-github-com-noahgorstein-jqp
+  (package
+    (name "go-github-com-noahgorstein-jqp")
+    (version "0.7.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/noahgorstein/jqp")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "11xqh4113gkzp32hd4dg4cvjp40q3hxfh3889wd4bw2snl0alvcb"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.22
+      #:embed-files #~(list ".*.xml")
+      #:import-path "github.com/noahgorstein/jqp"))
+    (propagated-inputs (list go-github-com-spf13-viper
+                             go-github-com-spf13-cobra
+                             go-github-com-muesli-termenv
+                             go-github-com-itchyny-gojq
+                             go-github-com-itchyny-timefmt-go
+                             go-github-com-charmbracelet-lipgloss
+                             go-github-com-charmbracelet-bubbletea
+                             go-github-com-charmbracelet-bubbles
+                             go-github-com-atotto-clipboard
+                             go-github-com-alecthomas-chroma-v2))
+    (home-page "https://github.com/noahgorstein/jqp")
+    (synopsis "jqp")
+    (description "a TUI playground for exploring jq.")
+    (license license:expat)))
+
 (define-public go-github-com-nsqio-go-diskqueue
   (package
     (name "go-github-com-nsqio-go-diskqueue")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

Re: [PATCH 00/16] gnu: Add go-github-com-noahgorstein-jqp.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:87y1154xsk.fsf@gmail.com

The patch

Toggle snippet (6 lines)

gnu: go-github-com-charmbracelet-bubbletea: Remove input labels.

* gnu/packages/golang.scm (go-github-com-charmbracelet-bubbletea):

[propagated-inputs]: Remove input labels.

pushed to the "master" branch separately as
a2a3264bb38568e892e69e64dcfd12829a9975ce (as suggested by Sharlatan
Hellseher.)

- avp

-- 
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE  B57C E9C5 A2D9 0898 A02F

Sharlatan Hellseher wrote 3 months ago

[PATCH 00/15] gnu: Add go-jqp.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:cover.1732837202.git.sharlatanus@gmail.com

Hi,

I could apply your patches and build them successfully.

Please see the v3 which contains some package location shift (sorry if I've

confused you in first place), description style fixtures and phases

modifications.

Feel free to merge when you feel it's the time ;-)

Artyom V. Poptsov (15):

gnu: Add go-github-com-atotto-clipboard.

gnu: Add go-github-com-aymanbagabas-go-udiff.

gnu: Add go-github-com-makenowjust-heredoc.

gnu: Add go-github-com-kylelemons-godebug-pretty.

gnu: Add go-github-com-sahilm-fuzzy.

gnu: Add go-github-com-charmbracelet-x-ansi.

gnu: Add go-github-com-charmbracelet-x-exp-golden.

gnu: Add go-github-com-charmbracelet-x-term.

gnu: Add go-github-com-charmbracelet-lipgloss.

gnu: Add go-github-com-charmbracelet-bubbles.

gnu: Add go-github-com-muesli-ansi.

gnu: go-github-com-itchyny-gojq: Install the library.

gnu: gojq: Adjust import path.

gnu: go-github-com-charmbracelet-bubbletea: Update to 1.2.3.

gnu: Add go-jqp.

gnu/packages/golang-xyz.scm | 311 +++++++++++++++++++++++++++++++++++-

gnu/packages/golang.scm | 57 +++++--

gnu/packages/web.scm | 45 +++++-

3 files changed, 395 insertions(+), 18 deletions(-)

base-commit: cf16dcb95fee602fa2cd3377de769c57a123f9c1

2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 01/15] gnu: Add go-github-com-atotto-clipboard.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:7c3aa14789ff6d0c5ed7f790d2686bf102a07624.1732837202.git.sharlatanus@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-atotto-clipboard): New variable.

Change-Id: I4a871983f564034045f4b2ba77f2453cfce5cb2b

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 37 ++++++++++++++++++++++++++++++++++++-

1 file changed, 36 insertions(+), 1 deletion(-)

Toggle diff (57 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 0ef4c46d9f..63ac100349 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -85,7 +85,9 @@ (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 specifications))
+  #:use-module (gnu packages specifications)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages xorg))
 
 ;;; Commentary:
 ;;;
@@ -958,6 +960,39 @@ (define-public go-github-com-asaskevich-govalidator
 @url{https://github.com/chriso/validator.js,validator.js}.")
     (license license:expat)))
 
+(define-public go-github-com-atotto-clipboard
+  (package
+    (name "go-github-com-atotto-clipboard")
+    (version "0.1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/atotto/clipboard")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ycd8zkgsq9iil9svhlwvhcqwcd7vik73nf8rnyfnn10gpjx97k5"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/atotto/clipboard"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'start-xorg-server
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; The test suite requires a running X server.
+              (system "Xvfb :1 &")
+              (setenv "DISPLAY" ":1"))))))
+    (native-inputs
+     (list xorg-server-for-tests))
+    (propagated-inputs (list xclip))
+    (home-page "https://github.com/atotto/clipboard")
+    (synopsis "Clipboard for Golang")
+    (description
+     "@code{clipboard} provides copying and pasting to the clipboard for Go.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-audriusbutkevicius-recli
   (package
     (name "go-github-com-audriusbutkevicius-recli")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 05/15] gnu: Add go-github-com-sahilm-fuzzy.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:4fb766c59c717197cb44af35b634392cd9826779.1732837202.git.sharlatanus@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-sahilm-fuzzy): New variable.

Change-Id: Iebf4f8c3848e1e08b2860ac69a5a8d816ac260df

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 26 ++++++++++++++++++++++++++

1 file changed, 26 insertions(+)

Toggle diff (39 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index fefc5c6a97..2ff995bb14 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6666,6 +6666,32 @@ (define-public go-github-com-ryanuber-columnize
      "This package implements column-formatted output for Golang.")
     (license license:expat)))
 
+(define-public go-github-com-sahilm-fuzzy
+  (package
+    (name "go-github-com-sahilm-fuzzy")
+    (version "0.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sahilm/fuzzy")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "15j95gm7hcmg09x1b39vc4il8bryv4v0yljvvyq5vyc6iq66qrbz"))))
+    (build-system go-build-system)
+    (native-inputs
+     (list go-github-com-kylelemons-godebug
+           go-github-com-kylelemons-godebug-pretty))
+    (arguments
+     (list #:import-path "github.com/sahilm/fuzzy"))
+    (home-page "https://github.com/sahilm/fuzzy")
+    (synopsis "Fuzzy string matching for Golang")
+    (description
+     "@code{fuzzy} provides fuzzy string matching optimized for filenames and code
+symbols in the style of Sublime Text, VSCode, @code{IntelliJ} IDEA et al.")
+    (license license:expat)))
+
 (define-public go-github-com-schollz-progressbar-v3
   (package
     (name "go-github-com-schollz-progressbar-v3")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 02/15] gnu: Add go-github-com-aymanbagabas-go-udiff.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:fa66fbe4336f44541cf71643290ae76e08fb88fc.1732837202.git.sharlatanus@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-aymanbagabas-go-udiff): New variable.

Change-Id: Icac934589b041c9b3b5db0114173d25d0c3f4c34

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++

1 file changed, 28 insertions(+)

Toggle diff (41 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 63ac100349..561b82af11 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1136,6 +1136,34 @@ (define-public go-github-com-aymanbagabas-go-osc52-v2
 clipboard.")
     (license license:expat)))
 
+(define-public go-github-com-aymanbagabas-go-udiff
+  (package
+    (name "go-github-com-aymanbagabas-go-udiff")
+    (version "0.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/aymanbagabas/go-udiff")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "09p17r8s5flhq6p69z08345q0y99dpb0yyashlwpgxn45xir7y6g"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/aymanbagabas/go-udiff"))
+    (home-page "https://github.com/aymanbagabas/go-udiff")
+    (synopsis "Diffing library for Golang")
+    (description
+     "@code{udiff} (micro-diff, or µDiff) is a library that implements the
+@url{http://www.xmailserver.org/diff2.pdf, Myers' diffing algorithm}.  It aims to
+provide a minimal API to compute and apply diffs with zero dependencies.  It also
+supports generating diffs in the
+@url{https://www.gnu.org/software/diffutils/manual/html_node/Unified-Format.html,
+Unified Format}.")
+    (license license:expat)))
+
 (define-public go-github-com-benbjohnson-clock
   (package
     (name "go-github-com-benbjohnson-clock")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 07/15] gnu: Add go-github-com-charmbracelet-x-exp-golden.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:d102d2e00d6f232a5f767371bd70ecb744b8fd76.1732837202.git.sharlatanus@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-exp-golden): New variable.

Change-Id: I7fa815433d9a83e4562bdc769312dd05e0a298da

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 42 +++++++++++++++++++++++++++++++++++++

1 file changed, 42 insertions(+)

Toggle diff (55 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index d3b478dab0..81fd07f402 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1589,6 +1589,48 @@ (define-public go-github-com-charmbracelet-x-ansi
 ECMA-48} specs.")
     (license license:expat)))
 
+(define-public go-github-com-charmbracelet-x-exp-golden
+  (package
+    (name "go-github-com-charmbracelet-x-exp-golden")
+    (version "0.0.0-20241121171228-5bc00623ea2f")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "exp/golden"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "016s67690dr3w3an6m24q6f4vrmwpk0qd4akvvh1dzpfyf4khxd4"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/exp/golden"
+      #:unpack-path "github.com/charmbracelet/x/"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda* (#:key import-path #:allow-other-keys)
+              ;; Tests need to write to that files.
+              (with-directory-excursion (string-append "src/" import-path)
+                (make-file-writable "testdata/TestRequireEqualUpdate.golden")
+                (make-file-writable "testdata/TestRequireEqualNoUpdate.golden"))))
+          (add-after 'check 'post-check
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                ;; Remove modified testdata just in case.
+                (delete-file-recursively "testdata")))))))
+    (propagated-inputs
+     (list go-github-com-aymanbagabas-go-udiff))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "Verify @code{.golden} file equality")
+    (description
+     "Golden files (@code{.golden}) contain the raw expected output of
+tests,which can contain control codes and escape sequences.  @code{golden}
+package provides an API for comparing Golden files.")
+    (license license:expat)))
+
 (define-public go-github-com-chzyer-logex
   (package
     (name "go-github-com-chzyer-logex")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 03/15] gnu: Add go-github-com-makenowjust-heredoc.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:159df2b2f11adbc94f14eab0806202476941ed5e.1732837202.git.sharlatanus@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-makenowjust-heredoc): New variable.

Change-Id: I686dfd6a798da764b004a53a562ca788e70f8cd5

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++

1 file changed, 24 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 561b82af11..fefc5c6a97 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -4893,6 +4893,30 @@ (define-public go-github-com-logrusorgru-aurora-v4
     (native-inputs
      (list go-github-com-stretchr-testify))))
 
+(define-public go-github-com-makenowjust-heredoc
+  (package
+    (name "go-github-com-makenowjust-heredoc")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/makenowjust/heredoc")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18f21zm8n2wlnkz1ylw8rcxmqxyv2rlz8749yfqggm2m0m2884pj"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/MakeNowJust/heredoc"))
+    (home-page "https://github.com/MakeNowJust/heredoc")
+    (synopsis "Here-documents with indent")
+    (description
+     "This package implements a functionality of creating here-documents from
+raw strings.")
+    (license license:expat)))
+
 (define-public go-github-com-marcinbor85-gohex
   ;; No release, see <https://github.com/marcinbor85/gohex/issues/5>.
   (let ((commit "baab2527a9a2a4abb3dc06baabedfa5e0268b8d8")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 04/15] gnu: Add go-github-com-kylelemons-godebug-pretty.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:843fcbade13af55acf931921e7270fa10b689caf.1732837202.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-kylelemons-godebug-pretty): New variable.

Change-Id: Icd7d5fd70cf56d1ca74e9a2cfb929a3344128ba7

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang.scm | 10 ++++++++++

1 file changed, 10 insertions(+)

Toggle diff (23 lines)diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4db14a5ae1..88878b6b23 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4722,6 +4722,16 @@ (define-public go-github-com-kylelemons-godebug
 representation suitable for computing diffs.")
     (license license:asl2.0)))
 
+;; TODO: Merge with go-github-com-kylelemons-godebug and provide both module;
+;; for go-team.
+(define-public go-github-com-kylelemons-godebug-pretty
+  (package
+    (inherit go-github-com-kylelemons-godebug)
+    (name "go-github-com-kylelemons-godebug-pretty")
+    (arguments
+     '(#:import-path "github.com/kylelemons/godebug/pretty"
+       #:unpack-path "github.com/kylelemons/godebug"))))
+
 (define-public go-github-com-kr-text
   (package
     (name "go-github-com-kr-text")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 06/15] gnu: Add go-github-com-charmbracelet-x-ansi.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:5d047928a4b8e40e2a397096d3f6654084df7dfb.1732837202.git.sharlatanus@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-ansi): New variable.

Change-Id: I1451ae9953bc87475413b83bb636a2df14ddc70c

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 30 ++++++++++++++++++++++++++++++

1 file changed, 30 insertions(+)

Toggle diff (43 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 2ff995bb14..d3b478dab0 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1559,6 +1559,36 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-x-ansi
+  (package
+    (name "go-github-com-charmbracelet-x-ansi")
+    (version "0.5.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "ansi"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "016s67690dr3w3an6m24q6f4vrmwpk0qd4akvvh1dzpfyf4khxd4"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/ansi"
+      #:unpack-path "github.com/charmbracelet/x"))
+    (propagated-inputs
+     (list go-github-com-lucasb-eyer-go-colorful
+           go-github-com-rivo-uniseg))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "ANSI escape sequence parser and definitions")
+    (description
+     "@code{ansi} defines common ANSI escape sequences based on the
+@url{https://ecma-international.org/publications-and-standards/standards/ecma-48/,
+ECMA-48} specs.")
+    (license license:expat)))
+
 (define-public go-github-com-chzyer-logex
   (package
     (name "go-github-com-chzyer-logex")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 08/15] gnu: Add go-github-com-charmbracelet-x-term.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:fcd3b2f8b72509001876b0253f0ad1013704fe08.1732837202.git.sharlatanus@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-term): New variable.

Change-Id: I854febc3a3010f39051ee6fbd4a159993043d41e

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 33 +++++++++++++++++++++++++++++++++

1 file changed, 33 insertions(+)

Toggle diff (46 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 81fd07f402..81dc15ae5d 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1589,6 +1589,39 @@ (define-public go-github-com-charmbracelet-x-ansi
 ECMA-48} specs.")
     (license license:expat)))
 
+(define-public go-github-com-charmbracelet-x-term
+  (package
+    (name "go-github-com-charmbracelet-x-term")
+    (version "0.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "term"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1shw55110fnn4xz80wmgr18czmiil6z1j064m90iw8c7j9llfzn5"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/term"
+      #:unpack-path "github.com/charmbracelet/x"))
+    (propagated-inputs (list go-github-com-rivo-uniseg
+                             go-golang-org-x-sys))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "Terminal utilities and helpers")
+    (description
+     "@code{term} provides an API for working with terminals that includes:
+@itemize
+@item Switching a terminal to the raw mode.
+@item Getting, setting and restoring the state of a terminal.
+@item Getting size of a terminal.
+@item Reading passwords from a terminal without a local echo.
+@end itemize")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-x-exp-golden
   (package
     (name "go-github-com-charmbracelet-x-exp-golden")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 09/15] gnu: Add go-github-com-charmbracelet-lipgloss.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:3430da64c2f5ba13be59874a91777ff12bab42e9.1732837202.git.sharlatanus@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-lipgloss): New variable.

Change-Id: I73050c96830025ed63be7567873f8faf7573453d

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 29 +++++++++++++++++++++++++++++

1 file changed, 29 insertions(+)

Toggle diff (42 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 81dc15ae5d..7abfe589cc 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1559,6 +1559,35 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-lipgloss
+  (package
+    (name "go-github-com-charmbracelet-lipgloss")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/lipgloss")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0d1aqzsjy0mcliydbfbg223xxpf9646frbj35ac4fisdy3w3n142"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/lipgloss"))
+    (propagated-inputs
+     (list go-github-com-aymanbagabas-go-udiff
+           go-github-com-charmbracelet-x-ansi
+           go-github-com-charmbracelet-x-exp-golden
+           go-github-com-muesli-termenv
+           go-github-com-rivo-uniseg))
+    (home-page "https://github.com/charmbracelet/lipgloss")
+    (synopsis "Style definitions for nice terminal layouts")
+    (description
+     "Style definitions for nice terminal layouts.  Built with TUIs in mind.")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-x-ansi
   (package
     (name "go-github-com-charmbracelet-x-ansi")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 14/15] gnu: go-github-com-charmbracelet-bubbletea: Update to 1.2.3.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:6da494a57195d49df08d160de94f03df1b7b554c.1732837202.git.sharlatanus@gmail.com

From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>

* gnu/packages/golang.scm (go-github-com-charmbracelet-bubbletea): Update to 1.2.3.
[propagated-inputs]: Add go-github-com-muesli-ansi,
go-github-com-muesli-cancelreader, go-github-com-charmbracelet-lipgloss,
go-github-com-charmbracelet-x-term, go-github-com-charmbracelet-x-ansi, and
go-golang-org-x-sync.  Sort inputs alphabetically.
[arguments] <phases>: Fix tests that are failing due to newer version of
"go-github-com-charmbracelet-x-ansi" package.

Change-Id: Ifdb3074f342b34c07c0e7ab47341b159d1eea0c2
Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/golang.scm | 47 +++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 14 deletions(-)

Toggle diff (76 lines)diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 88878b6b23..b3d0c59b3e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7032,7 +7032,7 @@ (define-public go-github-com-rivo-uniseg
 (define-public go-github-com-charmbracelet-bubbletea
   (package
     (name "go-github-com-charmbracelet-bubbletea")
-    (version "0.13.2")
+    (version "1.2.3")
     (source
      (origin
        (method git-fetch)
@@ -7042,28 +7042,47 @@ (define-public go-github-com-charmbracelet-bubbletea
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1105cggi5fwqx69m0vrhgwx6kaw82w4ahn58sj0a81603c4yvrk0"))))
+         "0ggkl29qixgin5av1mbnwfbb31kmwpczh8pgpjsx9z277fs55mph"))))
     (build-system go-build-system)
     (arguments
      (list
       #:import-path "github.com/charmbracelet/bubbletea"
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'remove-examples
-                     (lambda* (#:key import-path #:allow-other-keys)
-                       (with-directory-excursion (string-append "src/" import-path)
-                         (for-each delete-file-recursively
-                                   '("examples" "tutorials"))))))))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-examples
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (for-each delete-file-recursively
+                          '("examples" "tutorials")))))
+          (add-before 'check 'fix-tests
+            (lambda _
+              ;; XXX: The package requires
+              ;; "go-github-com-charmbracelet-x-ansi" version 0.4.5; with the
+              ;; newer version of "ansi", some "bubbletea" screen tests fail
+              ;; as "ansi" 0.5.2 handles escape sequences a little bit
+              ;; differently.
+              (substitute* "src/github.com/charmbracelet/bubbletea/screen_test.go"
+                (("x1b\\[0K")
+                 "x1b[K")
+                (("x1b\\[2;0H")
+                 "x1b[2;H")))))))
     (propagated-inputs
-     (list go-github-com-mattn-go-isatty
-           go-github-com-muesli-termenv
+     (list go-github-com-charmbracelet-lipgloss
+           go-github-com-charmbracelet-x-ansi
+           go-github-com-charmbracelet-x-term
+           go-github-com-containerd-console
+           go-github-com-lucasb-eyer-go-colorful
+           go-github-com-mattn-go-isatty
+           go-github-com-mattn-go-isatty
            go-github-com-mattn-go-runewidth
+           go-github-com-muesli-ansi
+           go-github-com-muesli-cancelreader
            go-github-com-muesli-reflow
-           go-github-com-lucasb-eyer-go-colorful
-           go-github-com-containerd-console
+           go-github-com-muesli-termenv
            go-golang-org-x-crypto
+           go-golang-org-x-sync
            go-golang-org-x-sys
-           go-golang-org-x-term
-           go-github-com-mattn-go-isatty))
+           go-golang-org-x-term))
     (home-page "https://github.com/charmbracelet/bubbletea")
     (synopsis "Powerful little TUI framework")
     (description
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 10/15] gnu: Add go-github-com-charmbracelet-bubbles.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:f46e68a4bbd7673d28a699c84f6a282cdb6cc71f.1732837202.git.sharlatanus@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-bubbles): New variable.

Change-Id: I090db91509590ca9a8cab1a209d00bcc12b524e7

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++

1 file changed, 37 insertions(+)

Toggle diff (50 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 7abfe589cc..6d54c9efbd 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1559,6 +1559,43 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-bubbles
+  (package
+    (name "go-github-com-charmbracelet-bubbles")
+    (version "0.20.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/bubbles")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qdcln01bq9lk6r33b8p5d5x850wgd8ddq57n4bg3xn76z2fd657"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:import-path "github.com/charmbracelet/bubbles"))
+    (propagated-inputs
+     (list go-github-com-atotto-clipboard
+           go-github-com-charmbracelet-bubbletea
+           go-github-com-charmbracelet-harmonica
+           go-github-com-charmbracelet-lipgloss
+           go-github-com-charmbracelet-x-ansi
+           go-github-com-charmbracelet-x-exp-golden
+           go-github-com-dustin-go-humanize
+           go-github-com-lucasb-eyer-go-colorful
+           go-github-com-makenowjust-heredoc
+           go-github-com-mattn-go-runewidth
+           go-github-com-muesli-termenv
+           go-github-com-rivo-uniseg
+           go-github-com-sahilm-fuzzy))
+    (home-page "https://github.com/charmbracelet/bubbles")
+    (synopsis "TUI components for Bubble Tea library")
+    (description
+     "@code{bubbles} is a library that provide components for
+@@url{https://github.com/charmbracelet/bubbletea, Bubble Tea} applications.")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-lipgloss
   (package
     (name "go-github-com-charmbracelet-lipgloss")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 15/15] gnu: Add go-jqp.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:ba8b2dd62a38bcc3fcded136d2e5fbc098a3e58d.1732837202.git.sharlatanus@gmail.com

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

Change-Id: I736e039a456960e0e5864d7d197b2a6a823bbe58

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/web.scm | 39 +++++++++++++++++++++++++++++++++++++++

1 file changed, 39 insertions(+)

Toggle diff (52 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index f574c5c9bb..2439a6962f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5629,6 +5629,45 @@ (define-public gojq
       (list #:import-path "github.com/itchyny/gojq/cmd/gojq"
             #:install-source? #f)))))
 
+(define-public go-jqp
+  (package
+    (name "go-jqp")
+    (version "0.7.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/noahgorstein/jqp")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "11xqh4113gkzp32hd4dg4cvjp40q3hxfh3889wd4bw2snl0alvcb"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.22
+      #:embed-files #~(list ".*.xml")
+      #:install-source? #f
+      #:import-path "github.com/noahgorstein/jqp"))
+    (inputs
+     (list go-github-com-spf13-viper
+           go-github-com-spf13-cobra
+           go-github-com-muesli-termenv
+           go-github-com-itchyny-gojq
+           go-github-com-itchyny-timefmt-go
+           go-github-com-charmbracelet-lipgloss
+           go-github-com-charmbracelet-bubbletea
+           go-github-com-charmbracelet-bubbles
+           go-github-com-atotto-clipboard
+           go-github-com-alecthomas-chroma-v2))
+    (home-page "https://github.com/noahgorstein/jqp")
+    (synopsis "TUI playground to experiment with jq")
+    (description
+     "This package provides an interactive TUI to explor the @code{jq} command
+line utility.  The command accepts an optional query argument which will be
+executed against the input JSON or newline-delimited JSON (NDJSON).")
+    (license license:expat)))
+
 (define-public pup
   (let ((revision "1")
         (commit "681d7bb639334bf485476f5872c5bdab10931f9a"))
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 11/15] gnu: Add go-github-com-muesli-ansi.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:9948e392ec0ad9198d10db55d3302e2f31a915cb.1732837202.git.sharlatanus@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-muesli-ansi): New variable.

Change-Id: I3dbbd8af04373997fcb3c60872dff14ab1b2b76a

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (38 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 6d54c9efbd..a9ab207c55 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -5731,6 +5731,31 @@ (define-public go-github-com-msteinert-pam-v2
        ((#:import-path _ "github.com/msteinert/pam")
         "github.com/msteinert/pam/v2")))))
 
+(define-public go-github-com-muesli-ansi
+  (package
+    (name "go-github-com-muesli-ansi")
+    (version "0.0.0-20230316100256-276c6243b2f6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/muesli/ansi")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jr8kgn3vb72jmf4a8n52g876mfpbvk3310p8gsg7jkn338af4m9"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:import-path "github.com/muesli/ansi"))
+    (propagated-inputs
+     (list go-github-com-mattn-go-runewidth
+           go-github-com-rivo-uniseg))
+    (home-page "https://github.com/muesli/ansi")
+    (synopsis "Raw ANSI sequence helpers")
+    (description
+     "ANSI sequence helpers for working with raw ANSI sequences.")
+    (license license:expat)))
+
 (define-public go-github-com-muesli-cancelreader
   (package
     (name "go-github-com-muesli-cancelreader")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 13/15] gnu: gojq: Adjust import path.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:f08e02ce8015c93ac63a6e04303a139035b458e2.1732837202.git.sharlatanus@gmail.com

* gnu/packages/web.scm (gojq) [arguments]<import-path>: Provide path to

the command source.

Change-Id: I6a4d0cbdba385460d7ab43d62fe1897922a7c7e9

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/web.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 7e355b8d77..f574c5c9bb 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5626,7 +5626,8 @@ (define-public gojq
     (arguments
      (ensure-keyword-arguments
       (package-arguments go-github-com-itchyny-gojq)
-      (list #:install-source? #f)))))
+      (list #:import-path "github.com/itchyny/gojq/cmd/gojq"
+            #:install-source? #f)))))
 
 (define-public pup
   (let ((revision "1")
-- 
2.46.0

Sharlatan Hellseher wrote 3 months ago

[PATCH 12/15] gnu: go-github-com-itchyny-gojq: Install the library.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:f2555fc4401dab30cc36001457bb2529e4fe2107.1732837202.git.sharlatanus@gmail.com

* gnu/packages/web.scm (go-github-com-itchyny-gojq): Install the library

files instead of "gojq" binary.

[arguments]: Remove <unpack-path>, adjust <import-path>.

Change-Id: I72235e0cfeee81b0e7490ebd9d92d0d36ceb1844

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/web.scm | 3 +--

1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d7c25e8b5b..7e355b8d77 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5605,8 +5605,7 @@ (define-public go-github-com-itchyny-gojq
     (build-system go-build-system)
     (arguments
      (list
-      #:import-path "github.com/itchyny/gojq/cmd/gojq"
-      #:unpack-path "github.com/itchyny/gojq"))
+      #:import-path "github.com/itchyny/gojq"))
     (inputs
      (list go-github-com-google-go-cmp
            go-github-com-itchyny-timefmt-go
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 01/15] gnu: Add go-github-com-atotto-clipboard.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:70fd8cbea4aa384418b66083166f78acc2774182.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-atotto-clipboard): New variable.

Change-Id: I4a871983f564034045f4b2ba77f2453cfce5cb2b

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 37 ++++++++++++++++++++++++++++++++++++-

1 file changed, 36 insertions(+), 1 deletion(-)

Toggle diff (59 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 1dc7849edb..daafc1285c 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -85,7 +85,9 @@ (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 specifications))
+  #:use-module (gnu packages specifications)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages xorg))
 
 ;;; Commentary:
 ;;;
@@ -981,6 +983,39 @@ (define-public go-github-com-asaskevich-govalidator
 @url{https://github.com/chriso/validator.js,validator.js}.")
     (license license:expat)))
 
+(define-public go-github-com-atotto-clipboard
+  (package
+    (name "go-github-com-atotto-clipboard")
+    (version "0.1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/atotto/clipboard")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ycd8zkgsq9iil9svhlwvhcqwcd7vik73nf8rnyfnn10gpjx97k5"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/atotto/clipboard"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'start-xorg-server
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; The test suite requires a running X server.
+              (system "Xvfb :1 &")
+              (setenv "DISPLAY" ":1"))))))
+    (native-inputs
+     (list xorg-server-for-tests))
+    (propagated-inputs (list xclip))
+    (home-page "https://github.com/atotto/clipboard")
+    (synopsis "Clipboard for Golang")
+    (description
+     "@code{clipboard} provides copying and pasting to the clipboard for Go.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-audriusbutkevicius-recli
   (package
     (name "go-github-com-audriusbutkevicius-recli")

base-commit: 10e99250f49d40563619c849b0d4ada31f985991
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 02/15] gnu: Add go-github-com-aymanbagabas-go-udiff.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:f3158278fb4db39f51e298af42e3099464d49c0f.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-aymanbagabas-go-udiff): New variable.

Change-Id: Icac934589b041c9b3b5db0114173d25d0c3f4c34

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++

1 file changed, 28 insertions(+)

Toggle diff (41 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index daafc1285c..913b741871 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1159,6 +1159,34 @@ (define-public go-github-com-aymanbagabas-go-osc52-v2
 clipboard.")
     (license license:expat)))
 
+(define-public go-github-com-aymanbagabas-go-udiff
+  (package
+    (name "go-github-com-aymanbagabas-go-udiff")
+    (version "0.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/aymanbagabas/go-udiff")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "09p17r8s5flhq6p69z08345q0y99dpb0yyashlwpgxn45xir7y6g"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/aymanbagabas/go-udiff"))
+    (home-page "https://github.com/aymanbagabas/go-udiff")
+    (synopsis "Diffing library for Golang")
+    (description
+     "@code{udiff} (micro-diff, or µDiff) is a library that implements the
+@url{http://www.xmailserver.org/diff2.pdf, Myers' diffing algorithm}.  It aims to
+provide a minimal API to compute and apply diffs with zero dependencies.  It also
+supports generating diffs in the
+@url{https://www.gnu.org/software/diffutils/manual/html_node/Unified-Format.html,
+Unified Format}.")
+    (license license:expat)))
+
 (define-public go-github-com-benbjohnson-clock
   (package
     (name "go-github-com-benbjohnson-clock")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 03/15] gnu: Add go-github-com-makenowjust-heredoc.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:2cbef4311e8556f778508ab0853b92c4695ca24a.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-makenowjust-heredoc): New variable.

Change-Id: I686dfd6a798da764b004a53a562ca788e70f8cd5

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++

1 file changed, 24 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 913b741871..c3342c91b0 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -4916,6 +4916,30 @@ (define-public go-github-com-logrusorgru-aurora-v4
     (native-inputs
      (list go-github-com-stretchr-testify))))
 
+(define-public go-github-com-makenowjust-heredoc
+  (package
+    (name "go-github-com-makenowjust-heredoc")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/makenowjust/heredoc")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18f21zm8n2wlnkz1ylw8rcxmqxyv2rlz8749yfqggm2m0m2884pj"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/MakeNowJust/heredoc"))
+    (home-page "https://github.com/MakeNowJust/heredoc")
+    (synopsis "Here-documents with indent")
+    (description
+     "This package implements a functionality of creating here-documents from
+raw strings.")
+    (license license:expat)))
+
 (define-public go-github-com-marcinbor85-gohex
   ;; No release, see <https://github.com/marcinbor85/gohex/issues/5>.
   (let ((commit "baab2527a9a2a4abb3dc06baabedfa5e0268b8d8")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 04/15] gnu: Add go-github-com-kylelemons-godebug-pretty.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:ace46df687d51978a1f4015da99a42fba579cc60.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-kylelemons-godebug-pretty): New variable.

Change-Id: Icd7d5fd70cf56d1ca74e9a2cfb929a3344128ba7

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang.scm | 10 ++++++++++

1 file changed, 10 insertions(+)

Toggle diff (23 lines)diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6b78b19cc5..541ac453d4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4722,6 +4722,16 @@ (define-public go-github-com-kylelemons-godebug
 representation suitable for computing diffs.")
     (license license:asl2.0)))
 
+;; TODO: Merge with go-github-com-kylelemons-godebug and provide both module;
+;; for go-team.
+(define-public go-github-com-kylelemons-godebug-pretty
+  (package
+    (inherit go-github-com-kylelemons-godebug)
+    (name "go-github-com-kylelemons-godebug-pretty")
+    (arguments
+     '(#:import-path "github.com/kylelemons/godebug/pretty"
+       #:unpack-path "github.com/kylelemons/godebug"))))
+
 (define-public go-github-com-kr-text
   (package
     (name "go-github-com-kr-text")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 06/15] gnu: Add go-github-com-charmbracelet-x-ansi.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:ba7847a34b0066838c21d2dd35c99606e92c82e2.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-ansi): New variable.

Change-Id: I1451ae9953bc87475413b83bb636a2df14ddc70c

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 30 ++++++++++++++++++++++++++++++

1 file changed, 30 insertions(+)

Toggle diff (43 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index d00ce6c550..729d4020b9 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1582,6 +1582,36 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-x-ansi
+  (package
+    (name "go-github-com-charmbracelet-x-ansi")
+    (version "0.5.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "ansi"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "016s67690dr3w3an6m24q6f4vrmwpk0qd4akvvh1dzpfyf4khxd4"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/ansi"
+      #:unpack-path "github.com/charmbracelet/x"))
+    (propagated-inputs
+     (list go-github-com-lucasb-eyer-go-colorful
+           go-github-com-rivo-uniseg))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "ANSI escape sequence parser and definitions")
+    (description
+     "@code{ansi} defines common ANSI escape sequences based on the
+@url{https://ecma-international.org/publications-and-standards/standards/ecma-48/,
+ECMA-48} specs.")
+    (license license:expat)))
+
 (define-public go-github-com-chzyer-logex
   (package
     (name "go-github-com-chzyer-logex")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 05/15] gnu: Add go-github-com-sahilm-fuzzy.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:af34e3631fa47a1c312b8cc690130f5b7c377795.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-sahilm-fuzzy): New variable.

Change-Id: Iebf4f8c3848e1e08b2860ac69a5a8d816ac260df

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 26 ++++++++++++++++++++++++++

1 file changed, 26 insertions(+)

Toggle diff (39 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index c3342c91b0..d00ce6c550 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6689,6 +6689,32 @@ (define-public go-github-com-ryanuber-columnize
      "This package implements column-formatted output for Golang.")
     (license license:expat)))
 
+(define-public go-github-com-sahilm-fuzzy
+  (package
+    (name "go-github-com-sahilm-fuzzy")
+    (version "0.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sahilm/fuzzy")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "15j95gm7hcmg09x1b39vc4il8bryv4v0yljvvyq5vyc6iq66qrbz"))))
+    (build-system go-build-system)
+    (native-inputs
+     (list go-github-com-kylelemons-godebug
+           go-github-com-kylelemons-godebug-pretty))
+    (arguments
+     (list #:import-path "github.com/sahilm/fuzzy"))
+    (home-page "https://github.com/sahilm/fuzzy")
+    (synopsis "Fuzzy string matching for Golang")
+    (description
+     "@code{fuzzy} provides fuzzy string matching optimized for filenames and code
+symbols in the style of Sublime Text, VSCode, @code{IntelliJ} IDEA et al.")
+    (license license:expat)))
+
 (define-public go-github-com-schollz-progressbar-v3
   (package
     (name "go-github-com-schollz-progressbar-v3")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 08/15] gnu: Add go-github-com-charmbracelet-x-term.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:788f456c6355ea3e5bb36c222c9db876f1e202b5.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-term): New variable.

Change-Id: I854febc3a3010f39051ee6fbd4a159993043d41e

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 33 +++++++++++++++++++++++++++++++++

1 file changed, 33 insertions(+)

Toggle diff (46 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 3002144ffd..89c06156a2 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1612,6 +1612,39 @@ (define-public go-github-com-charmbracelet-x-ansi
 ECMA-48} specs.")
     (license license:expat)))
 
+(define-public go-github-com-charmbracelet-x-term
+  (package
+    (name "go-github-com-charmbracelet-x-term")
+    (version "0.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "term"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1shw55110fnn4xz80wmgr18czmiil6z1j064m90iw8c7j9llfzn5"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/term"
+      #:unpack-path "github.com/charmbracelet/x"))
+    (propagated-inputs (list go-github-com-rivo-uniseg
+                             go-golang-org-x-sys))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "Terminal utilities and helpers")
+    (description
+     "@code{term} provides an API for working with terminals that includes:
+@itemize
+@item Switching a terminal to the raw mode.
+@item Getting, setting and restoring the state of a terminal.
+@item Getting size of a terminal.
+@item Reading passwords from a terminal without a local echo.
+@end itemize")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-x-exp-golden
   (package
     (name "go-github-com-charmbracelet-x-exp-golden")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 07/15] gnu: Add go-github-com-charmbracelet-x-exp-golden.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:504f3e3851a5ea1bf844aba32ff18ba1f2b5f1a9.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-x-exp-golden): New variable.

Change-Id: I7fa815433d9a83e4562bdc769312dd05e0a298da

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 42 +++++++++++++++++++++++++++++++++++++

1 file changed, 42 insertions(+)

Toggle diff (55 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 729d4020b9..3002144ffd 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1612,6 +1612,48 @@ (define-public go-github-com-charmbracelet-x-ansi
 ECMA-48} specs.")
     (license license:expat)))
 
+(define-public go-github-com-charmbracelet-x-exp-golden
+  (package
+    (name "go-github-com-charmbracelet-x-exp-golden")
+    (version "0.0.0-20241121171228-5bc00623ea2f")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/x")
+             (commit (go-version->git-ref version
+                                          #:subdir "exp/golden"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "016s67690dr3w3an6m24q6f4vrmwpk0qd4akvvh1dzpfyf4khxd4"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/x/exp/golden"
+      #:unpack-path "github.com/charmbracelet/x/"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda* (#:key import-path #:allow-other-keys)
+              ;; Tests need to write to that files.
+              (with-directory-excursion (string-append "src/" import-path)
+                (make-file-writable "testdata/TestRequireEqualUpdate.golden")
+                (make-file-writable "testdata/TestRequireEqualNoUpdate.golden"))))
+          (add-after 'check 'post-check
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                ;; Remove modified testdata just in case.
+                (delete-file-recursively "testdata")))))))
+    (propagated-inputs
+     (list go-github-com-aymanbagabas-go-udiff))
+    (home-page "https://github.com/charmbracelet/x")
+    (synopsis "Verify @code{.golden} file equality")
+    (description
+     "Golden files (@code{.golden}) contain the raw expected output of
+tests,which can contain control codes and escape sequences.  @code{golden}
+package provides an API for comparing Golden files.")
+    (license license:expat)))
+
 (define-public go-github-com-chzyer-logex
   (package
     (name "go-github-com-chzyer-logex")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 10/15] gnu: Add go-github-com-charmbracelet-bubbles.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:f4334312de522e1e36de26df0a72155ee55eb20c.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-bubbles): New variable.

Change-Id: I090db91509590ca9a8cab1a209d00bcc12b524e7

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++

1 file changed, 37 insertions(+)

Toggle diff (50 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index e7979387e3..db11b2b542 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1582,6 +1582,43 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-bubbles
+  (package
+    (name "go-github-com-charmbracelet-bubbles")
+    (version "0.20.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/bubbles")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qdcln01bq9lk6r33b8p5d5x850wgd8ddq57n4bg3xn76z2fd657"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:import-path "github.com/charmbracelet/bubbles"))
+    (propagated-inputs
+     (list go-github-com-atotto-clipboard
+           go-github-com-charmbracelet-bubbletea
+           go-github-com-charmbracelet-harmonica
+           go-github-com-charmbracelet-lipgloss
+           go-github-com-charmbracelet-x-ansi
+           go-github-com-charmbracelet-x-exp-golden
+           go-github-com-dustin-go-humanize
+           go-github-com-lucasb-eyer-go-colorful
+           go-github-com-makenowjust-heredoc
+           go-github-com-mattn-go-runewidth
+           go-github-com-muesli-termenv
+           go-github-com-rivo-uniseg
+           go-github-com-sahilm-fuzzy))
+    (home-page "https://github.com/charmbracelet/bubbles")
+    (synopsis "TUI components for Bubble Tea library")
+    (description
+     "@code{bubbles} is a library that provide components for
+@@url{https://github.com/charmbracelet/bubbletea, Bubble Tea} applications.")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-lipgloss
   (package
     (name "go-github-com-charmbracelet-lipgloss")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 09/15] gnu: Add go-github-com-charmbracelet-lipgloss.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:9cac25a5945688543d40d5c7045dbacfbd9d3db7.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-charmbracelet-lipgloss): New variable.

Change-Id: I73050c96830025ed63be7567873f8faf7573453d

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 29 +++++++++++++++++++++++++++++

1 file changed, 29 insertions(+)

Toggle diff (42 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 89c06156a2..e7979387e3 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1582,6 +1582,35 @@ (define-public go-github-com-cheggaaa-pb-v3
      (modify-inputs (package-propagated-inputs go-github-com-cheggaaa-pb)
        (append go-github-com-vividcortex-ewma)))))
 
+(define-public go-github-com-charmbracelet-lipgloss
+  (package
+    (name "go-github-com-charmbracelet-lipgloss")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/charmbracelet/lipgloss")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0d1aqzsjy0mcliydbfbg223xxpf9646frbj35ac4fisdy3w3n142"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/charmbracelet/lipgloss"))
+    (propagated-inputs
+     (list go-github-com-aymanbagabas-go-udiff
+           go-github-com-charmbracelet-x-ansi
+           go-github-com-charmbracelet-x-exp-golden
+           go-github-com-muesli-termenv
+           go-github-com-rivo-uniseg))
+    (home-page "https://github.com/charmbracelet/lipgloss")
+    (synopsis "Style definitions for nice terminal layouts")
+    (description
+     "Style definitions for nice terminal layouts.  Built with TUIs in mind.")
+    (license license:expat)))
+
 (define-public go-github-com-charmbracelet-x-ansi
   (package
     (name "go-github-com-charmbracelet-x-ansi")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 11/15] gnu: Add go-github-com-muesli-ansi.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:fb4b860c476f5d3298fc467492ecc7cec6a13ef9.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang-xyz.scm (go-github-com-muesli-ansi): New variable.

Change-Id: I3dbbd8af04373997fcb3c60872dff14ab1b2b76a

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (38 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index db11b2b542..d9a3562061 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -5754,6 +5754,31 @@ (define-public go-github-com-msteinert-pam-v2
        ((#:import-path _ "github.com/msteinert/pam")
         "github.com/msteinert/pam/v2")))))
 
+(define-public go-github-com-muesli-ansi
+  (package
+    (name "go-github-com-muesli-ansi")
+    (version "0.0.0-20230316100256-276c6243b2f6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/muesli/ansi")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jr8kgn3vb72jmf4a8n52g876mfpbvk3310p8gsg7jkn338af4m9"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:import-path "github.com/muesli/ansi"))
+    (propagated-inputs
+     (list go-github-com-mattn-go-runewidth
+           go-github-com-rivo-uniseg))
+    (home-page "https://github.com/muesli/ansi")
+    (synopsis "Raw ANSI sequence helpers")
+    (description
+     "ANSI sequence helpers for working with raw ANSI sequences.")
+    (license license:expat)))
+
 (define-public go-github-com-muesli-cancelreader
   (package
     (name "go-github-com-muesli-cancelreader")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 13/15] gnu: gojq: Adjust import and unpack paths.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:a78e0f903208f86e10b3908b74e166c93d12e418.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/web.scm (gojq) [arguments]<import-path>: Provide path to

the command source.

<unpack-path>: Set to "github.com/itchyny/gojq".

Change-Id: I6a4d0cbdba385460d7ab43d62fe1897922a7c7e9

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/web.scm | 5 ++++-

1 file changed, 4 insertions(+), 1 deletion(-)

Toggle diff (25 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 7e355b8d77..cfebf7785a 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -67,6 +67,7 @@
 ;;; Copyright © 2023 Evgeny Pisemsky <mail@pisemsky.site>
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5626,7 +5627,9 @@ (define-public gojq
     (arguments
      (ensure-keyword-arguments
       (package-arguments go-github-com-itchyny-gojq)
-      (list #:install-source? #f)))))
+      (list #:import-path "github.com/itchyny/gojq/cmd/gojq"
+            #:unpack-path "github.com/itchyny/gojq"
+            #:install-source? #f)))))
 
 (define-public pup
   (let ((revision "1")
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 12/15] gnu: go-github-com-itchyny-gojq: Install the library.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:b6d0c73d77848d0d70d55bf599b8c1dc8632b605.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/web.scm (go-github-com-itchyny-gojq): Install the library

files instead of "gojq" binary.

[arguments]: Remove <unpack-path>, adjust <import-path>.

Change-Id: I72235e0cfeee81b0e7490ebd9d92d0d36ceb1844

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/web.scm | 3 +--

1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d7c25e8b5b..7e355b8d77 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5605,8 +5605,7 @@ (define-public go-github-com-itchyny-gojq
     (build-system go-build-system)
     (arguments
      (list
-      #:import-path "github.com/itchyny/gojq/cmd/gojq"
-      #:unpack-path "github.com/itchyny/gojq"))
+      #:import-path "github.com/itchyny/gojq"))
     (inputs
      (list go-github-com-google-go-cmp
            go-github-com-itchyny-timefmt-go
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 14/15] gnu: go-github-com-charmbracelet-bubbletea: Update to 1.2.3.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:651a91b153cb511a5a693cbfea7cc9a2d965ff88.1733037809.git.poptsov.artyom@gmail.com

* gnu/packages/golang.scm (go-github-com-charmbracelet-bubbletea): Update to 1.2.3.
[propagated-inputs]: Add go-github-com-muesli-ansi,
go-github-com-muesli-cancelreader, go-github-com-charmbracelet-lipgloss,
go-github-com-charmbracelet-x-term, go-github-com-charmbracelet-x-ansi, and
go-golang-org-x-sync.  Sort inputs alphabetically.
[arguments] <phases>: Fix tests that are failing due to newer version of
"go-github-com-charmbracelet-x-ansi" package.

Change-Id: Ifdb3074f342b34c07c0e7ab47341b159d1eea0c2
Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/golang.scm | 47 +++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 14 deletions(-)

Toggle diff (76 lines)diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 541ac453d4..95aa1eb8de 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7007,7 +7007,7 @@ (define-public go-github-com-rivo-uniseg
 (define-public go-github-com-charmbracelet-bubbletea
   (package
     (name "go-github-com-charmbracelet-bubbletea")
-    (version "0.13.2")
+    (version "1.2.3")
     (source
      (origin
        (method git-fetch)
@@ -7017,28 +7017,47 @@ (define-public go-github-com-charmbracelet-bubbletea
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1105cggi5fwqx69m0vrhgwx6kaw82w4ahn58sj0a81603c4yvrk0"))))
+         "0ggkl29qixgin5av1mbnwfbb31kmwpczh8pgpjsx9z277fs55mph"))))
     (build-system go-build-system)
     (arguments
      (list
       #:import-path "github.com/charmbracelet/bubbletea"
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'remove-examples
-                     (lambda* (#:key import-path #:allow-other-keys)
-                       (with-directory-excursion (string-append "src/" import-path)
-                         (for-each delete-file-recursively
-                                   '("examples" "tutorials"))))))))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-examples
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (for-each delete-file-recursively
+                          '("examples" "tutorials")))))
+          (add-before 'check 'fix-tests
+            (lambda _
+              ;; XXX: The package requires
+              ;; "go-github-com-charmbracelet-x-ansi" version 0.4.5; with the
+              ;; newer version of "ansi", some "bubbletea" screen tests fail
+              ;; as "ansi" 0.5.2 handles escape sequences a little bit
+              ;; differently.
+              (substitute* "src/github.com/charmbracelet/bubbletea/screen_test.go"
+                (("x1b\\[0K")
+                 "x1b[K")
+                (("x1b\\[2;0H")
+                 "x1b[2;H")))))))
     (propagated-inputs
-     (list go-github-com-mattn-go-isatty
-           go-github-com-muesli-termenv
+     (list go-github-com-charmbracelet-lipgloss
+           go-github-com-charmbracelet-x-ansi
+           go-github-com-charmbracelet-x-term
+           go-github-com-containerd-console
+           go-github-com-lucasb-eyer-go-colorful
+           go-github-com-mattn-go-isatty
+           go-github-com-mattn-go-isatty
            go-github-com-mattn-go-runewidth
+           go-github-com-muesli-ansi
+           go-github-com-muesli-cancelreader
            go-github-com-muesli-reflow
-           go-github-com-lucasb-eyer-go-colorful
-           go-github-com-containerd-console
+           go-github-com-muesli-termenv
            go-golang-org-x-crypto
+           go-golang-org-x-sync
            go-golang-org-x-sys
-           go-golang-org-x-term
-           go-github-com-mattn-go-isatty))
+           go-golang-org-x-term))
     (home-page "https://github.com/charmbracelet/bubbletea")
     (synopsis "Powerful little TUI framework")
     (description
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

[PATCH v3 15/15] gnu: Add go-jqp.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:83a1aa27cb223f06344bb0081845f7b58f72767f.1733037809.git.poptsov.artyom@gmail.com

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

Change-Id: I736e039a456960e0e5864d7d197b2a6a823bbe58

Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>

---

gnu/packages/web.scm | 39 +++++++++++++++++++++++++++++++++++++++

1 file changed, 39 insertions(+)

Toggle diff (52 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index cfebf7785a..b10c03a7f4 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5631,6 +5631,45 @@ (define-public gojq
             #:unpack-path "github.com/itchyny/gojq"
             #:install-source? #f)))))
 
+(define-public go-jqp
+  (package
+    (name "go-jqp")
+    (version "0.7.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/noahgorstein/jqp")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "11xqh4113gkzp32hd4dg4cvjp40q3hxfh3889wd4bw2snl0alvcb"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.22
+      #:embed-files #~(list ".*.xml")
+      #:install-source? #f
+      #:import-path "github.com/noahgorstein/jqp"))
+    (inputs
+     (list go-github-com-spf13-viper
+           go-github-com-spf13-cobra
+           go-github-com-muesli-termenv
+           go-github-com-itchyny-gojq
+           go-github-com-itchyny-timefmt-go
+           go-github-com-charmbracelet-lipgloss
+           go-github-com-charmbracelet-bubbletea
+           go-github-com-charmbracelet-bubbles
+           go-github-com-atotto-clipboard
+           go-github-com-alecthomas-chroma-v2))
+    (home-page "https://github.com/noahgorstein/jqp")
+    (synopsis "TUI playground to experiment with jq")
+    (description
+     "This package provides an interactive TUI to explor the @code{jq} command
+line utility.  The command accepts an optional query argument which will be
+executed against the input JSON or newline-delimited JSON (NDJSON).")
+    (license license:expat)))
+
 (define-public pup
   (let ((revision "1")
         (commit "681d7bb639334bf485476f5872c5bdab10931f9a"))
-- 
2.46.0

Artyom V. Poptsov wrote 3 months ago

Re: [PATCH 00/16] gnu: Add go-github-com-noahgorstein-jqp.

Recipients:(address . 74495@debbugs.gnu.org)

Message-ID:87jzcjq2kl.fsf@gmail.com

Pushed the v3 of the patchset (that includes the changes suggested by

Sharlatan Hellseher) to the "master" branch as the following commits:

Toggle snippet (17 lines)aa40c94446c4ddc52cf9d7e3a440695707f6f534 gnu: Add go-jqp.
25a33a64b9a3b020b5671a06686c6caee30aac95 gnu: go-github-com-charmbracelet-bubbletea: Update to 1.2.3.
6aad5262d69499b1d7577e1b62cb0ce17b10fa5d gnu: gojq: Adjust import and unpack paths.
3ba6127415374e017fc411e5b6dcc0feaebd558e gnu: go-github-com-itchyny-gojq: Install the library.
47e941cb802eb0b5668cc5e881bf143e14ddd067 gnu: Add go-github-com-muesli-ansi.
689d2ac36c56c1573cd7418efe7676988f118024 gnu: Add go-github-com-charmbracelet-bubbles.
9874cc55817c9147fc55ad4b938914b7b836004c gnu: Add go-github-com-charmbracelet-lipgloss.
6152dc095b85d2a01d43a5ab36142af41354d5a9 gnu: Add go-github-com-charmbracelet-x-term.
4fe2cb289fc545e7fc19cc87fcac8d2d047201d4 gnu: Add go-github-com-charmbracelet-x-exp-golden.
222f672ca3e798669b1d739bd35bff7cf028bc29 gnu: Add go-github-com-charmbracelet-x-ansi.
7c240b9838fbfd19796fee6ce6e6f4c778a00742 gnu: Add go-github-com-sahilm-fuzzy.
f9f6ca8c54d48b4a53e86568902806999a04232e gnu: Add go-github-com-kylelemons-godebug-pretty.
703951b157db1c413f8718644d3c1e20f5ec5e1b gnu: Add go-github-com-makenowjust-heredoc.
215ae40b5d953a98b4c71f772c515adf5ad8ddf5 gnu: Add go-github-com-aymanbagabas-go-udiff.
58344dfb0ec1972946f1a9f38880e2875287fad6 gnu: Add go-github-com-atotto-clipboard.

- avp

-- 
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE  B57C E9C5 A2D9 0898 A02F

Artyom V. Poptsov wrote 3 months ago

Re: [PATCH v2 16/16] gnu: Add go-github-com-noahgorstein-jqp.

Recipients:(address . 74495-done@debbugs.gnu.org)

Message-ID:87y10xewo2.fsf@gmail.com

Closing the issue.

- avp

Artyom "avp" Poptsov <poptsov.artyom@gmail.com>

Home page: https://memory-heap.org/~avp/

CADR Hackerspace co-founder: https://cadrspace.ru/

GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 74495@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 74495

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags

mumi command -t +confirmed -t +easy

Or, remove the moreinfo tag and set the help tag

mumi command -t -moreinfo -t +help

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date