diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3d71a7cf8b9..e3de42ec740 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -157,6 +157,7 @@ #:use-module (gnu packages gnuzilla) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages gperf) #:use-module (gnu packages graphics) #:use-module (gnu packages graphviz) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 2ff705e88a4..2f86fe8c134 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Collin J. Doering ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Guix Together +;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Ramana Radhakrishnan ;;; Copyright © 2021 Ricardo Wurmus @@ -3287,6 +3288,79 @@ Differentiation between text and binary files}. @end itemize") (license license:expat))) +(define-public go-github-com-gdamore-tcell + (package + (name "go-github-com-gdamore-tcell") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gdamore/tcell") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "178h7kj4zb8lcw84nbqanapnxrgvhq4111xw4fj6m56y46anlzwg")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/gdamore/tcell")) + (inputs + (list go-github-com-gdamore-encoding + go-github-com-mattn-go-runewidth + go-github-com-lucasb-eyer-go-colorful + go-golang-org-x-sys + go-golang-org-x-text)) + (home-page "https://github.com/gdamore/tcell") + (synopsis "Provide a cell-based view for text terminals") + (description + "This package includes a full parser and expander for terminfo +capability strings to avoid hard-coding escape strings for formatting. It +also favors portability, and includes support for all POSIX systems.") + (license license:asl2.0))) + +(define-public go-github-com-gdamore-tcell-v2 + (package + (inherit go-github-com-gdamore-tcell) + (name "go-github-com-gdamore-tcell-v2") + (version "2.7.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gdamore/tcell") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05b22sgyf8lnwjddxlfvlj7i8b67gnidhbnz86vvx8fddggpa5nd")))) + (arguments + (list + #:import-path "github.com/gdamore/tcell/v2")) + (propagated-inputs + (modify-inputs (package-inputs go-github-com-gdamore-tcell) + (prepend go-golang-org-x-term go-golang-org-x-sys))))) + +(define-public go-github-com-delthas-tcell-v2 + ;; TODO This variant allows upgrading senpai, and looks to be unnecessary in + ;; the next release of senpai + (hidden-package + (package + (inherit go-github-com-gdamore-tcell) + (name "go-github-com-delthas-tcell") + (version "2.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/delthas/tcell") + (commit "837a7d7"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05zr73q38dawl7hr6g7v4pkyv6mqr0zp2l9qsgn7xmf1p9q4bn7j")))) + (propagated-inputs + (modify-inputs (package-inputs go-github-com-gdamore-tcell) + (prepend go-golang-org-x-term go-golang-org-x-sys)))))) + (define-public go-github-com-go-git-go-billy-v5 (package (name "go-github-com-go-git-go-billy-v5") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4b5b6e99eb7..e075c4a1c7a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4481,78 +4481,6 @@ encoding in Go.") over strings.") (license license:expat))) -(define-public go-github-com-gdamore-tcell - (package - (name "go-github-com-gdamore-tcell") - (version "1.4.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gdamore/tcell") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "178h7kj4zb8lcw84nbqanapnxrgvhq4111xw4fj6m56y46anlzwg")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gdamore/tcell")) - (inputs - (list go-github-com-mattn-go-runewidth - go-github-com-lucasb-eyer-go-colorful - go-golang-org-x-text - go-golang-org-x-sys - go-github-com-gdamore-encoding)) - (home-page "https://github.com/gdamore/tcell") - (synopsis "Provide a cell-based view for text terminals") - (description "This package includes a full parser and expander for -terminfo capability strings to avoid hard-coding escape strings for -formatting. It also favors portability, and includes support for all POSIX -systems.") - (license license:asl2.0))) - -(define-public go-github-com-gdamore-tcell-v2 - (package - (inherit go-github-com-gdamore-tcell) - (name "go-github-com-gdamore-tcell-v2") - (version "2.7.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gdamore/tcell") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "05b22sgyf8lnwjddxlfvlj7i8b67gnidhbnz86vvx8fddggpa5nd")))) - (arguments - (list #:import-path "github.com/gdamore/tcell/v2")) - (propagated-inputs - (modify-inputs (package-inputs go-github-com-gdamore-tcell) - (prepend go-golang-org-x-term go-golang-org-x-sys))))) - -(define-public go-github-com-delthas-tcell-v2 - ;; TODO This variant allows upgrading senpai, and looks to be unnecessary in - ;; the next release of senpai - (hidden-package - (package - (inherit go-github-com-gdamore-tcell) - (name "go-github-com-delthas-tcell") - (version "2.4.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/delthas/tcell") - (commit "837a7d7"))) - (file-name (git-file-name name version)) - (sha256 - (base32 "05zr73q38dawl7hr6g7v4pkyv6mqr0zp2l9qsgn7xmf1p9q4bn7j")))) - (propagated-inputs (modify-inputs (package-inputs - go-github-com-gdamore-tcell) - (prepend go-golang-org-x-term go-golang-org-x-sys)))))) - (define-public go-git-sr-ht-rockorager-tcell-term (package (name "go-git-sr-ht-rockorager-tcell-term")