* [bug#70123] [PATCH 01/12] gnu: Add go-github-com-pierrec-cmdflag.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 02/12] gnu: Add go-github-com-go-logr-logr Sharlatan Hellseher
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
* gnu/packages/golang-xyz.scm (go-github-com-pierrec-cmdflag): New
variable.
Change-Id: If57b49b0497b622200dc82bbb921461c739ead29
---
gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index e1ac32273c..7fe750f59e 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1897,6 +1897,30 @@ (define-public go-github-com-orisano-pixelmatch
included in this package.")
(license license:expat)))
+(define-public go-github-com-pierrec-cmdflag
+ (package
+ (name "go-github-com-pierrec-cmdflag")
+ (version "0.0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pierrec/cmdflag")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0nxmqkjwd7i3blmspvxib352vm6167h2ffqy4m9zc3fb9srvrpqc"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pierrec/cmdflag"))
+ (home-page "https://github.com/pierrec/cmdflag")
+ (synopsis "Augment the flag package with commands")
+ (description
+ "Package @code{cmdflag} provides simple command line commands processing
+on top of the standard library @code{flag} package.")
+ (license license:bsd-3)))
+
(define-public go-github-com-prometheus-client-model
(let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016")
(revision "2"))
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [bug#70123] [PATCH 02/12] gnu: Add go-github-com-go-logr-logr.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 01/12] gnu: Add go-github-com-pierrec-cmdflag Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 03/12] gnu: Add go-github-com-onsi-ginkgo-v2 Sharlatan Hellseher
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
* gnu/packages/golang-xyz.scm (go-github-com-go-logr-logr): New
variable.
Change-Id: I0fe5e817fa653bcdbe2fea03fe5d608ea270fa12
---
gnu/packages/golang-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 7fe750f59e..1bf296bda0 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -991,6 +991,42 @@ (define-public go-github-com-gabriel-vasile-mimetype
@end itemize")
(license license:expat)))
+(define-public go-github-com-go-logr-logr
+ (package
+ (name "go-github-com-go-logr-logr")
+ (version "1.4.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-logr/logr")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0x0q9jkk2p5pz4lii1qs8ifnsib4ib5s8pigmjwdmagl976g8nhm"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:go go-1.18
+ #:import-path "github.com/go-logr/logr"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-examples-and-benchmarks
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file-recursively
+ (string-append "src/" import-path "/examples"))
+ (delete-file-recursively
+ (string-append "src/" import-path "/funcr/example"))
+ (delete-file-recursively
+ (string-append "src/" import-path "/benchmark")))))))
+ (home-page "https://github.com/go-logr/logr")
+ (synopsis "Minimal logging API for Go")
+ (description
+ "Package @code{logr} defines a general-purpose logging API and abstract
+interfaces to back that API. Packages in the Go ecosystem can depend on it,
+while callers can implement logging with whatever backend is appropriate.")
+ (license license:asl2.0)))
+
(define-public go-github-com-hashicorp-errwrap
(package
(name "go-github-com-hashicorp-errwrap")
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [bug#70123] [PATCH 03/12] gnu: Add go-github-com-onsi-ginkgo-v2.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 01/12] gnu: Add go-github-com-pierrec-cmdflag Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 02/12] gnu: Add go-github-com-go-logr-logr Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 04/12] gnu: Add go-code-cloudfoundry-org-bytefmt Sharlatan Hellseher
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
* gnu/packages/golang-check.scm (go-github-com-onsi-ginkgo-v2): New
variable.
Change-Id: Ied8167b850d5e5262713d0858ef7160d5c3d74c2
---
gnu/packages/golang-check.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 1558536182..6f36615ab0 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -460,6 +460,33 @@ (define-public go-github-com-onsi-ginkgo
Gomega matcher library.")
(license license:expat)))
+(define-public go-github-com-onsi-ginkgo-v2
+ (package
+ (inherit go-github-com-onsi-ginkgo)
+ (name "go-github-com-onsi-ginkgo-v2")
+ (version "2.17.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/onsi/ginkgo")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "089x6pz5563ldbxiwaqvd2g4dqfzlr25dflmas3gfq51ibwzh4vz"))))
+ (arguments
+ (list
+ #:go go-1.20
+ #:import-path "github.com/onsi/ginkgo/v2"))
+ (propagated-inputs
+ (list go-github-com-go-logr-logr
+ ;; go-github-com-google-pprof ; not packed yet in Guix, for profiling
+ go-github-com-onsi-gomega
+ go-github-com-go-task-slim-sprig
+ go-golang-org-x-net
+ go-golang-org-x-sys
+ go-golang-org-x-tools))))
+
(define-public go-github-com-prashantv-gostub
(package
(name "go-github-com-prashantv-gostub")
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [bug#70123] [PATCH 04/12] gnu: Add go-code-cloudfoundry-org-bytefmt.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
` (2 preceding siblings ...)
2024-04-01 10:43 ` [bug#70123] [PATCH 03/12] gnu: Add go-github-com-onsi-ginkgo-v2 Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 05/12] gnu: Add go-github-com-pierrec-lz4 Sharlatan Hellseher
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
* gnu/packages/golang-xyz.scm (go-code-cloudfoundry-org-bytefmt): New
variable.
Change-Id: I1d77dd49987ad09b15149f244024831d26780e6e
---
gnu/packages/golang-xyz.scm | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 1bf296bda0..415233b100 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -68,6 +68,37 @@ (define-module (gnu packages golang-xyz)
;;; Libraries:
;;;
+(define-public go-code-cloudfoundry-org-bytefmt
+ (package
+ (name "go-code-cloudfoundry-org-bytefmt")
+ (version "0.0.0-20240329144308-0c372429d24b")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cloudfoundry/bytefmt")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0aqzbiy3idddyj39i7ydkjhnmpcbwr99g094kqiw72m9flrvrnxj"))
+ (snippet
+ #~(begin (use-modules (guix build utils))
+ (delete-file-recursively "vendor")))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:go go-1.20
+ #:import-path "code.cloudfoundry.org/bytefmt"))
+ (native-inputs
+ (list go-github-com-onsi-gomega
+ go-github-com-onsi-ginkgo-v2))
+ (home-page "https://pkg.go.dev/code.cloudfoundry.org/bytefmt")
+ (synopsis "Human readable byte formatter for Golang")
+ (description
+ "Package bytefmt contains helper methods and constants for converting to and from
+a human-readable byte format.")
+ (license license:asl2.0)))
+
(define-public go-github-com-a8m-envsubst
(package
(name "go-github-com-a8m-envsubst")
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [bug#70123] [PATCH 05/12] gnu: Add go-github-com-pierrec-lz4.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
` (3 preceding siblings ...)
2024-04-01 10:43 ` [bug#70123] [PATCH 04/12] gnu: Add go-code-cloudfoundry-org-bytefmt Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 06/12] gnu: go-github-com-schollz-progressbar-v3: Move to golang-xyz Sharlatan Hellseher
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
* gnu/packages/golang-compression.scm (go-github-com-pierrec-lz4,
go-github-com-pierrec-lz4-v4, go-lz4c): New variables.
Change-Id: Ie337a1cbfbc5af2dfd258999a4edb508bd552e03
---
gnu/packages/golang-compression.scm | 71 ++++++++++++++++++++++++++++-
1 file changed, 70 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index a1ad00f588..f40664d8f7 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -28,7 +28,8 @@ (define-module (gnu packages golang-compression)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
- #:use-module (gnu packages))
+ #:use-module (gnu packages)
+ #:use-module (gnu packages golang-xyz))
;;; Commentary:
;;;
@@ -190,6 +191,52 @@ (define-public go-github-com-nwaples-rardecode-v2
"This package provides a library for reading RAR archives with Golang.")
(license license:bsd-2)))
+(define-public go-github-com-pierrec-lz4
+ (package
+ (name "go-github-com-pierrec-lz4")
+ (version "2.6.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pierrec/lz4")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0vfn01gd3hcpbj6gb4ig3pw6bv0g4j5780awr0fv4kf9id8gjvyy"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pierrec/lz4"))
+ (home-page "https://github.com/pierrec/lz4")
+ (synopsis "LZ4 compression in pure Go")
+ (description
+ "@code{lz4} provides a streaming interface to
+@url{http://fastcompression.blogspot.fr/2013/04/lz4-streaming-format-final.html,
+LZ4 data streams} as well as low level compress and uncompress functions for
+LZ4 data blocks. The implementation is based on the reference C
+@url{https://github.com/lz4/lz4, one}.")
+ (license license:bsd-3)))
+
+(define-public go-github-com-pierrec-lz4-v4
+ (package
+ (inherit go-github-com-pierrec-lz4)
+ (name "go-github-com-pierrec-lz4-v4")
+ (version "4.1.21")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pierrec/lz4")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0nc2aprbw4s6cx2mijaqdswkgnizx8fqb0mzha82wrznl3gz69ni"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/pierrec/lz4/v4"))))
+
(define-public go-github-com-ulikunitz-xz
(package
(name "go-github-com-ulikunitz-xz")
@@ -216,6 +263,28 @@ (define-public go-github-com-ulikunitz-xz
any dependency on any C code.")
(license license:bsd-3)))
+;;;
+;;; Executables:
+;;;
+
+(define-public go-lz4c
+ (package
+ (inherit go-github-com-pierrec-lz4-v4)
+ (name "go-lz4c")
+ (arguments
+ (list
+ #:install-source? #f
+ #:import-path "github.com/pierrec/lz4/cmd/lz4c"
+ #:unpack-path "github.com/pierrec/lz4"))
+ (native-inputs
+ (list go-code-cloudfoundry-org-bytefmt
+ go-github-com-pierrec-cmdflag
+ go-github-com-schollz-progressbar-v3))
+ (description
+ (string-append (package-description go-github-com-pierrec-lz4-v4)
+ " This package provides an additional command line
+interface tool to compress and decompress LZ4 files."))))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [bug#70123] [PATCH 06/12] gnu: go-github-com-schollz-progressbar-v3: Move to golang-xyz.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
` (4 preceding siblings ...)
2024-04-01 10:43 ` [bug#70123] [PATCH 05/12] gnu: Add go-github-com-pierrec-lz4 Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 07/12] gnu: go-github-com-schollz-progressbar-v3: Adjust inputs Sharlatan Hellseher
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-schollz-progressbar-v3): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.
* gnu/packages/android.scm: Add (gnu packages golang-xyz) module.
Change-Id: Id40397b4f3323670847d8e46f5d8fc6ffea61c84
---
gnu/packages/android.scm | 1 +
gnu/packages/golang-xyz.scm | 46 +++++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 45 ------------------------------------
3 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 902bc31faf..b6f37732b4 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -50,6 +50,7 @@ (define-module (gnu packages android)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages image)
#:use-module (gnu packages java)
#:use-module (gnu packages linux)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 415233b100..c62fab949f 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2023 Sergey Trofimov <sarg@sarg.org.ru>
;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -2048,6 +2049,51 @@ (define-public go-github-com-rcrowley-go-metrics
(home-page "https://github.com/rcrowley/go-metrics")
(license license:bsd-2))))
+(define-public go-github-com-schollz-progressbar-v3
+ (package
+ (name "go-github-com-schollz-progressbar-v3")
+ (version "3.13.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/schollz/progressbar")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hjahr5r52i7w6iyvl3rpzr46iignhfdh4694fl7m2b4gkaw9gd6"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/schollz/progressbar/v3"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-examples
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file-recursively
+ (string-append "src/" import-path "/examples"))))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (when tests?
+ ;; The full test suite requires Internet access, so only
+ ;; run the short tests.
+ (invoke "go" "test" "-test.short" import-path)))))))
+ (propagated-inputs
+ (list go-github-com-davecgh-go-spew
+ go-github-com-mattn-go-isatty
+ go-github-com-mattn-go-runewidth
+ go-github-com-mitchellh-colorstring
+ go-github-com-stretchr-testify
+ go-golang-org-x-term))
+ (home-page "https://github.com/schollz/progressbar")
+ (synopsis "Simple command-line interface (CLI) progress bar")
+ (description
+ "This package provides a very simple thread-safe progress bar. The
+@code{progressbar} implements an @code{io.Writer} so it can automatically
+detect the number of bytes written to a stream, so you can use it as a
+@code{progressbar} for an @code{io.Reader}. When @code{progressbar}'s length
+is undetermined, a customizable spinner is shown.")
+ (license license:expat)))
+
(define-public go-github-com-shirou-gopsutil
(package
(name "go-github-com-shirou-gopsutil")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 385da42eda..711c007138 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9640,51 +9640,6 @@ (define-public go-github-com-mitchellh-colorstring
"Colorstring provides functions for colorizing strings for terminal output.")
(license license:expat)))
-(define-public go-github-com-schollz-progressbar-v3
- (package
- (name "go-github-com-schollz-progressbar-v3")
- (version "3.13.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/schollz/progressbar")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1hjahr5r52i7w6iyvl3rpzr46iignhfdh4694fl7m2b4gkaw9gd6"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/schollz/progressbar/v3"
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'remove-examples
- (lambda* (#:key import-path #:allow-other-keys)
- (delete-file-recursively
- (string-append "src/" import-path "/examples"))))
- (replace 'check
- (lambda* (#:key tests? import-path #:allow-other-keys)
- (when tests?
- ;; The full test suite requires Internet access, so only
- ;; run the short tests.
- (invoke "go" "test" "-test.short" import-path)))))))
- (propagated-inputs
- (list go-golang-org-x-term
- go-github-com-stretchr-testify
- go-github-com-mitchellh-colorstring
- go-github-com-mattn-go-runewidth
- go-github-com-mattn-go-isatty
- go-github-com-davecgh-go-spew))
- (home-page "https://github.com/schollz/progressbar")
- (synopsis "Simple command-line interface (CLI) progress bar")
- (description
- "This package provides a very simple thread-safe progress bar. The
-@code{progressbar} implements an @code{io.Writer} so it can automatically
-detect the number of bytes written to a stream, so you can use it as a
-@code{progressbar} for an @code{io.Reader}. When @code{progressbar}'s length
-is undetermined, a customizable spinner is shown.")
- (license license:expat)))
-
(define-public go-git-sr-ht-emersion-go-scfg
(package
(name "go-git-sr-ht-emersion-go-scfg")
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [bug#70123] [PATCH 07/12] gnu: go-github-com-schollz-progressbar-v3: Adjust inputs.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
` (5 preceding siblings ...)
2024-04-01 10:43 ` [bug#70123] [PATCH 06/12] gnu: go-github-com-schollz-progressbar-v3: Move to golang-xyz Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 08/12] gnu: go-github-com-onsi-ginkgo: Refresh package style Sharlatan Hellseher
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
* gnu/packages/golang-xyz.scm (go-github-com-schollz-progressbar-v3):
Adjust inputs.
[propagated-inputs]: Remove go-github-com-davecgh-go-spew,
go-github-com-mattn-go-isatty, and go-github-com-stretchr-testify.
[native-inputs]: Add go-github-com-stretchr-testify.
Change-Id: I8a1e24d6570ce36812d08e196f415b81e8ec7bda
---
gnu/packages/golang-xyz.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index c62fab949f..9b0f67de6f 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -2077,12 +2077,11 @@ (define-public go-github-com-schollz-progressbar-v3
;; The full test suite requires Internet access, so only
;; run the short tests.
(invoke "go" "test" "-test.short" import-path)))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
- (list go-github-com-davecgh-go-spew
- go-github-com-mattn-go-isatty
- go-github-com-mattn-go-runewidth
+ (list go-github-com-mattn-go-runewidth
go-github-com-mitchellh-colorstring
- go-github-com-stretchr-testify
go-golang-org-x-term))
(home-page "https://github.com/schollz/progressbar")
(synopsis "Simple command-line interface (CLI) progress bar")
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [bug#70123] [PATCH 08/12] gnu: go-github-com-onsi-ginkgo: Refresh package style.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
` (6 preceding siblings ...)
2024-04-01 10:43 ` [bug#70123] [PATCH 07/12] gnu: go-github-com-schollz-progressbar-v3: Adjust inputs Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 09/12] gnu: go-github-com-onsi-gomega: Move to golang-check Sharlatan Hellseher
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
* gnu/packages/golang-check.scm (go-github-com-onsi-ginkgo)
[arguments]: Place <#:import-path> on new line.
[propagated-inputs]: Sort inputs alphabetically.
Change-Id: I70b7f1838c8d8fc6744ad724ed4b79fdd645f6c4
---
gnu/packages/golang-check.scm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 6f36615ab0..8ea0c45ff8 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -441,17 +441,17 @@ (define-public go-github-com-onsi-ginkgo
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "1hh6n7q92y0ai8k6rj2yzw6wwxikhyiyk4j92zgvf1zad0gmqqmz"))))
+ (base32 "1hh6n7q92y0ai8k6rj2yzw6wwxikhyiyk4j92zgvf1zad0gmqqmz"))))
(build-system go-build-system)
(arguments
- (list #:import-path "github.com/onsi/ginkgo"))
+ (list
+ #:import-path "github.com/onsi/ginkgo"))
(propagated-inputs
- (list go-golang-org-x-sys
- go-golang-org-x-tools
- go-github-com-go-task-slim-sprig
+ (list go-github-com-go-task-slim-sprig
go-github-com-nxadm-tail
- go-github-com-onsi-gomega))
+ go-github-com-onsi-gomega
+ go-golang-org-x-sys
+ go-golang-org-x-tools))
(home-page "https://github.com/onsi/ginkgo")
(synopsis "BDD-style testing framework for Go")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [bug#70123] [PATCH 09/12] gnu: go-github-com-onsi-gomega: Move to golang-check.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
` (7 preceding siblings ...)
2024-04-01 10:43 ` [bug#70123] [PATCH 08/12] gnu: go-github-com-onsi-ginkgo: Refresh package style Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 10/12] gnu: go-github.com-jessevdk-go-flags: Adjust variable name Sharlatan Hellseher
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
* gnu/packages/golang.scm (go-github-com-onsi-gomega): Move from here ...
* gnu/packages/golang-check.scm: ... to here.
Change-Id: Ia9a7d0e88ebda2fcfb3fe623163e270756900e94
---
gnu/packages/golang-check.scm | 33 +++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 31 -------------------------------
2 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 8ea0c45ff8..dd91bf23bc 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -487,6 +487,39 @@ (define-public go-github-com-onsi-ginkgo-v2
go-golang-org-x-sys
go-golang-org-x-tools))))
+(define-public go-github-com-onsi-gomega
+ (package
+ (name "go-github-com-onsi-gomega")
+ (version "1.19.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/onsi/gomega")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "092phwk97sk4sv0nbx5pfhqs6x3x1lnrjwyda1m6b6zwrfmq5c6i"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/onsi/gomega"
+ ;; Unless we disable the tests, we have a circular dependency on
+ ;; ginkgo/v2.
+ #:tests? #f))
+ (propagated-inputs
+ (list go-github-com-golang-protobuf-proto
+ go-golang-org-x-net
+ go-golang-org-x-sys
+ go-golang-org-x-text
+ go-google-golang-org-protobuf
+ go-gopkg-in-yaml-v2))
+ (home-page "https://github.com/onsi/gomega")
+ (synopsis "Matcher library for Ginkgo")
+ (description
+ "Gomega is the preferred matcher/assertion library for the Ginkgo test
+framework.")
+ (license license:expat)))
+
(define-public go-github-com-prashantv-gostub
(package
(name "go-github-com-prashantv-gostub")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 711c007138..3c3d9c7222 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10271,37 +10271,6 @@ (define-public go-github-com-lithammer-fuzzysearch
library bevacqua/fuzzysearch.")
(license license:expat)))
-(define-public go-github-com-onsi-gomega
- (package
- (name "go-github-com-onsi-gomega")
- (version "1.19.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/onsi/gomega")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "092phwk97sk4sv0nbx5pfhqs6x3x1lnrjwyda1m6b6zwrfmq5c6i"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/onsi/gomega"
- ;; Unless we disable the tests, we have a circular dependency on
- ;; ginkgo/v2.
- #:tests? #f))
- (propagated-inputs (list go-github-com-golang-protobuf-proto
- go-golang-org-x-net
- go-golang-org-x-sys
- go-golang-org-x-text
- go-google-golang-org-protobuf
- go-gopkg-in-yaml-v2))
- (home-page "https://github.com/onsi/gomega")
- (synopsis "Matcher library for Ginkgo")
- (description
- "Gomega is the preferred matcher library for the Ginkgo test framework.")
- (license license:expat)))
-
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [bug#70123] [PATCH 10/12] gnu: go-github.com-jessevdk-go-flags: Adjust variable name.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
` (8 preceding siblings ...)
2024-04-01 10:43 ` [bug#70123] [PATCH 09/12] gnu: go-github-com-onsi-gomega: Move to golang-check Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 11/12] gnu: fiano: Refresh package style Sharlatan Hellseher
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
* gnu/packages/golang.scm (go-github.com-jessevdk-go-flags): Rename to
go-github-com-jessevdk-go-flags to follow go import naming convention.
* gnu/packages/golang.scm (go-github-com-dhowett-go-plist)
[inputs]: Remove go-github.com-jessevdk-go-flags, add
go-github-com-jessevdk-go-flags.
Change-Id: I6fc977b11e5044b8e6cab2baa4c107967baedb59
---
gnu/packages/golang.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3c3d9c7222..0f36c6b696 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1881,7 +1881,7 @@ (define-public go-github-com-dhowett-go-plist
(build-system go-build-system)
(arguments `(#:import-path "howett.net/plist"))
(inputs
- (list go-github.com-jessevdk-go-flags go-github-com-kr-pretty
+ (list go-github-com-jessevdk-go-flags go-github-com-kr-pretty
go-gopkg-in-check-v1 go-gopkg-in-yaml-v2))
(home-page "https://github.com/DHowett/go-plist")
(synopsis "Apple property list transcoder")
@@ -2839,9 +2839,9 @@ (define-public go-github-com-leodido-go-urn
specified by @uref{https://tools.ietf.org/html/rfc2141, IETF RFC 2141}.")
(license license:expat)))
-(define-public go-github.com-jessevdk-go-flags
+(define-public go-github-com-jessevdk-go-flags
(package
- (name "go-github.com-jessevdk-go-flags")
+ (name "go-github-com-jessevdk-go-flags")
(version "1.5.0")
(source (origin
(method git-fetch)
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [bug#70123] [PATCH 11/12] gnu: fiano: Refresh package style.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
` (9 preceding siblings ...)
2024-04-01 10:43 ` [bug#70123] [PATCH 10/12] gnu: go-github.com-jessevdk-go-flags: Adjust variable name Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-01 10:43 ` [bug#70123] [PATCH 12/12] gnu: fiano: Update to 1.2.0 Sharlatan Hellseher
2024-04-04 16:43 ` bug#70123: [PATCH 00/12] " Sharlatan Hellseher
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
* gnu/packages/admin.scm (fiano): Refresh package style.
[source]: Remove trailing #t from the snippet.
[arguments]: Use list style.
[inputs]: Remove labels and use list style.
[home-page]: Place before synopsis.
Change-Id: I896c59d4be14c7ed16bc1978e0d9996bd7b93c17
---
gnu/packages/admin.scm | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2b94b1e17a..78e5e355d6 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -5160,7 +5160,7 @@ (define-public atop
`((release-monitoring-url . "https://www.atoptool.nl/downloadatop.php")))
(license license:gpl2+)))
-;; TODO: Unvendor u-root (pkg: forth, golang, testutil).
+;; TODO: Pack u-root for: forth, and some tests.
(define fiano
(package
(name "fiano")
@@ -5170,28 +5170,26 @@ (define fiano
(uri (git-reference
(url "https://github.com/linuxboot/fiano.git")
(commit (string-append "v" version))))
- (file-name (string-append name "-" version "-checkout"))
+ (file-name (git-file-name name version))
(sha256
(base32
"03ihdwwhb7g6bihx141cn0924sjs5ps6q3ps58pk1cg0g0srrr9h"))
(modules '((guix build utils)))
(snippet
- '(begin
- (delete-file-recursively "vendor/golang.org")
- (delete-file-recursively "vendor/github.com")
- #t))))
+ #~(begin
+ ;; Remove all vendored sources.
+ (delete-file-recursively "vendor")))))
(build-system go-build-system)
(arguments
- `(#:import-path "github.com/linuxboot/fiano"
- #:unpack-path "github.com/linuxboot/fiano"))
- (native-inputs
- `())
+ (list
+ #:import-path "github.com/linuxboot/fiano"
+ #:unpack-path "github.com/linuxboot/fiano"))
(inputs
- `(("go-golang-org-x-text" ,go-golang-org-x-text)
- ("go-github-com-ulikunitz-xz" ,go-github-com-ulikunitz-xz)))
- (synopsis "UEFI image editor")
- (description "This package provides a command-line UEFI image editor.")
+ (list go-golang-org-x-text go-github-com-ulikunitz-xz))
(home-page "https://github.com/linuxboot/fiano")
+ (synopsis "UEFI image editor")
+ (description
+ "This package provides a command-line UEFI image editor.")
(license license:bsd-3)))
(define-public fiano-utk
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [bug#70123] [PATCH 12/12] gnu: fiano: Update to 1.2.0.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
` (10 preceding siblings ...)
2024-04-01 10:43 ` [bug#70123] [PATCH 11/12] gnu: fiano: Refresh package style Sharlatan Hellseher
@ 2024-04-01 10:43 ` Sharlatan Hellseher
2024-04-04 16:43 ` bug#70123: [PATCH 00/12] " Sharlatan Hellseher
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-01 10:43 UTC (permalink / raw)
To: 70123; +Cc: Sharlatan Hellseher
The version style has been changed from v7.0.2 starting v1.0.3. This
change may cause guix refresh to detect incorrect latest version, see
<https://github.com/linuxboot/fiano/tags>.
This changes consolidate building all commands directly from the fiano
package.
* gnu/packages/admin.scm (fiano): Make variable public, update to 1.2.0.
[source]: Remove snippet, there is no longer 'vendor' directory in a
new release.
[arguments] <#:phases>: Add custom 'build, 'check and 'install phases to
cover complex package structure and produce all provided commands.
[inputs]: Add go-github-com-dustin-go-humanize,
go-github-com-hashicorp-errwrap, go-github-com-hashicorp-go-multierror,
go-github-com-jessevdk-go-flags, go-github-com-pierrec-lz4, and
go-github-com-spf13-pflag.
[description]: Highlight which commands are included in the package.
* gnu/packages/admin.scm (fiano-utk, fiano-fmap): Delete variables.
Change-Id: I4b7573e20953ba52c9736e7f64c6b6347221fc72
---
gnu/packages/admin.scm | 126 +++++++++++++++++++++++++++++++----------
1 file changed, 97 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 78e5e355d6..e5a4895dc9 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -135,6 +135,7 @@ (define-module (gnu packages admin)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-compression)
+ #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages groff)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
@@ -5161,10 +5162,12 @@ (define-public atop
(license license:gpl2+)))
;; TODO: Pack u-root for: forth, and some tests.
-(define fiano
- (package
- (name "fiano")
- (version "5.0.0")
+(define-public fiano
+ (package
+ (name "fiano")
+ ;; The versioning count has been changed since commit <2021-12-01>
+ ;; 1eb599564549691603589219c2be34f966a32ff1.
+ (version "1.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -5173,41 +5176,106 @@ (define fiano
(file-name (git-file-name name version))
(sha256
(base32
- "03ihdwwhb7g6bihx141cn0924sjs5ps6q3ps58pk1cg0g0srrr9h"))
- (modules '((guix build utils)))
- (snippet
- #~(begin
- ;; Remove all vendored sources.
- (delete-file-recursively "vendor")))))
+ "0s5fx4lhgb68qbx4ql34rcm678qdf0c4xl97bgc8dx9xwwqifza1"))))
(build-system go-build-system)
(arguments
(list
+ #:install-source? #f
#:import-path "github.com/linuxboot/fiano"
- #:unpack-path "github.com/linuxboot/fiano"))
+ #:unpack-path "github.com/linuxboot/fiano"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; XXX: Replace this part when it's implemented in go-build-system.
+ (replace 'build
+ (lambda* (#:key import-path #:allow-other-keys)
+ (for-each
+ (lambda (cmd)
+ (invoke "go" "build" "-v" "-x" "-ldflags=-s -w" "-trimpath"
+ (string-append import-path "/cmds/" cmd)))
+ (list "cbfs"
+ "create-ffs"
+ ;; TODO: Not packed yet in guix, long jorney:
+ ;; - github.com/tjfoc/gmsm
+ ;;
+ ;; "fittool"
+ "fmap"
+ "fspinfo"
+ "glzma"
+ "guid2english"
+ "microcode"
+ "utk"))))
+ (replace 'check
+ (lambda* (#:key import-path tests? #:allow-other-keys)
+ (when tests?
+ (for-each
+ (lambda (dir)
+ (invoke "go" "test" "-v"
+ (string-append import-path dir "/...")))
+ (list "/pkg/bytes"
+ ;; TODO: Not packed yet in Guix, long jorney:
+ ;; - github.com/jedib0t
+ ;;
+ ;; "/pkg/amd"
+ "/pkg/cbfs"
+ "/pkg/compression"
+ "/pkg/fmap"
+ "/pkg/fsp"
+ "/pkg/guid"
+ "/pkg/guid2english"
+ ;; TODO: Not packed yet in Guix, long jorney:
+ ;; - github.com/tjfoc/gmsm
+ ;;
+ ;; "/pkg/intel"
+ "/pkg/knownguids"
+ "/pkg/log"
+ "/pkg/uefi"
+ "/pkg/unicode"
+ "/pkg/utk"
+ "/pkg/visitors"
+ "/cmds/cbfs"
+ "/cmds/create-ffs"
+ ;; TODO: Not packed yet in Guix, long jorney:
+ ;; - github.com/u-root/u-root
+ ;;
+ ;; "/cmds/fmap"
+ ;; "/cmds/fittool"
+ "/cmds/fspinfo"
+ "/cmds/glzma"
+ "/cmds/guid2english"
+ "/cmds/microcode"
+ "/cmds/utk")))))
+ (replace 'install
+ (lambda _
+ (let ((bindir (string-append #$output "/bin")))
+ (for-each
+ (lambda (cmd)
+ (install-file cmd bindir))
+ (list "cbfs"
+ "create-ffs"
+ ;; "fittool"
+ "fmap"
+ "fspinfo"
+ "glzma"
+ "guid2english"
+ "microcode"
+ "utk"))))))))
(inputs
- (list go-golang-org-x-text go-github-com-ulikunitz-xz))
+ (list go-github-com-dustin-go-humanize
+ go-github-com-hashicorp-errwrap
+ go-github-com-hashicorp-go-multierror
+ go-github-com-jessevdk-go-flags
+ go-github-com-pierrec-lz4
+ go-github-com-spf13-pflag
+ go-github-com-ulikunitz-xz
+ go-golang-org-x-text))
(home-page "https://github.com/linuxboot/fiano")
(synopsis "UEFI image editor")
(description
- "This package provides a command-line UEFI image editor.")
+ "This package provides a command-line UEFI image editor, including cbfs,
+create-ffs, fmap, fspinfo, glzma, guid2english, microcode and utk CLI
+utilities.")
(license license:bsd-3)))
-(define-public fiano-utk
- (package
- (inherit fiano)
- (name "fiano-utk")
- (arguments
- `(#:import-path "github.com/linuxboot/fiano/cmds/utk"
- #:unpack-path "github.com/linuxboot/fiano"))))
-
-(define-public fiano-fmap
- (package
- (inherit fiano)
- (name "fiano-fmap")
- (arguments
- `(#:import-path "github.com/linuxboot/fiano/cmds/fmap"
- #:unpack-path "github.com/linuxboot/fiano"))))
-
(define-public novena-eeprom
(package
(name "novena-eeprom")
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* bug#70123: [PATCH 00/12] fiano: Update to 1.2.0.
2024-04-01 10:39 [bug#70123] [PATCH 00/12] fiano: Update to 1.2.0 Sharlatan Hellseher
` (11 preceding siblings ...)
2024-04-01 10:43 ` [bug#70123] [PATCH 12/12] gnu: fiano: Update to 1.2.0 Sharlatan Hellseher
@ 2024-04-04 16:43 ` Sharlatan Hellseher
12 siblings, 0 replies; 14+ messages in thread
From: Sharlatan Hellseher @ 2024-04-04 16:43 UTC (permalink / raw)
To: 70123-done
[-- Attachment #1: Type: text/plain, Size: 55 bytes --]
Pushed as 798c13c5f8..fdcd3a107a to master to master.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread