1 files changed, 30 insertions, 3 deletions
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)