diff options
| author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2024-12-22 20:02:45 +0000 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-01-21 23:42:16 +0000 |
| commit | 7c8c15f505f6b55153cb8b48ad3f28f567f1d5b1 (patch) | |
| tree | 7584cfcfac3f502967db46cd6b48ce8b96303891 | |
| parent | 4e422224c8ddd977cc6d78cf729569a6c4a6be26 (diff) | |
gnu: Add go-github-com-pborman-getopt-v2.
* gnu/packages/golang-xyz.scm (go-github-com-pborman-getopt): Downgrade
to 1.0.0 to reflect go.mod import path.
[source] <snippet>: Remove v2 dirrectory and package separatly.
(go-github-com-pborman-getopt-v2): New variable.
(go-ulid) [native-inputs] Remove go-github-com-pborman-getopt; add
go-github-com-pborman-getopt-v2.
* gnu/packages/calendar.scm (hebcal) [inputs]: Remove
go-github-com-pborman-getopt; add go-github-com-pborman-getopt-v2.
Change-Id: I62aaa277cfffdb11e39a77688778a26b4600dc56
| -rw-r--r-- | gnu/packages/calendar.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/golang-xyz.scm | 33 |
2 files changed, 31 insertions, 4 deletions
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index e2e828b3d0..9f97b20705 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -456,7 +456,7 @@ configured to show the current time in different timezones.") (list #:import-path "github.com/hebcal/hebcal")) (inputs (list go-github-com-hebcal-hebcal-go - go-github-com-pborman-getopt)) + go-github-com-pborman-getopt-v2)) (synopsis "Perpetual Jewish Calendar program") (description "Hebcal is a program for converting between Hebrew and Gregorian diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 4d409fbf31..80ac940324 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -8343,7 +8343,7 @@ processes.") (define-public go-github-com-pborman-getopt (package (name "go-github-com-pborman-getopt") - (version "2.1.0") + (version "1.0.0") (source (origin (method git-fetch) @@ -8352,7 +8352,14 @@ processes.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0sacv6g8cxfibxd3gnfjnzp7fynrnc4s2aaz5wbxivqqhvflc22l")))) + (base32 "1sa66n392hzqbahn47grbjyaasvpklnn4s1wkzs1kdwrfdd62kfa")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Submodules with their own go.mod files and packaged separately: + ;; + ;; - github.com/pborman/getopt/v2 + (delete-file-recursively "v2"))))) (build-system go-build-system) (arguments (list @@ -8364,6 +8371,26 @@ processes.") programs that use traditional command lines.") (license license:bsd-3))) +(define-public go-github-com-pborman-getopt-v2 + (package + (inherit go-github-com-pborman-getopt) + (name "go-github-com-pborman-getopt-v2") + (version "2.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pborman/getopt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sacv6g8cxfibxd3gnfjnzp7fynrnc4s2aaz5wbxivqqhvflc22l")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/pborman/getopt/v2" + #:unpack-path "github.com/pborman/getopt")))) + (define-public go-github-com-pelletier-go-toml (package (name "go-github-com-pelletier-go-toml") @@ -11955,7 +11982,7 @@ tool.")))) #:import-path "github.com/oklog/ulid/v2/cmd/ulid" #:unpack-path "github.com/oklog/ulid/v2")) (native-inputs - (list go-github-com-pborman-getopt)) + (list go-github-com-pborman-getopt-v2)) (description (string-append (package-description go-github-com-oklog-ulid) " This package provides an command line interface (CLI) |