* gnu/packages/golang.scm (go-github-com-muesli-reflow-wordwrap): Update to 0.2.0. --- gnu/packages/golang.scm | 47 ++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8c3c81ceda..718794934e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> +;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; ;;; This file is part of GNU Guix. ;;; @@ -5621,29 +5622,31 @@ transforms one JSON document into another through a JMESPath expression.") (license license:bsd-3))) (define-public go-github-com-muesli-reflow-wordwrap - (package - (name "go-github-com-muesli-reflow-wordwrap") - (version "0.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/muesli/reflow") - (commit (string-append "v" version)))) - (file-name (git-file-name "go-github-com-muesli-reflow" version)) - (sha256 - (base32 - "1vhynm2n1az13fn03lp0gi28p9mznq1mblglh8f2rb9y1vkd2dqr")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/muesli/reflow/wordwrap" - #:unpack-path "github.com/muesli/reflow")) - (native-inputs - `(("go-github.com-mattn-go-runewidth" ,go-github.com-mattn-go-runewidth))) - (home-page "https://github.com/muesli/reflow/") - (synopsis "Collection of methods helping to transform blocks of text") - (description "This package provides a collection of ANSI-aware methods and + (let ((commit "c80126ec2ad5d2c5210b2eefe1b33aaaca2fdeb8") + (revision "1")) + (package + (name "go-github-com-muesli-reflow-wordwrap") + (version (git-version "0.2.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/muesli/reflow") + (commit commit))) + (file-name (git-file-name "go-github-com-muesli-reflow" version)) + (sha256 + (base32 + "049yzl3k4s0hn6ywh57qqivx8aqz3cfqpv8z9gk9jvf9kvwaa3zf")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/muesli/reflow/wordwrap" + #:unpack-path "github.com/muesli/reflow")) + (native-inputs + `(("go-github.com-mattn-go-runewidth" ,go-github.com-mattn-go-runewidth))) + (home-page "https://github.com/muesli/reflow/") + (synopsis "Collection of methods helping to transform blocks of text") + (description "This package provides a collection of ANSI-aware methods and io.Writers helping you to transform blocks of text.") - (license license:expat))) + (license license:expat)))) (define-public go-github-com-muesli-reflow-ansi (package -- 2.25.1
* gnu/packages/golang.scm (go-github-com-muesli-reflow-truncate): New variable. --- gnu/packages/golang.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 718794934e..8b50b15ccb 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5672,6 +5672,14 @@ io.Writers helping you to transform blocks of text.") `(#:import-path "github.com/muesli/reflow/padding" #:unpack-path "github.com/muesli/reflow")))) +(define-public go-github-com-muesli-reflow-truncate + (package + (inherit go-github-com-muesli-reflow-wordwrap) + (name "go-github-com-muesli-reflow-truncate") + (arguments + `(#:import-path "github.com/muesli/reflow/truncate" + #:unpack-path "github.com/muesli/reflow")))) + (define-public go-github-com-muesli-termenv (package (name "go-github-com-muesli-termenv") -- 2.25.1
* gnu/packages/golang.scm (go-github-com-containerd-console): New variable. --- gnu/packages/golang.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8b50b15ccb..77abde2575 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5841,6 +5841,30 @@ templates on ANSI compatible terminals. You can create your own stylesheet or use one of our glamorous default themes.") (license license:expat))) +(define-public go-github-com-containerd-console + (package + (name "go-github-com-containerd-console") + (version "1.0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/console") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rxwgq578hphs2ldx1gg6c9fq1qm8rgqfx3vgi2sbrsmxn6m2438")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/containerd/console")) + (native-inputs + `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) + (home-page "https://github.com/containerd/console") + (synopsis "Console package for Go") + (description "Golang package for dealing with consoles. Light on +dependencies and a simple API.") + (license license:asl2.0))) + (define-public go-github-com-coreos-go-semver (package (name "go-github-com-coreos-go-semver") -- 2.25.1
* gnu/packages/golang.scm (go-github-com-charmbracelet-bubbletea): New variable. --- gnu/packages/golang.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 77abde2575..a9f299be98 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5865,6 +5865,40 @@ use one of our glamorous default themes.") dependencies and a simple API.") (license license:asl2.0))) +(define-public go-github-com-charmbracelet-bubbletea + (package + (name "go-github-com-charmbracelet-bubbletea") + (version "0.13.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/charmbracelet/bubbletea") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1105cggi5fwqx69m0vrhgwx6kaw82w4ahn58sj0a81603c4yvrk0")))) + (build-system go-build-system) + (native-inputs + `(("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty) + ("go-github-com-containerd-console" ,go-github-com-containerd-console) + ("go-github-com-google-goterm" ,go-github-com-google-goterm) + ("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty) + ("go-github.com-mattn-go-runewidth" ,go-github.com-mattn-go-runewidth) + ("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi) + ("go-github-com-muesli-reflow-truncate" ,go-github-com-muesli-reflow-truncate) + ("go-github-com-muesli-termenv" ,go-github-com-muesli-termenv) + ("go-golang-org-colorful" ,go-golang-org-colorful) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto))) + (arguments + `(#:import-path "github.com/charmbracelet/bubbletea")) + (home-page "https://github.com/charmbracelet/bubbletea") + (synopsis "A powerful Go TUI framework") + (description "A Go framework to build terminal apps. Bubble Tea is +well-suited for simple and complex terminal applications, either inline, +full-window, or a mix of both.") + (license license:expat))) + (define-public go-github-com-coreos-go-semver (package (name "go-github-com-coreos-go-semver") -- 2.25.1
* gnu/packages/time.scm (tz): New variable. --- gnu/packages/time.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index d6ebb59a1e..fbe7a8b5c1 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2021 Ryan Prior <rprior@protonmail.com> +;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; ;;; This file is part of GNU Guix. ;;; @@ -540,3 +541,37 @@ calls.") from a starting point you provide. The user can pause and resume the countdown from the text user interface.") (license expat))) + +(define-public tz + (package + (name "tz") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oz/tz") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sixfbph5013c9ccx0xqkp9jskg7jr9y29nn9j85q1zmg5by221v")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/oz/tz")) + (native-inputs + `(("go-github-com-charmbracelet-bubbletea" ,go-github-com-charmbracelet-bubbletea) + ("go-github-com-containerd-console" ,go-github-com-containerd-console) + ("go-github-com-google-goterm" ,go-github-com-google-goterm) + ("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty) + ("go-github.com-mattn-go-runewidth" ,go-github.com-mattn-go-runewidth) + ("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi) + ("go-github-com-muesli-reflow-truncate" ,go-github-com-muesli-reflow-truncate) + ("go-github-com-muesli-termenv" ,go-github-com-muesli-termenv) + ("go-golang-org-colorful" ,go-golang-org-colorful) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto))) + (home-page "https://github.com/oz/tz") + (synopsis "Display time across a few selected time zones.") + (description + "tz is a cli tool that displays a given time in several time zones. Use +the environment variable TZ_LIST to specify a list of time zones.") + (license gpl3))) -- 2.25.1
On Tue, May 11, 2021 at 08:55:54PM +0200, Stefan Reichör wrote: > * gnu/packages/time.scm (tz): New variable. > + (synopsis "Display time across a few selected time zones.") > + (description > + "tz is a cli tool that displays a given time in several time zones. Use > +the environment variable TZ_LIST to specify a list of time zones.") I'm curious, how does it find the time zone database? It should look them up at runtime via something like a TZDIR environment variable. It should not include a copy of the database, or else it will become "stale" before too long.
Another attempt to answer the question from Leo Famulari I didn't get the question from the bugtracker by email: ,---- | I'm curious, how does it find the time zone database? | | It should look them up at runtime via something like a TZDIR environment | variable. It should not include a copy of the database, or else it will | become "stale" before too long. `---- Yesterday I tried to answer it directly in the web interface. My answer didn't show up :-( Now I try to answer per email The timezone is determined by the go runtime function LoadLocation: https://github.com/oz/tz/blob/main/zone.go#L77 LoadLocation does the lookup in the installed timezone database: https://golang.org/pkg/time/#LoadLocation
On Thu, May 13, 2021 at 08:59:07PM +0200, Stefan Reichör wrote:
> LoadLocation does the lookup in the installed timezone database:
>
> https://golang.org/pkg/time/#LoadLocation
Oh, I see. This must be why Go itself depends on (and keeps a run-time
reference to) tzdata.
We'll want to fix that someday, but that's a separate concern from these
packages.
From: Guix Together <jgart@dismail.de> * gnu/packages/golang.scm (go-golang-org-colorful): Update to 1.2.0. Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a96f743f68..a5ce91bb56 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5451,7 +5451,7 @@ golang's database/sql package.") (define-public go-golang-org-colorful (package (name "go-golang-org-colorful") - (version "1.0.2") + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -5460,7 +5460,7 @@ golang's database/sql package.") (file-name (git-file-name name version)) (sha256 (base32 - "0fig06880bvk1l92j4127v4x9sar4ds7ga8959gxxghb2w70b7l2")))) + "08c3fkf27r16izjjd4w94xd1z7w1r4mdalbl53ms2ka2j465s3qs")))) (build-system go-build-system) (arguments '(#:import-path "github.com/lucasb-eyer/go-colorful")) -- 2.33.0
From: Guix Together <jgart@dismail.de> * gnu/packages/golang.scm (go-github-com-charmbracelet-bubbletea): New variable. Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> --- gnu/packages/golang.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a5ce91bb56..0ab20238e8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3309,6 +3309,44 @@ middleware for Go web applications and services.") (description "Safe and easy casting from one type to another in Go") (license license:expat))) +(define-public go-github-com-charmbracelet-bubbletea + (package + (name "go-github-com-charmbracelet-bubbletea") + (version "0.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/charmbracelet/bubbletea") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1105cggi5fwqx69m0vrhgwx6kaw82w4ahn58sj0a81603c4yvrk0")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/charmbracelet/bubbletea")) + (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-indent" ,go-github-com-muesli-reflow-indent) + ("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi) + ("go-golang-org-colorful" ,go-golang-org-colorful) + ("github.com/containerd/console" ,go-github-com-containerd-console) + ("go-github-com-muesli-reflow-truncate" ,go-github-com-muesli-reflow-truncate) + ("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))) + (home-page "https://github.com/charmbracelet/bubbletea") + (synopsis "A powerful little TUI framework") + (description +"A Go framework based on The Elm Architecture. Bubble Tea is well-suited +for simple and complex terminal applications, either inline, full-window, +or a mix of both.") + (license license:asl2.0))) + (define-public go-github-com-spf13-cobra (package (name "go-github-com-spf13-cobra") -- 2.33.0
From: Guix Together <jgart@dismail.de> * gnu/packages/golang.scm (go-github-com-containerd-console): New variable. Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0ab20238e8..e4bacfc92a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3347,6 +3347,31 @@ for simple and complex terminal applications, either inline, full-window, or a mix of both.") (license license:asl2.0))) +(define-public go-github-com-containerd-console + (package + (name "go-github-com-containerd-console") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/console") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pgx0y8x23jwc2f9jfk5hd5aslqk599nj6c7dj5846xvnkz2x7p2")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/containerd/console")) + (propagated-inputs + `(("golang.org/x/sys" ,go-golang-org-x-sys))) + (home-page "https://github.com/containerd/console") + (synopsis "Console package for Go") + (description +"Golang package for dealing with consoles. Light on deps and a simple API.") + (license license:asl2.0))) + (define-public go-github-com-spf13-cobra (package (name "go-github-com-spf13-cobra") -- 2.33.0
From: Guix Together <jgart@dismail.de> * gnu/packages/golang.scm (go-github-com-muesli-reflow-wordwrap): Update to 0.3.0. Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e4bacfc92a..25bf8c6972 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7204,7 +7204,7 @@ transforms one JSON document into another through a JMESPath expression.") (define-public go-github-com-muesli-reflow-wordwrap (package (name "go-github-com-muesli-reflow-wordwrap") - (version "0.1.0") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -7213,7 +7213,7 @@ transforms one JSON document into another through a JMESPath expression.") (file-name (git-file-name "go-github-com-muesli-reflow" version)) (sha256 (base32 - "1vhynm2n1az13fn03lp0gi28p9mznq1mblglh8f2rb9y1vkd2dqr")))) + "09zcz2cqdwgj1ilya5pqwndryk6lansn87x63fcm8j1xn74vd2ry")))) (build-system go-build-system) (arguments `(#:import-path "github.com/muesli/reflow/wordwrap" -- 2.33.0
From: Guix Together <jgart@dismail.de> * gnu/packages/golang.scm (go-github-com-muesli-reflow-truncate): New variable. Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> --- gnu/packages/golang.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 25bf8c6972..3e89a27b6d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7226,6 +7226,14 @@ transforms one JSON document into another through a JMESPath expression.") io.Writers helping you to transform blocks of text.") (license license:expat))) +(define-public go-github-com-muesli-reflow-truncate + (package + (inherit go-github-com-muesli-reflow-wordwrap) + (name "go-github-com-muesli-reflow-truncate") + (arguments + `(#:import-path "github.com/muesli/reflow/truncate" + #:unpack-path "github.com/muesli/reflow")))) + (define-public go-github-com-muesli-reflow-ansi (package (inherit go-github-com-muesli-reflow-wordwrap) -- 2.33.0
From: Guix Together <jgart@dismail.de> * gnu/packages/golang.scm (go-github-com-muesli-termenv): Update to 0.8.1. Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3e89a27b6d..83791f4de2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7261,7 +7261,7 @@ io.Writers helping you to transform blocks of text.") (define-public go-github-com-muesli-termenv (package (name "go-github-com-muesli-termenv") - (version "0.7.0") + (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -7270,7 +7270,7 @@ io.Writers helping you to transform blocks of text.") (file-name (git-file-name name version)) (sha256 (base32 - "09fwrdhy7c9qlf70h97f5inh6xvkfq1vi8fwx9q7bwmjjbiykk8m")))) + "0m24ljq1nq7z933fcvg99fw0fhxj9rb5ll4rlay7z2f2p59mrbdp")))) (build-system go-build-system) (arguments `(#:import-path "github.com/muesli/termenv")) -- 2.33.0
From: Guix Together <jgart@dismail.de> * gnu/packages/time.scm (tz): New variable. Co-authored-by: jgart <jgart@dismail.de> --- gnu/packages/time.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index df4b8ac6f5..407b3fe179 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -512,6 +512,39 @@ modifies the @code{time}, @code{gettimeofday} and @code{clock_gettime} system calls.") (license gpl2))) +(define-public tz + (package + (name "tz") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oz/tz") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sixfbph5013c9ccx0xqkp9jskg7jr9y29nn9j85q1zmg5by221v")))) + (build-system go-build-system) + (arguments + `(#:go ,go-1.17 + #:import-path "github.com/oz/tz" + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (invoke "go" "test" "-cover" import-path))))))) + (inputs + `(("github.com/charmbracelet/bubbletea" ,go-github-com-charmbracelet-bubbletea) + ("github.com/muesli/termenv" ,go-github-com-muesli-termenv))) + (home-page "https://github.com/oz/tz") + (synopsis "TUI time zone helper") + (description +"@command{tz} helps you schedule things across time zones. It is an interactive +TUI program that displays time across a few time zones of your choosing.") + (license gpl3+))) + (define-public countdown (package (name "countdown") -- 2.33.0
Hi, I didn't realize that Stefan attempted this package already. Well, here is another attempt from today's Guix Packaging Meetup. Gábor and I hacked away on tz and it's dependencies a bit. I tested and built tz with --check --rounds=3 and `guix environment --ad-hoc tz -- tz` This is a very cool TUI! I use it daily but have had to install it with nix or build it with golang, depending on what machine I'm on. Now we can have it in guix. all best, jgart 3B1D 7F19 E36B B60C 0F5B 2CA9 A52A A2B4 77B6 DD35
On Sun, 26 Sep 2021 04:53:45 -0400 jgart <jgart@dismail.de> wrote: I want to give a special shoutout to iskarian and vagrantc for helping me debug tz over irc. I was running into some issues with tz not being deterministic at first: https://paste.sr.ht/~jgart/99583c33249dc7acd35763f9023efc1ec9f8fcd8
0.6.1 is out as of 24 days ago. https://github.com/oz/tz/releases/tag/v0.6.1
From: Guix Together <jgart@dismail.de> Hi Guixers, Here's the update for 0.6.1. We worked on this today as part of the Guix Packaging Meetup. all best, jgart Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Jorge Acereda <jacereda@gmail.com> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c863388475..1ece1a90d8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5422,7 +5422,7 @@ (define-public go-github-com-go-sql-driver-mysql (define-public go-golang-org-colorful (package (name "go-golang-org-colorful") - (version "1.0.2") + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -5431,7 +5431,7 @@ (define-public go-golang-org-colorful (file-name (git-file-name name version)) (sha256 (base32 - "0fig06880bvk1l92j4127v4x9sar4ds7ga8959gxxghb2w70b7l2")))) + "08c3fkf27r16izjjd4w94xd1z7w1r4mdalbl53ms2ka2j465s3qs")))) (build-system go-build-system) (arguments '(#:import-path "github.com/lucasb-eyer/go-colorful")) -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/golang.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1ece1a90d8..1e11d0053e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8797,6 +8797,45 @@ (define-public go-github-com-mattn-go-runewidth string.") (license license:expat))) + +(define-public go-github-com-charmbracelet-bubbletea + (package + (name "go-github-com-charmbracelet-bubbletea") + (version "0.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/charmbracelet/bubbletea") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1105cggi5fwqx69m0vrhgwx6kaw82w4ahn58sj0a81603c4yvrk0")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/charmbracelet/bubbletea")) + (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-indent" ,go-github-com-muesli-reflow-indent) + ("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi) + ("go-golang-org-colorful" ,go-golang-org-colorful) + ("github.com/containerd/console" ,go-github-com-containerd-console) + ("go-github-com-muesli-reflow-truncate" ,go-github-com-muesli-reflow-truncate) + ("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))) + (home-page "https://github.com/charmbracelet/bubbletea") + (synopsis "A powerful little TUI framework") + (description +"A Go framework based on The Elm Architecture. Bubble Tea is well-suited +for simple and complex terminal applications, either inline, full-window, +or a mix of both.") + (license license:asl2.0))) + (define-public go-github-com-arceliar-ironwood (package (name "go-github-com-arceliar-ironwood") -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1e11d0053e..9b99c1bd9b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8836,6 +8836,31 @@ (define-public go-github-com-charmbracelet-bubbletea or a mix of both.") (license license:asl2.0))) +(define-public go-github-com-containerd-console + (package + (name "go-github-com-containerd-console") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/console") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pgx0y8x23jwc2f9jfk5hd5aslqk599nj6c7dj5846xvnkz2x7p2")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/containerd/console")) + (propagated-inputs + `(("golang.org/x/sys" ,go-golang-org-x-sys))) + (home-page "https://github.com/containerd/console") + (synopsis "Console package for Go") + (description +"Golang package for dealing with consoles. Light on deps and a simple API.") + (license license:asl2.0))) + (define-public go-github-com-arceliar-ironwood (package (name "go-github-com-arceliar-ironwood") -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9b99c1bd9b..9124909ca9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7083,7 +7083,7 @@ (define-public go-github-com-microcosm-cc-bluemonday (define-public go-github-com-muesli-reflow-wordwrap (package (name "go-github-com-muesli-reflow-wordwrap") - (version "0.1.0") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -7092,7 +7092,7 @@ (define-public go-github-com-muesli-reflow-wordwrap (file-name (git-file-name "go-github-com-muesli-reflow" version)) (sha256 (base32 - "1vhynm2n1az13fn03lp0gi28p9mznq1mblglh8f2rb9y1vkd2dqr")))) + "09zcz2cqdwgj1ilya5pqwndryk6lansn87x63fcm8j1xn74vd2ry")))) (build-system go-build-system) (arguments `(#:import-path "github.com/muesli/reflow/wordwrap" -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/golang.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9124909ca9..0bfd3e9753 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7129,6 +7129,14 @@ (define-public go-github-com-muesli-reflow-padding `(#:import-path "github.com/muesli/reflow/padding" #:unpack-path "github.com/muesli/reflow")))) +(define-public go-github-com-muesli-reflow-truncate + (package + (inherit go-github-com-muesli-reflow-wordwrap) + (name "go-github-com-muesli-reflow-truncate") + (arguments + `(#:import-path "github.com/muesli/reflow/truncate" + #:unpack-path "github.com/muesli/reflow")))) + (define-public go-github-com-muesli-termenv (package (name "go-github-com-muesli-termenv") -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0bfd3e9753..a98dcb85c2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7140,7 +7140,7 @@ (define-public go-github-com-muesli-reflow-truncate (define-public go-github-com-muesli-termenv (package (name "go-github-com-muesli-termenv") - (version "0.7.0") + (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -7149,7 +7149,7 @@ (define-public go-github-com-muesli-termenv (file-name (git-file-name name version)) (sha256 (base32 - "09fwrdhy7c9qlf70h97f5inh6xvkfq1vi8fwx9q7bwmjjbiykk8m")))) + "0m24ljq1nq7z933fcvg99fw0fhxj9rb5ll4rlay7z2f2p59mrbdp")))) (build-system go-build-system) (arguments `(#:import-path "github.com/muesli/termenv")) -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/time.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 97de5485ef..d4ff11228c 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -514,6 +514,39 @@ (define-public datefudge calls.") (license gpl2))) +(define-public tz + (package + (name "tz") + (version "0.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oz/tz") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nbl13xd95np89sbx8fn0jqrh1iy17hsy70kq31hmcvyns8dljhg")))) + (build-system go-build-system) + (arguments + `(#:go ,go-1.17 + #:import-path "github.com/oz/tz" + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (invoke "go" "test" "-cover" import-path))))))) + (inputs + `(("github.com/charmbracelet/bubbletea" ,go-github-com-charmbracelet-bubbletea) + ("github.com/muesli/termenv" ,go-github-com-muesli-termenv))) + (home-page "https://github.com/oz/tz") + (synopsis "TUI time zone helper") + (description +"@command{tz} helps you schedule things across time zones. It is an interactive +TUI program that displays time across a few time zones of your choosing.") + (license gpl3+))) + (define-public countdown (package (name "countdown") -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Jorge Acereda <jacereda@gmail.com> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c863388475..1ece1a90d8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5422,7 +5422,7 @@ (define-public go-github-com-go-sql-driver-mysql (define-public go-golang-org-colorful (package (name "go-golang-org-colorful") - (version "1.0.2") + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -5431,7 +5431,7 @@ (define-public go-golang-org-colorful (file-name (git-file-name name version)) (sha256 (base32 - "0fig06880bvk1l92j4127v4x9sar4ds7ga8959gxxghb2w70b7l2")))) + "08c3fkf27r16izjjd4w94xd1z7w1r4mdalbl53ms2ka2j465s3qs")))) (build-system go-build-system) (arguments '(#:import-path "github.com/lucasb-eyer/go-colorful")) -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/golang.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1ece1a90d8..1e11d0053e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8797,6 +8797,45 @@ (define-public go-github-com-mattn-go-runewidth string.") (license license:expat))) + +(define-public go-github-com-charmbracelet-bubbletea + (package + (name "go-github-com-charmbracelet-bubbletea") + (version "0.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/charmbracelet/bubbletea") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1105cggi5fwqx69m0vrhgwx6kaw82w4ahn58sj0a81603c4yvrk0")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/charmbracelet/bubbletea")) + (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-indent" ,go-github-com-muesli-reflow-indent) + ("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi) + ("go-golang-org-colorful" ,go-golang-org-colorful) + ("github.com/containerd/console" ,go-github-com-containerd-console) + ("go-github-com-muesli-reflow-truncate" ,go-github-com-muesli-reflow-truncate) + ("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))) + (home-page "https://github.com/charmbracelet/bubbletea") + (synopsis "A powerful little TUI framework") + (description +"A Go framework based on The Elm Architecture. Bubble Tea is well-suited +for simple and complex terminal applications, either inline, full-window, +or a mix of both.") + (license license:asl2.0))) + (define-public go-github-com-arceliar-ironwood (package (name "go-github-com-arceliar-ironwood") -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1e11d0053e..9b99c1bd9b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8836,6 +8836,31 @@ (define-public go-github-com-charmbracelet-bubbletea or a mix of both.") (license license:asl2.0))) +(define-public go-github-com-containerd-console + (package + (name "go-github-com-containerd-console") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/console") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pgx0y8x23jwc2f9jfk5hd5aslqk599nj6c7dj5846xvnkz2x7p2")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/containerd/console")) + (propagated-inputs + `(("golang.org/x/sys" ,go-golang-org-x-sys))) + (home-page "https://github.com/containerd/console") + (synopsis "Console package for Go") + (description +"Golang package for dealing with consoles. Light on deps and a simple API.") + (license license:asl2.0))) + (define-public go-github-com-arceliar-ironwood (package (name "go-github-com-arceliar-ironwood") -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9b99c1bd9b..9124909ca9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7083,7 +7083,7 @@ (define-public go-github-com-microcosm-cc-bluemonday (define-public go-github-com-muesli-reflow-wordwrap (package (name "go-github-com-muesli-reflow-wordwrap") - (version "0.1.0") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -7092,7 +7092,7 @@ (define-public go-github-com-muesli-reflow-wordwrap (file-name (git-file-name "go-github-com-muesli-reflow" version)) (sha256 (base32 - "1vhynm2n1az13fn03lp0gi28p9mznq1mblglh8f2rb9y1vkd2dqr")))) + "09zcz2cqdwgj1ilya5pqwndryk6lansn87x63fcm8j1xn74vd2ry")))) (build-system go-build-system) (arguments `(#:import-path "github.com/muesli/reflow/wordwrap" -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/golang.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9124909ca9..0bfd3e9753 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7129,6 +7129,14 @@ (define-public go-github-com-muesli-reflow-padding `(#:import-path "github.com/muesli/reflow/padding" #:unpack-path "github.com/muesli/reflow")))) +(define-public go-github-com-muesli-reflow-truncate + (package + (inherit go-github-com-muesli-reflow-wordwrap) + (name "go-github-com-muesli-reflow-truncate") + (arguments + `(#:import-path "github.com/muesli/reflow/truncate" + #:unpack-path "github.com/muesli/reflow")))) + (define-public go-github-com-muesli-termenv (package (name "go-github-com-muesli-termenv") -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Gábor Boskovits <boskovits@gmail.com> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0bfd3e9753..a98dcb85c2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7140,7 +7140,7 @@ (define-public go-github-com-muesli-reflow-truncate (define-public go-github-com-muesli-termenv (package (name "go-github-com-muesli-termenv") - (version "0.7.0") + (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -7149,7 +7149,7 @@ (define-public go-github-com-muesli-termenv (file-name (git-file-name name version)) (sha256 (base32 - "09fwrdhy7c9qlf70h97f5inh6xvkfq1vi8fwx9q7bwmjjbiykk8m")))) + "0m24ljq1nq7z933fcvg99fw0fhxj9rb5ll4rlay7z2f2p59mrbdp")))) (build-system go-build-system) (arguments `(#:import-path "github.com/muesli/termenv")) -- 2.34.0
From: Guix Together <jgart@dismail.de> Co-authored-by: jgart <jgart@dismail.de> Co-authored-by: Jorge Acereda <jacereda@gmail.com> --- gnu/packages/time.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 97de5485ef..d4ff11228c 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -514,6 +514,39 @@ (define-public datefudge calls.") (license gpl2))) +(define-public tz + (package + (name "tz") + (version "0.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oz/tz") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nbl13xd95np89sbx8fn0jqrh1iy17hsy70kq31hmcvyns8dljhg")))) + (build-system go-build-system) + (arguments + `(#:go ,go-1.17 + #:import-path "github.com/oz/tz" + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (invoke "go" "test" "-cover" import-path))))))) + (inputs + `(("github.com/charmbracelet/bubbletea" ,go-github-com-charmbracelet-bubbletea) + ("github.com/muesli/termenv" ,go-github-com-muesli-termenv))) + (home-page "https://github.com/oz/tz") + (synopsis "TUI time zone helper") + (description +"@command{tz} helps you schedule things across time zones. It is an interactive +TUI program that displays time across a few time zones of your choosing.") + (license gpl3+))) + (define-public countdown (package (name "countdown") -- 2.34.0
Hello,
jgart via Guix-patches via <guix-patches@gnu.org> writes:
> From: Guix Together <jgart@dismail.de>
>
> Co-authored-by: jgart <jgart@dismail.de>
> Co-authored-by: Jorge Acereda <jacereda@gmail.com>
> Co-authored-by: Gábor Boskovits <boskovits@gmail.com>
I normalized the commit messages and improved descriptions of new
packages, then applied the patch set.
Regards,
--
Nicolas Goaziou
On Wed, 12 Jan 2022 22:57:41 +0100 Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote: > Hello, > > jgart via Guix-patches via <guix-patches@gnu.org> writes: > > > From: Guix Together <jgart@dismail.de> > > > > Co-authored-by: jgart <jgart@dismail.de> > > Co-authored-by: Jorge Acereda <jacereda@gmail.com> > > Co-authored-by: Gábor Boskovits <boskovits@gmail.com> > > I normalized the commit messages and improved descriptions of new > packages, then applied the patch set. Thanks Nicolas! Much appreciated I closed the issue on our end we had open for it: https://todo.sr.ht/~whereiseveryone/guixrus/5 all best, jgart https://whereiseveryone.srht.site/ gemini://whereiseveryone.srht.site/