sharlatan pushed a commit to branch go-team
in repository guix.
commit 59c5a12ab8ecfa1c42ec58a16cfc9452d9d31241
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Sun Nov 24 11:42:43 2024 +0000
gnu: go-github-com-spf13-pflag: Move to golang-xyz.
* gnu/packages/golang.scm (go-github-com-spf13-pflag): Move from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I15be5ebbc1b2c200267676ae0c8b88fc2e062e85
---
gnu/packages/golang-xyz.scm | 40 +++++++++++++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 38 --------------------------------------
2 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 4edabc60fc..08175f9de0 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2019 Brian Leung <[email protected]>
;;; Copyright © 2019, 2021 Vagrant Cascadian <[email protected]>
;;; Copyright © 2019-2021 Martin Becze <[email protected]>
-;;; Copyright © 2019-2022, 2024 Efraim Flashner <[email protected]>
+;;; Copyright © 2019-2024 Efraim Flashner <[email protected]>
;;; Copyright © 2020 Alex Griffin <[email protected]>
;;; Copyright © 2020 Danny Milosavljevic <[email protected]>
;;; Copyright © 2020 Jack Hill <[email protected]>
@@ -6981,6 +6981,44 @@ a few advantages over using the standard log library
alone.
@end itemize")
(license license:expat)))
+;; XXX: Not maintained for 3y, see
+;; <https://github.com/spf13/pflag/issues/385>.
+(define-public go-github-com-spf13-pflag
+ (package
+ (name "go-github-com-spf13-pflag")
+ (version "1.0.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/spf13/pflag";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ ;; Fix compatibility with go-1.19+
+ ;; https://github.com/spf13/pflag/issues/368
+ (substitute* "flag_test.go"
+ (("fmt\\.Println") "fmt.Print")
+ (("\\+ got\\)") "+ got + \"\\n\")")
+ (("\\+ defaultOutput\\)") "+ defaultOutput + \"\\n\")"))))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/spf13/pflag"))
+ (home-page "https://github.com/spf13/pflag";)
+ (synopsis "Replacement for Go's @code{flag} package")
+ (description
+ "Pflag is library to replace Go's @code{flag} package. It implements
+POSIX/GNU-style command-line options with double hyphens. It is is compatible
+with the
+@uref{https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html,
+GNU extensions} to the POSIX recommendations for command-line options.")
+ (license license:bsd-3)))
+
(define-public go-github-com-stathat-go
(let ((commit "74669b9f388d9d788c97399a0824adbfee78400e")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 41d770046e..545e823c42 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3178,44 +3178,6 @@ information about the resource usage and performance
characteristics of running
containers.")
(license license:asl2.0))))
-;; XXX: Not maintained for 3y, see
-;; <https://github.com/spf13/pflag/issues/385>.
-(define-public go-github-com-spf13-pflag
- (package
- (name "go-github-com-spf13-pflag")
- (version "1.0.5")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/spf13/pflag";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"))
- (snippet
- #~(begin
- (use-modules (guix build utils))
- ;; Fix compatibility with go-1.19+
- ;; https://github.com/spf13/pflag/issues/368
- (substitute* "flag_test.go"
- (("fmt\\.Println") "fmt.Print")
- (("\\+ got\\)") "+ got + \"\\n\")")
- (("\\+ defaultOutput\\)") "+ defaultOutput + \"\\n\")"))))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/spf13/pflag"))
- (home-page "https://github.com/spf13/pflag";)
- (synopsis "Replacement for Go's @code{flag} package")
- (description
- "Pflag is library to replace Go's @code{flag} package. It implements
-POSIX/GNU-style command-line options with double hyphens. It is is compatible
-with the
-@uref{https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html,
-GNU extensions} to the POSIX recommendations for command-line options.")
- (license license:bsd-3)))
-
(define-public go-github-com-spf13-viper
(package
(name "go-github-com-spf13-viper")
