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

  • Open
  • quality assurance status badge
Details
2 participants
  • Artyom V. Poptsov
  • Sharlatan Hellseher
Owner
unassigned
Submitted by
Artyom V. Poptsov
Severity
normal
A
A
Artyom V. Poptsov wrote 4 days ago
(address . guix-patches@gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
cover.1732386154.git.poptsov.artyom@gmail.com
This patchset adds "go-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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 01/16] gnu: Add go-github-com-atotto-clipboard.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 03/16] gnu: Add go-github-com-makenowjust-heredoc.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 04/16] gnu: Add go-github-com-kylelemons-godebug-pretty.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 02/16] gnu: Add go-github-com-aymanbagabas-go-udiff.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 06/16] gnu: Add go-github-com-charmbracelet-x-ansi.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 05/16] gnu: Add go-github-com-sahilm-fuzzy.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 07/16] gnu: Add go-github-com-charmbracelet-x-exp-golden.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 08/16] gnu: Add go-github-com-charmbracelet-lipgloss.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 09/16] gnu: Add go-github-com-charmbracelet-bubbles.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 10/16] gnu: go-github-com-itchyny-gojq: Install the library.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 13/16] gnu: Add go-github-com-charmbracelet-x-term.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 11/16] gnu: gojq: Install the binary only.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 14/16] gnu: Add go-github-com-muesli-ansi.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 12/16] gnu: go-github-com-charmbracelet-bubbletea: Remove input labels.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 15/16] gnu: go-github-com-charmbracelet-bubbletea: Update to 1.2.3.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH 16/16] gnu: Add go-github-com-noahgorstein-jqp.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
S
S
Sharlatan Hellseher wrote 4 days ago
[PATCH 00/16] gnu: Add go-github-com-noahgorstein-jqp.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmdCV/AACgkQdtcnv/Ys
0rX0PA/+MXyjZhHv43Sj2w0or55r9fqDzGQyAY9iHgQFRgJ9xl1NBWZuWZx+HT+J
Y+DJs3OiXtaUtXU86Q4BHTYudZRWfEO8PxmpgmU1tdyPAjXgif1IfI8wYyfCrPOO
KKqCY2DybSejfnBqG0/mrIwRWE7G735sq7mFtC+yn4k6u/1F1VwLrbRUyFIFXidR
3L+OLyP7eZC2LKqhW2W/fH6BTBtVlmKhOuZrgIjhcf0YI7z/+Y4qxrUez6pSQTBY
JV37UdpYoxovzbdHOTsTXxGPYbOG7TEEB5AkCR+j/cDKJ5p/bZNcy43eO+vaNtQb
aX1LicclTtxB/RnkhXSw/96hHuy0Z7n3kMvWeuK4GmUXiSGyB4+nixwXkpG2L8I+
Ex2C3yqPVauHfNaqTBCv7tzOjWp6pL0LKZpwCNqkzkIioYjpmsyliIBFTl1CKJaJ
Jko0Tm94u6PX7dlLOj3yXSRitv7Pwc9k2O1C8WrYVUKQ/ujyVTzJenF2AXdhhRJV
eqWHn05x2ZUIEh/WMDcsdIp/kNysD2dQAT9WyD/PkJzCnA5vWTIi2Enhyr10Bku0
bfR54e0Fbh3L+ge/FnL8lWRVAtayulpGhrxNgCPCswFOT/53agy1QL2qGgz8TYKG
KvOPals0ciR9d7CfrJQNZVoKWs95JxANpaKgqYL9BUNoMKnaUhw=
=Cs9u
-----END PGP SIGNATURE-----

A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 01/16] gnu: Add go-github-com-atotto-clipboard.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 02/16] gnu: Add go-github-com-aymanbagabas-go-udiff.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 04/16] gnu: Add go-github-com-kylelemons-godebug-pretty.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 03/16] gnu: Add go-github-com-makenowjust-heredoc.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 05/16] gnu: Add go-github-com-sahilm-fuzzy.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 06/16] gnu: Add go-github-com-charmbracelet-x-ansi.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 07/16] gnu: Add go-github-com-charmbracelet-x-exp-golden.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 09/16] gnu: Add go-github-com-charmbracelet-bubbles.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 08/16] gnu: Add go-github-com-charmbracelet-lipgloss.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 11/16] gnu: gojq: Install the binary only.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 10/16] gnu: go-github-com-itchyny-gojq: Install the library.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 13/16] gnu: Add go-github-com-charmbracelet-x-term.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 12/16] gnu: go-github-com-charmbracelet-bubbletea: Remove input labels.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 14/16] gnu: Add go-github-com-muesli-ansi.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 15/16] gnu: go-github-com-charmbracelet-bubbletea: Update to 1.2.3.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 4 days ago
[PATCH v2 16/16] gnu: Add go-github-com-noahgorstein-jqp.
(address . 74495@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)
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
A
A
Artyom V. Poptsov wrote 33 hours ago
Re: [PATCH 00/16] gnu: Add go-github-com-noahgorstein-jqp.
(address . 74495@debbugs.gnu.org)
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>
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
-----BEGIN PGP SIGNATURE-----

iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmdGHO4ZHHBvcHRzb3Yu
YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFfuq7EADMi6L/vgatvo6r3OITFt+q
bG25XVyXWywkS7LeAzi4AZEAfSWPsK3jgHvU218MzoLEr+6g0fKMHOwZq8vQH1YR
vODnGlfw0VUgU9qIDtQpksXIvDz7nZmzgDrVutgGQ35y607NslaiwTtNC0Oifo7E
K4dw8+viOKFpKkQKqQDPv9jymdppP6SdJaekSIcLTSsJVim9PfCVO0taB1xGOHo/
Jnt6DFSzcQkvSUzZrxwzqCNyTxTrtU6gEhrdCYMhHaBt0ljKjAm5MpBC6PVk/Wuq
cR8hTQsTZXtItiST+i3P76EeZdp4Jf3NUSziXBNPXCvy+sGrrrckWRWFvk7eGOHW
6z+OJun2ZkUhxe5WBzNCgkvOyBdJLfsOd6NfSZskh9taySLhAmE9rQa/gZKxtpul
Bh79U2KHc8GGR9Wtg6VABiQIVpc4gHGEdkthkS7OrRUAspIT+G2ozA6lZh+IkU4N
/CCOER5jMT1RGhN7Dtc5kjvjs7FSgK/5ESZdeDyF+mPRGtscoWfT35rJBHZvRFHN
3koE68XJgng5Igp5kygGGaJg4RC2UuiG8nuXlLXVdVSUDrihv97uV31y+pNajAmM
NxxSxGFh8sWB4PWfrV+bXGH6Mra4myiC76wGKQPSMYbOidYPzqVpers9kao2zwvG
jR++npzE/tDPtJfL3kPA0A==
=2ehG
-----END PGP SIGNATURE-----

?
Your comment

Commenting via the web interface is currently disabled.

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