[bug#62564] patches to fix age after update to v1.1.1

[bug#62564] patches to fix age after update to v1.1.1

[Nicolas Graves via Guix-patches via]

My use of age + pass-age was broken after the recent updates, these
underlying updates should fix them.

It might affect a too big number of packages though. 

-- 
Best regards,
Nicolas Graves

[bug#62564] [PATCH 1/2] gnu: go-golang-org-x-crypto: Update to 0.4.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-golang-org-x-crypto): Update to 0.4.0.
---
 gnu/packages/golang.scm | 58 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 18a80bf234..b25d8652a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -36,7 +36,7 @@
 ;;; Copyright © 2022 Pier-Hugues Pellerin <phpellerin@gmail.com>
 ;;; Copyright © 2022 muradm <mail@muradm.net>
 ;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev>
-;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
@@ -3174,37 +3174,35 @@ (define-public go-golang-org-x-tools
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-crypto
-  (let ((commit "2aa609cf4a9d7d1126360de73b55b6002f9e052a")
-        (revision "5"))
-    (package
-      (name "go-golang-org-x-crypto")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/crypto")
-                      (commit commit)))
-                (file-name (string-append "go.googlesource.com-crypto-"
-                                          version "-checkout"))
-                (sha256
-                 (base32
-                  "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/crypto"
+  (package
+    (name "go-golang-org-x-crypto")
+    (version "0.4.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://go.googlesource.com/crypto")
+                    (commit (string-append "v" version))))
+              (file-name (string-append "go.googlesource.com-crypto-"
+                                        version "-checkout"))
+              (sha256
+               (base32
+                "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "golang.org/x/crypto"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
          ;; Source-only package
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           ;; Source-only package
-           (delete 'build))))
-      (propagated-inputs
-       (list go-golang-org-x-sys))
-      (synopsis "Supplementary cryptographic libraries in Go")
-      (description "This package provides supplementary cryptographic libraries
+         (delete 'build))))
+    (propagated-inputs
+     (list go-golang-org-x-sys))
+    (synopsis "Supplementary cryptographic libraries in Go")
+    (description "This package provides supplementary cryptographic libraries
 for the Go language.")
-      (home-page "https://go.googlesource.com/crypto/")
-      (license license:bsd-3))))
+    (home-page "https://go.googlesource.com/crypto/")
+    (license license:bsd-3)))
 
 (define-public govulncheck
   (package
-- 
2.39.2

[bug#62564] [PATCH 2/2] gnu: go-golang-org-x-term: Update to 0.3.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-golang-org-x-term): Update to 0.3.0.
---
 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 b25d8652a9..bb69fa41a3 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10607,17 +10607,17 @@ (define-public go-lukechampine-com-blake3
 (define-public go-golang-org-x-term
   (package
     (name "go-golang-org-x-term")
-    (version "0.0.0-20210615171337-6886f2dfbf5b")
+    (version "0.3.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://go.googlesource.com/term")
-             (commit (go-version->git-ref version))))
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0661w7dp2ak1k4ii90v6chw2x8a6g4sc5j0ba58qlplaj4k5l0xs"))))
+         "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
     (build-system go-build-system)
     (arguments '(#:import-path "golang.org/x/term"))
     (propagated-inputs
-- 
2.39.2

[bug#62564] [PATCH v2 1/6] gnu: Remove go-github.com-howeyc-gopass.

[Nicolas Graves via Guix-patches via]

* gnu/packages/terminals.scm (go-github.com-howeyc-gopass): Delete variable.
---
 gnu/packages/terminals.scm | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 51b135c99d..ef9f16bce5 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1043,33 +1043,6 @@ (define-public fzf
        ("findutils" ,findutils)
        ("ncurses" ,ncurses)))))
 
-(define-public go-github.com-howeyc-gopass
-  (let ((commit "bf9dde6d0d2c004a008c27aaee91170c786f6db8")
-        (revision "0"))
-    (package
-      (name "go-github.com-howeyc-gopass")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/howeyc/gopass")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "github.com/howeyc/gopass"))
-      (propagated-inputs
-       (list go-golang-org-x-crypto))
-      (synopsis "Retrieve password from a terminal or piped input in Go")
-      (description
-       "@code{gopass} is a Go package for retrieving a password from user
-terminal or piped input.")
-      (home-page "https://github.com/howeyc/gopass")
-      (license license:isc))))
-
 (define-public python-pyte
   (package
     (name "python-pyte")
-- 
2.39.2

[bug#62564] [PATCH v2 2/6] gnu: go-golang-org-x-crypto: Update to 0.4.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-golang-org-x-crypto): Update to 0.4.0.
---
 gnu/packages/golang.scm | 58 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 18a80bf234..b25d8652a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -36,7 +36,7 @@
 ;;; Copyright © 2022 Pier-Hugues Pellerin <phpellerin@gmail.com>
 ;;; Copyright © 2022 muradm <mail@muradm.net>
 ;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev>
-;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
@@ -3174,37 +3174,35 @@ (define-public go-golang-org-x-tools
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-crypto
-  (let ((commit "2aa609cf4a9d7d1126360de73b55b6002f9e052a")
-        (revision "5"))
-    (package
-      (name "go-golang-org-x-crypto")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/crypto")
-                      (commit commit)))
-                (file-name (string-append "go.googlesource.com-crypto-"
-                                          version "-checkout"))
-                (sha256
-                 (base32
-                  "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/crypto"
+  (package
+    (name "go-golang-org-x-crypto")
+    (version "0.4.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://go.googlesource.com/crypto")
+                    (commit (string-append "v" version))))
+              (file-name (string-append "go.googlesource.com-crypto-"
+                                        version "-checkout"))
+              (sha256
+               (base32
+                "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "golang.org/x/crypto"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
          ;; Source-only package
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           ;; Source-only package
-           (delete 'build))))
-      (propagated-inputs
-       (list go-golang-org-x-sys))
-      (synopsis "Supplementary cryptographic libraries in Go")
-      (description "This package provides supplementary cryptographic libraries
+         (delete 'build))))
+    (propagated-inputs
+     (list go-golang-org-x-sys))
+    (synopsis "Supplementary cryptographic libraries in Go")
+    (description "This package provides supplementary cryptographic libraries
 for the Go language.")
-      (home-page "https://go.googlesource.com/crypto/")
-      (license license:bsd-3))))
+    (home-page "https://go.googlesource.com/crypto/")
+    (license license:bsd-3)))
 
 (define-public govulncheck
   (package
-- 
2.39.2

[bug#62564] [PATCH v2 3/6] gnu: go-golang-org-x-term: Update to 0.3.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-golang-org-x-term): Update to 0.3.0.
---
 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 b25d8652a9..bb69fa41a3 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10607,17 +10607,17 @@ (define-public go-lukechampine-com-blake3
 (define-public go-golang-org-x-term
   (package
     (name "go-golang-org-x-term")
-    (version "0.0.0-20210615171337-6886f2dfbf5b")
+    (version "0.3.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://go.googlesource.com/term")
-             (commit (go-version->git-ref version))))
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0661w7dp2ak1k4ii90v6chw2x8a6g4sc5j0ba58qlplaj4k5l0xs"))))
+         "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
     (build-system go-build-system)
     (arguments '(#:import-path "golang.org/x/term"))
     (propagated-inputs
-- 
2.39.2

[bug#62564] [PATCH v2 4/6] gnu: go-github-com-99designs-go-keyring: Update to 1.2.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-99designs-go-keyring): Update to 1.2.2.
---
 gnu/packages/golang.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index bb69fa41a3..acbc8d3d77 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11203,7 +11203,7 @@ (define-public go-github-com-go-libsecret
 (define-public go-github-com-99designs-go-keyring
   (package
     (name "go-github-com-99designs-go-keyring")
-    (version "1.1.6")
+    (version "1.2.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -11212,11 +11212,11 @@ (define-public go-github-com-99designs-go-keyring
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "08rcdqpxaa9n348q10fw40q4gxpjajkyrighykk71i7mxzwkcgwn"))))
+                "0mkvy7scyq07rkqhabfmkd8imcm4h9y7zj9palj04znpihpixa5m"))))
     (build-system go-build-system)
     (native-inputs
-     (list go-golang-org-x-crypto
-           go-golang-org-x-sys
+     (list go-golang-org-x-sys
+           go-golang-org-x-term
            go-github-com-mtibben-percent
            go-github-com-mitchellh-go-homedir
            go-github-com-dvsekhvalnov-jose2go
-- 
2.39.2

[bug#62564] [PATCH v2 5/6] gnu: pixterm: Add input go-golang-go-x-term.

[Nicolas Graves via Guix-patches via]

* gnu/packages/image-viewers.scm (pixterm): Add input go-golang-go-x-term.
---
 gnu/packages/image-viewers.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index d8d6304a85..89c6760962 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -524,7 +524,8 @@ (define-public pixterm
     (inputs (list go-github-com-disintegration-imaging
                   go-github-com-lucasb-eyer-go-colorful
                   go-golang-org-x-crypto
-                  go-golang-org-x-image))
+                  go-golang-org-x-image
+                  go-golang-org-x-term))
     (home-page "https://github.com/eliukblau/pixterm")
     (synopsis "Draw images in your ANSI terminal with true color")
     (description "PIXterm shows images directly in your terminal, recreating
-- 
2.39.2

[bug#62564] [PATCH v2 6/6] gnu: curlie: Add input go-golang-x-term.

[Nicolas Graves via Guix-patches via]

* gnu/packages/curl.scm (curlie): Add input go-golang-x-term.
---
 gnu/packages/curl.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 45bd2e6d36..5c96ea6d7f 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -404,8 +404,10 @@ (define-public curlie
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/rs/curlie"))
-    (inputs
-     (list curl go-golang-org-x-crypto go-golang-org-x-sys))
+    (inputs (list curl
+                  go-golang-org-x-crypto
+                  go-golang-org-x-sys
+                  go-golang-org-x-term))
     (home-page "https://curlie.io")
     (synopsis "The power of curl, the ease of use of httpie")
     (description "If you like the interface of HTTPie but miss the features of
-- 
2.39.2

[bug#62564] [PATCH v3 01/14] gnu: Remove go-github.com-howeyc-gopass.

[Nicolas Graves via Guix-patches via]

* gnu/packages/terminals.scm (go-github.com-howeyc-gopass): Delete variable.
---
 gnu/packages/terminals.scm | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 51b135c99d..ef9f16bce5 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1043,33 +1043,6 @@ (define-public fzf
        ("findutils" ,findutils)
        ("ncurses" ,ncurses)))))
 
-(define-public go-github.com-howeyc-gopass
-  (let ((commit "bf9dde6d0d2c004a008c27aaee91170c786f6db8")
-        (revision "0"))
-    (package
-      (name "go-github.com-howeyc-gopass")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/howeyc/gopass")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "github.com/howeyc/gopass"))
-      (propagated-inputs
-       (list go-golang-org-x-crypto))
-      (synopsis "Retrieve password from a terminal or piped input in Go")
-      (description
-       "@code{gopass} is a Go package for retrieving a password from user
-terminal or piped input.")
-      (home-page "https://github.com/howeyc/gopass")
-      (license license:isc))))
-
 (define-public python-pyte
   (package
     (name "python-pyte")
-- 
2.39.2

[bug#62564] [PATCH v3 02/14] gnu: go-golang-org-x-crypto: Update to 0.4.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-golang-org-x-crypto): Update to 0.4.0.
---
 gnu/packages/golang.scm | 58 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 18a80bf234..b25d8652a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -36,7 +36,7 @@
 ;;; Copyright © 2022 Pier-Hugues Pellerin <phpellerin@gmail.com>
 ;;; Copyright © 2022 muradm <mail@muradm.net>
 ;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev>
-;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
@@ -3174,37 +3174,35 @@ (define-public go-golang-org-x-tools
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-crypto
-  (let ((commit "2aa609cf4a9d7d1126360de73b55b6002f9e052a")
-        (revision "5"))
-    (package
-      (name "go-golang-org-x-crypto")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/crypto")
-                      (commit commit)))
-                (file-name (string-append "go.googlesource.com-crypto-"
-                                          version "-checkout"))
-                (sha256
-                 (base32
-                  "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/crypto"
+  (package
+    (name "go-golang-org-x-crypto")
+    (version "0.4.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://go.googlesource.com/crypto")
+                    (commit (string-append "v" version))))
+              (file-name (string-append "go.googlesource.com-crypto-"
+                                        version "-checkout"))
+              (sha256
+               (base32
+                "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "golang.org/x/crypto"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
          ;; Source-only package
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           ;; Source-only package
-           (delete 'build))))
-      (propagated-inputs
-       (list go-golang-org-x-sys))
-      (synopsis "Supplementary cryptographic libraries in Go")
-      (description "This package provides supplementary cryptographic libraries
+         (delete 'build))))
+    (propagated-inputs
+     (list go-golang-org-x-sys))
+    (synopsis "Supplementary cryptographic libraries in Go")
+    (description "This package provides supplementary cryptographic libraries
 for the Go language.")
-      (home-page "https://go.googlesource.com/crypto/")
-      (license license:bsd-3))))
+    (home-page "https://go.googlesource.com/crypto/")
+    (license license:bsd-3)))
 
 (define-public govulncheck
   (package
-- 
2.39.2

[bug#62564] [PATCH v3 03/14] gnu: go-golang-org-x-term: Update to 0.3.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-golang-org-x-term): Update to 0.3.0.
---
 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 b25d8652a9..bb69fa41a3 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10607,17 +10607,17 @@ (define-public go-lukechampine-com-blake3
 (define-public go-golang-org-x-term
   (package
     (name "go-golang-org-x-term")
-    (version "0.0.0-20210615171337-6886f2dfbf5b")
+    (version "0.3.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://go.googlesource.com/term")
-             (commit (go-version->git-ref version))))
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0661w7dp2ak1k4ii90v6chw2x8a6g4sc5j0ba58qlplaj4k5l0xs"))))
+         "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
     (build-system go-build-system)
     (arguments '(#:import-path "golang.org/x/term"))
     (propagated-inputs
-- 
2.39.2

[bug#62564] [PATCH v3 04/14] gnu: go-github-com-99designs-go-keyring: Update to 1.2.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-99designs-go-keyring): Update to 1.2.2.
---
 gnu/packages/golang.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index bb69fa41a3..acbc8d3d77 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11203,7 +11203,7 @@ (define-public go-github-com-go-libsecret
 (define-public go-github-com-99designs-go-keyring
   (package
     (name "go-github-com-99designs-go-keyring")
-    (version "1.1.6")
+    (version "1.2.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -11212,11 +11212,11 @@ (define-public go-github-com-99designs-go-keyring
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "08rcdqpxaa9n348q10fw40q4gxpjajkyrighykk71i7mxzwkcgwn"))))
+                "0mkvy7scyq07rkqhabfmkd8imcm4h9y7zj9palj04znpihpixa5m"))))
     (build-system go-build-system)
     (native-inputs
-     (list go-golang-org-x-crypto
-           go-golang-org-x-sys
+     (list go-golang-org-x-sys
+           go-golang-org-x-term
            go-github-com-mtibben-percent
            go-github-com-mitchellh-go-homedir
            go-github-com-dvsekhvalnov-jose2go
-- 
2.39.2

[bug#62564] [PATCH v3 05/14] gnu: pixterm: Add input go-golang-go-x-term.

[Nicolas Graves via Guix-patches via]

* gnu/packages/image-viewers.scm (pixterm): Add input go-golang-go-x-term.
---
 gnu/packages/image-viewers.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index d8d6304a85..89c6760962 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -524,7 +524,8 @@ (define-public pixterm
     (inputs (list go-github-com-disintegration-imaging
                   go-github-com-lucasb-eyer-go-colorful
                   go-golang-org-x-crypto
-                  go-golang-org-x-image))
+                  go-golang-org-x-image
+                  go-golang-org-x-term))
     (home-page "https://github.com/eliukblau/pixterm")
     (synopsis "Draw images in your ANSI terminal with true color")
     (description "PIXterm shows images directly in your terminal, recreating
-- 
2.39.2

[bug#62564] [PATCH v3 06/14] gnu: curlie: Add input go-golang-x-term.

[Nicolas Graves via Guix-patches via]

* gnu/packages/curl.scm (curlie): Add input go-golang-x-term.
---
 gnu/packages/curl.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 45bd2e6d36..5c96ea6d7f 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -404,8 +404,10 @@ (define-public curlie
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/rs/curlie"))
-    (inputs
-     (list curl go-golang-org-x-crypto go-golang-org-x-sys))
+    (inputs (list curl
+                  go-golang-org-x-crypto
+                  go-golang-org-x-sys
+                  go-golang-org-x-term))
     (home-page "https://curlie.io")
     (synopsis "The power of curl, the ease of use of httpie")
     (description "If you like the interface of HTTPie but miss the features of
-- 
2.39.2

[bug#62564] [PATCH v3 07/14] gnu: Add go-github-com-aws-smithy-go.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-smithy-go): New variable.
---
 gnu/packages/golang.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index acbc8d3d77..389e7bd770 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11097,6 +11097,29 @@ (define-public go-github-com-dvsekhvalnov-jose2go
     (home-page "https://github.com/dvsekhvalnov/jose2go")
     (license license:expat)))
 
+(define-public go-github-com-aws-smithy-go
+  (package
+    (name "go-github-com-aws-smithy-go")
+    (version "1.13.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/aws/smithy-go")
+                    (commit "v1.13.5")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/aws/smithy-go"))
+    (propagated-inputs
+     (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
+    (home-page "https://github.com/aws/smithy-go")
+    (synopsis "Smithy code generators for Go")
+    (description
+     "Package smithy provides the core components for a Smithy SDK.")
+    (license license:asl2.0)))
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v3 08/14] gnu: Add go-github-com-aws-aws-sdk-go-v2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2): New variable.
---
 gnu/packages/golang.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 389e7bd770..496ee32ce3 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11120,6 +11120,31 @@ (define-public go-github-com-aws-smithy-go
     (description
      "Package smithy provides the core components for a Smithy SDK.")
     (license license:asl2.0)))
+
+(define-public go-github-com-aws-aws-sdk-go-v2
+  (package
+    (name "go-github-com-aws-aws-sdk-go-v2")
+    (version "1.17.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/aws/aws-sdk-go-v2")
+                    (commit "v1.17.3")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-jmespath-go-jmespath
+                             go-github-com-google-go-cmp-cmp
+                             go-github-com-aws-smithy-go))
+    (home-page "https://github.com/aws/aws-sdk-go-v2")
+    (synopsis "AWS SDK for Go v2")
+    (description
+     "Package sdk is the official AWS SDK v2 for the Go programming language.")
+    (license license:asl2.0)))
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v3 09/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-config.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-config): New variable.
---
 gnu/packages/golang.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 496ee32ce3..1caf451be7 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11145,6 +11145,16 @@ (define-public go-github-com-aws-aws-sdk-go-v2
     (description
      "Package sdk is the official AWS SDK v2 for the Go programming language.")
     (license license:asl2.0)))
+
+(define-public go-github-com-aws-aws-sdk-go-v2-config
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-config")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/config"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-google-go-cmp-cmp
+                             go-github-com-aws-smithy-go))))
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v3 10/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-iam.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-iam): New variable.
---
 gnu/packages/golang.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1caf451be7..ff25bf275c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11155,6 +11155,15 @@ (define-public go-github-com-aws-aws-sdk-go-v2-config
        #:unpack-path "github.com/aws/aws-sdk-go-v2"))
     (propagated-inputs (list go-github-com-google-go-cmp-cmp
                              go-github-com-aws-smithy-go))))
+
+(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-iam")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v3 11/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-sso.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sso): New variable.
---
 gnu/packages/golang.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ff25bf275c..dc1216dc67 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11164,6 +11164,15 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-iam
      '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam"
        #:unpack-path "github.com/aws/aws-sdk-go-v2"))
     (propagated-inputs (list go-github-com-aws-smithy-go))))
+
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-sso")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v3 12/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-ssooidc.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-ssooidc): New variable.
---
 gnu/packages/golang.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index dc1216dc67..003c5da35a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,6 +11173,15 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-sso
      '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso"
        #:unpack-path "github.com/aws/aws-sdk-go-v2"))
     (propagated-inputs (list go-github-com-aws-smithy-go))))
+
+(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v3 13/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-sts.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sts): New variable.
---
 gnu/packages/golang.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 003c5da35a..2be45eddc9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11182,6 +11182,16 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
      '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc"
        #:unpack-path "github.com/aws/aws-sdk-go-v2"))
     (propagated-inputs (list go-github-com-aws-smithy-go))))
+
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-sts")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v3 14/14] gnu: aws-vault: Update to 6.6.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (aws-vault): Update to 6.6.2.
---
 gnu/packages/golang.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 2be45eddc9..3bcfa0a882 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11195,7 +11195,7 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-sts
 (define-public aws-vault
   (package
     (name "aws-vault")
-    (version "6.3.1")
+    (version "6.6.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -11204,25 +11204,31 @@ (define-public aws-vault
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "02zw0kl77yr56mw1fbvr51c4mz2265c9al2nzvnqqzdx5aha7nf8"))))
+                "0fjdslg7nhlm9hl7bg69j1izrjx6sspbhwk973d0m8ig9nkdja06"))))
     (build-system go-build-system)
     (native-inputs
      (list go-github-com-99designs-go-keyring
            go-github-com-mtibben-androiddnsfix
            go-github-com-mtibben-percent
            go-github-com-jmespath-go-jmespath
-           go-github-com-aws-aws-sdk-go
            go-github-com-dvsekhvalnov-jose2go
            go-github-com-godbus-dbus
            go-github-com-gsterjov-go-libsecret
            go-github-com-mitchellh-go-homedir
            go-golang-org-x-crypto
            go-golang-org-x-sys
+           go-golang-org-x-term
            go-gopkg-in-ini
            go-github-com-skratchdot-open-golang
            go-github-com-alecthomas-kingpin
            go-github-com-alecthomas-template
-           go-github-com-alecthomas-units))
+           go-github-com-alecthomas-units
+           go-github-com-aws-aws-sdk-go-v2
+           go-github-com-aws-aws-sdk-go-v2-config
+           go-github-com-aws-aws-sdk-go-v2-service-iam
+           go-github-com-aws-aws-sdk-go-v2-service-sso
+           go-github-com-aws-aws-sdk-go-v2-service-ssooidc
+           go-github-com-aws-aws-sdk-go-v2-service-sts))
     (arguments
      `(#:import-path "github.com/99designs/aws-vault"
        #:install-source? #f
-- 
2.39.2

[bug#62564] patches to fix age after update to v1.1.1

[Nicolas Graves via Guix-patches via]

On 2023-03-31 09:32, Nicolas Graves via Guix-patches via wrote:

> My use of age + pass-age was broken after the recent updates, these
> underlying updates should fix them.
>
> It might affect a too big number of packages though.

So, in order for other concerned packages to build properly, I had to
update a few other packages. The v3 patches seem to build fine on
https://qa.guix.gnu.org/issue/62564, I guess it should be alright to get
them merged.

I've also removed go-github.com-howeyc-gopass, which has not been
updated for 4 years, unmaitained, and the author says to use another
package instead on the README. 

-- 
Best regards,
Nicolas Graves

[bug#62564] patches to fix age after update to v1.1.1

[Leo Famulari]

On Sat, Apr 01, 2023 at 10:00:05AM +0200, Nicolas Graves via Guix-patches via wrote:
> So, in order for other concerned packages to build properly, I had to
> update a few other packages. The v3 patches seem to build fine on
> https://qa.guix.gnu.org/issue/62564, I guess it should be alright to get
> them merged.

Thanks for this patch series!

Overall, it looks good, but there are still some cosmetic issues to fix.

For each commit, please make the commit message fully describe the
changes. For example, in patch 4/14, the commit message does not mention
the changed dependencies in native-inputs. Take a look at the commit log
for examples of what to write, e.g.:

https://git.savannah.gnu.org/cgit/guix.git/commit/?id=113146d31c91e1951f469aa974fef9c0413080a8

In several of the patches that add a new package, the new package
variable is added without any space before the subsequent package
variable. Please ensure that all new packages have a newline before and
after the new variable.

Beyond these cosmetic issues, the changes look good to me.

[bug#62564] [PATCH v4 01/14] gnu: Remove go-github.com-howeyc-gopass.

[Nicolas Graves via Guix-patches via]

* gnu/packages/terminals.scm (go-github.com-howeyc-gopass): Delete variable.
---
 gnu/packages/terminals.scm | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 51b135c99d..ef9f16bce5 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1043,33 +1043,6 @@ (define-public fzf
        ("findutils" ,findutils)
        ("ncurses" ,ncurses)))))
 
-(define-public go-github.com-howeyc-gopass
-  (let ((commit "bf9dde6d0d2c004a008c27aaee91170c786f6db8")
-        (revision "0"))
-    (package
-      (name "go-github.com-howeyc-gopass")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/howeyc/gopass")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "github.com/howeyc/gopass"))
-      (propagated-inputs
-       (list go-golang-org-x-crypto))
-      (synopsis "Retrieve password from a terminal or piped input in Go")
-      (description
-       "@code{gopass} is a Go package for retrieving a password from user
-terminal or piped input.")
-      (home-page "https://github.com/howeyc/gopass")
-      (license license:isc))))
-
 (define-public python-pyte
   (package
     (name "python-pyte")
-- 
2.39.2

[bug#62564] [PATCH v4 02/14] gnu: go-golang-org-x-crypto: Update to 0.4.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-golang-org-x-crypto): Update to 0.4.0.
---
 gnu/packages/golang.scm | 58 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 778b8f7092..e33379e3ea 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -36,7 +36,7 @@
 ;;; Copyright © 2022 Pier-Hugues Pellerin <phpellerin@gmail.com>
 ;;; Copyright © 2022 muradm <mail@muradm.net>
 ;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev>
-;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
@@ -3220,37 +3220,35 @@ (define-public go-golang-org-x-tools
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-crypto
-  (let ((commit "2aa609cf4a9d7d1126360de73b55b6002f9e052a")
-        (revision "5"))
-    (package
-      (name "go-golang-org-x-crypto")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/crypto")
-                      (commit commit)))
-                (file-name (string-append "go.googlesource.com-crypto-"
-                                          version "-checkout"))
-                (sha256
-                 (base32
-                  "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/crypto"
+  (package
+    (name "go-golang-org-x-crypto")
+    (version "0.4.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://go.googlesource.com/crypto")
+                    (commit (string-append "v" version))))
+              (file-name (string-append "go.googlesource.com-crypto-"
+                                        version "-checkout"))
+              (sha256
+               (base32
+                "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "golang.org/x/crypto"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
          ;; Source-only package
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           ;; Source-only package
-           (delete 'build))))
-      (propagated-inputs
-       (list go-golang-org-x-sys))
-      (synopsis "Supplementary cryptographic libraries in Go")
-      (description "This package provides supplementary cryptographic libraries
+         (delete 'build))))
+    (propagated-inputs
+     (list go-golang-org-x-sys))
+    (synopsis "Supplementary cryptographic libraries in Go")
+    (description "This package provides supplementary cryptographic libraries
 for the Go language.")
-      (home-page "https://go.googlesource.com/crypto/")
-      (license license:bsd-3))))
+    (home-page "https://go.googlesource.com/crypto/")
+    (license license:bsd-3)))
 
 (define-public govulncheck
   (package
-- 
2.39.2

[bug#62564] [PATCH v4 03/14] gnu: go-golang-org-x-term: Update to 0.3.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-golang-org-x-term): Update to 0.3.0.
---
 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 e33379e3ea..5d2fef8c33 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10653,17 +10653,17 @@ (define-public go-lukechampine-com-blake3
 (define-public go-golang-org-x-term
   (package
     (name "go-golang-org-x-term")
-    (version "0.0.0-20210615171337-6886f2dfbf5b")
+    (version "0.3.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://go.googlesource.com/term")
-             (commit (go-version->git-ref version))))
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0661w7dp2ak1k4ii90v6chw2x8a6g4sc5j0ba58qlplaj4k5l0xs"))))
+         "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
     (build-system go-build-system)
     (arguments '(#:import-path "golang.org/x/term"))
     (propagated-inputs
-- 
2.39.2

[bug#62564] [PATCH v4 04/14] gnu: go-github-com-99designs-go-keyring: Update to 1.2.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-99designs-go-keyring): Update to 1.2.2.
[native-inputs] Delete go-golang-org-x-crypto. Add go-golang-org-x-term.
---
 gnu/packages/golang.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5d2fef8c33..513f60bcad 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11249,7 +11249,7 @@ (define-public go-github-com-go-libsecret
 (define-public go-github-com-99designs-go-keyring
   (package
     (name "go-github-com-99designs-go-keyring")
-    (version "1.1.6")
+    (version "1.2.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -11258,11 +11258,11 @@ (define-public go-github-com-99designs-go-keyring
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "08rcdqpxaa9n348q10fw40q4gxpjajkyrighykk71i7mxzwkcgwn"))))
+                "0mkvy7scyq07rkqhabfmkd8imcm4h9y7zj9palj04znpihpixa5m"))))
     (build-system go-build-system)
     (native-inputs
-     (list go-golang-org-x-crypto
-           go-golang-org-x-sys
+     (list go-golang-org-x-sys
+           go-golang-org-x-term
            go-github-com-mtibben-percent
            go-github-com-mitchellh-go-homedir
            go-github-com-dvsekhvalnov-jose2go
-- 
2.39.2

[bug#62564] [PATCH v4 05/14] gnu: pixterm: Add input go-golang-org-x-term.

[Nicolas Graves via Guix-patches via]

* gnu/packages/image-viewers.scm (pixterm): Add input go-golang-go-x-term.
---
 gnu/packages/image-viewers.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index d0b7e93a84..c4d38cf9f3 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -524,7 +524,8 @@ (define-public pixterm
     (inputs (list go-github-com-disintegration-imaging
                   go-github-com-lucasb-eyer-go-colorful
                   go-golang-org-x-crypto
-                  go-golang-org-x-image))
+                  go-golang-org-x-image
+                  go-golang-org-x-term))
     (home-page "https://github.com/eliukblau/pixterm")
     (synopsis "Draw images in your ANSI terminal with true color")
     (description "PIXterm shows images directly in your terminal, recreating
-- 
2.39.2

[bug#62564] [PATCH v4 06/14] gnu: curlie: Add input go-golang-org-x-term.

[Nicolas Graves via Guix-patches via]

* gnu/packages/curl.scm (curlie): Add input go-golang-x-term.
---
 gnu/packages/curl.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index bd00a6d274..4bfb0572a3 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -401,8 +401,10 @@ (define-public curlie
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/rs/curlie"))
-    (inputs
-     (list curl go-golang-org-x-crypto go-golang-org-x-sys))
+    (inputs (list curl
+                  go-golang-org-x-crypto
+                  go-golang-org-x-sys
+                  go-golang-org-x-term))
     (home-page "https://curlie.io")
     (synopsis "The power of curl, the ease of use of httpie")
     (description "If you like the interface of HTTPie but miss the features of
-- 
2.39.2

[bug#62564] [PATCH v4 07/14] gnu: Add go-github-com-aws-smithy-go.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-smithy-go): New variable.
---
 gnu/packages/golang.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 513f60bcad..c53db69194 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11143,6 +11143,30 @@ (define-public go-github-com-dvsekhvalnov-jose2go
     (home-page "https://github.com/dvsekhvalnov/jose2go")
     (license license:expat)))
 
+(define-public go-github-com-aws-smithy-go
+  (package
+    (name "go-github-com-aws-smithy-go")
+    (version "1.13.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/aws/smithy-go")
+                    (commit "v1.13.5")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/aws/smithy-go"))
+    (propagated-inputs
+     (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
+    (home-page "https://github.com/aws/smithy-go")
+    (synopsis "Smithy code generators for Go")
+    (description
+     "Package smithy provides the core components for a Smithy SDK.")
+    (license license:asl2.0)))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v4 08/14] gnu: Add go-github-com-aws-aws-sdk-go-v2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2): New variable.
---
 gnu/packages/golang.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c53db69194..8d472961c0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11167,6 +11167,31 @@ (define-public go-github-com-aws-smithy-go
      "Package smithy provides the core components for a Smithy SDK.")
     (license license:asl2.0)))
 
+(define-public go-github-com-aws-aws-sdk-go-v2
+  (package
+    (name "go-github-com-aws-aws-sdk-go-v2")
+    (version "1.17.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/aws/aws-sdk-go-v2")
+                    (commit "v1.17.3")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-jmespath-go-jmespath
+                             go-github-com-google-go-cmp-cmp
+                             go-github-com-aws-smithy-go))
+    (home-page "https://github.com/aws/aws-sdk-go-v2")
+    (synopsis "AWS SDK for Go v2")
+    (description
+     "Package sdk is the official AWS SDK v2 for the Go programming language.")
+    (license license:asl2.0)))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v4 09/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-config.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-config): New variable.
---
 gnu/packages/golang.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8d472961c0..2a4716b0de 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11192,6 +11192,16 @@ (define-public go-github-com-aws-aws-sdk-go-v2
      "Package sdk is the official AWS SDK v2 for the Go programming language.")
     (license license:asl2.0)))
 
+(define-public go-github-com-aws-aws-sdk-go-v2-config
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-config")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/config"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-google-go-cmp-cmp
+                             go-github-com-aws-smithy-go))))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v4 10/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-iam.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-iam): New variable.
---
 gnu/packages/golang.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 2a4716b0de..a176388888 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11202,6 +11202,15 @@ (define-public go-github-com-aws-aws-sdk-go-v2-config
     (propagated-inputs (list go-github-com-google-go-cmp-cmp
                              go-github-com-aws-smithy-go))))
 
+(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-iam")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v4 11/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-sso.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sso): New variable.
---
 gnu/packages/golang.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a176388888..4e812935dc 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11211,6 +11211,15 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-iam
        #:unpack-path "github.com/aws/aws-sdk-go-v2"))
     (propagated-inputs (list go-github-com-aws-smithy-go))))
 
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-sso")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v4 12/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-ssooidc.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-ssooidc): New variable.
---
 gnu/packages/golang.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4e812935dc..11957b6dd8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11220,6 +11220,15 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-sso
        #:unpack-path "github.com/aws/aws-sdk-go-v2"))
     (propagated-inputs (list go-github-com-aws-smithy-go))))
 
+(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v4 13/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-sts.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sts): New variable.
---
 gnu/packages/golang.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 11957b6dd8..90f4558ec4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11229,6 +11229,15 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
        #:unpack-path "github.com/aws/aws-sdk-go-v2"))
     (propagated-inputs (list go-github-com-aws-smithy-go))))
 
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-sts")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v4 14/14] gnu: aws-vault: Update to 6.6.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (aws-vault): Update to 6.6.2.
[native-inputs] Delete go-github-aws-aws-sdk-go. Add
go-github-com-aws-aws-sdk-go-v2,
go-github-com-aws-aws-sdk-go-v2-config,
go-github-com-aws-aws-sdk-go-v2-service-iam,
go-github-com-aws-aws-sdk-go-v2-service-sso,
go-github-com-aws-aws-sdk-go-v2-service-ssooidc,
go-github-com-aws-aws-sdk-go-v2-service-sts.
---
 gnu/packages/golang.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 90f4558ec4..310e74a897 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11241,7 +11241,7 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-sts
 (define-public aws-vault
   (package
     (name "aws-vault")
-    (version "6.3.1")
+    (version "6.6.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -11250,25 +11250,31 @@ (define-public aws-vault
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "02zw0kl77yr56mw1fbvr51c4mz2265c9al2nzvnqqzdx5aha7nf8"))))
+                "0fjdslg7nhlm9hl7bg69j1izrjx6sspbhwk973d0m8ig9nkdja06"))))
     (build-system go-build-system)
     (native-inputs
      (list go-github-com-99designs-go-keyring
            go-github-com-mtibben-androiddnsfix
            go-github-com-mtibben-percent
            go-github-com-jmespath-go-jmespath
-           go-github-com-aws-aws-sdk-go
            go-github-com-dvsekhvalnov-jose2go
            go-github-com-godbus-dbus
            go-github-com-gsterjov-go-libsecret
            go-github-com-mitchellh-go-homedir
            go-golang-org-x-crypto
            go-golang-org-x-sys
+           go-golang-org-x-term
            go-gopkg-in-ini
            go-github-com-skratchdot-open-golang
            go-github-com-alecthomas-kingpin
            go-github-com-alecthomas-template
-           go-github-com-alecthomas-units))
+           go-github-com-alecthomas-units
+           go-github-com-aws-aws-sdk-go-v2
+           go-github-com-aws-aws-sdk-go-v2-config
+           go-github-com-aws-aws-sdk-go-v2-service-iam
+           go-github-com-aws-aws-sdk-go-v2-service-sso
+           go-github-com-aws-aws-sdk-go-v2-service-ssooidc
+           go-github-com-aws-aws-sdk-go-v2-service-sts))
     (arguments
      `(#:import-path "github.com/99designs/aws-vault"
        #:install-source? #f
-- 
2.39.2

[bug#62564] [PATCH v4 14/14] gnu: aws-vault: Update to 6.6.2.

[Nicolas Graves via Guix-patches via]

Just a few small changes after I figured out the versions of go modules
/ subpackages are not necessarily the same that for the parent package /
module.

Hence just a few (version ...) additions. 

-- 
Best regards,
Nicolas Graves

[bug#62564] [PATCH v5 01/14] gnu: Remove go-github.com-howeyc-gopass.

[Nicolas Graves via Guix-patches via]

* gnu/packages/terminals.scm (go-github.com-howeyc-gopass): Delete variable.
---
 gnu/packages/terminals.scm | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 51b135c99d..ef9f16bce5 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1043,33 +1043,6 @@ (define-public fzf
        ("findutils" ,findutils)
        ("ncurses" ,ncurses)))))
 
-(define-public go-github.com-howeyc-gopass
-  (let ((commit "bf9dde6d0d2c004a008c27aaee91170c786f6db8")
-        (revision "0"))
-    (package
-      (name "go-github.com-howeyc-gopass")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/howeyc/gopass")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "github.com/howeyc/gopass"))
-      (propagated-inputs
-       (list go-golang-org-x-crypto))
-      (synopsis "Retrieve password from a terminal or piped input in Go")
-      (description
-       "@code{gopass} is a Go package for retrieving a password from user
-terminal or piped input.")
-      (home-page "https://github.com/howeyc/gopass")
-      (license license:isc))))
-
 (define-public python-pyte
   (package
     (name "python-pyte")
-- 
2.39.2

[bug#62564] [PATCH v5 02/14] gnu: go-golang-org-x-crypto: Update to 0.4.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-golang-org-x-crypto): Update to 0.4.0.
---
 gnu/packages/golang.scm | 58 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 778b8f7092..e33379e3ea 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -36,7 +36,7 @@
 ;;; Copyright © 2022 Pier-Hugues Pellerin <phpellerin@gmail.com>
 ;;; Copyright © 2022 muradm <mail@muradm.net>
 ;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev>
-;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
@@ -3220,37 +3220,35 @@ (define-public go-golang-org-x-tools
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-crypto
-  (let ((commit "2aa609cf4a9d7d1126360de73b55b6002f9e052a")
-        (revision "5"))
-    (package
-      (name "go-golang-org-x-crypto")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/crypto")
-                      (commit commit)))
-                (file-name (string-append "go.googlesource.com-crypto-"
-                                          version "-checkout"))
-                (sha256
-                 (base32
-                  "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/crypto"
+  (package
+    (name "go-golang-org-x-crypto")
+    (version "0.4.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://go.googlesource.com/crypto")
+                    (commit (string-append "v" version))))
+              (file-name (string-append "go.googlesource.com-crypto-"
+                                        version "-checkout"))
+              (sha256
+               (base32
+                "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "golang.org/x/crypto"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
          ;; Source-only package
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           ;; Source-only package
-           (delete 'build))))
-      (propagated-inputs
-       (list go-golang-org-x-sys))
-      (synopsis "Supplementary cryptographic libraries in Go")
-      (description "This package provides supplementary cryptographic libraries
+         (delete 'build))))
+    (propagated-inputs
+     (list go-golang-org-x-sys))
+    (synopsis "Supplementary cryptographic libraries in Go")
+    (description "This package provides supplementary cryptographic libraries
 for the Go language.")
-      (home-page "https://go.googlesource.com/crypto/")
-      (license license:bsd-3))))
+    (home-page "https://go.googlesource.com/crypto/")
+    (license license:bsd-3)))
 
 (define-public govulncheck
   (package
-- 
2.39.2

[bug#62564] [PATCH v5 03/14] gnu: go-golang-org-x-term: Update to 0.3.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-golang-org-x-term): Update to 0.3.0.
---
 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 e33379e3ea..5d2fef8c33 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10653,17 +10653,17 @@ (define-public go-lukechampine-com-blake3
 (define-public go-golang-org-x-term
   (package
     (name "go-golang-org-x-term")
-    (version "0.0.0-20210615171337-6886f2dfbf5b")
+    (version "0.3.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://go.googlesource.com/term")
-             (commit (go-version->git-ref version))))
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0661w7dp2ak1k4ii90v6chw2x8a6g4sc5j0ba58qlplaj4k5l0xs"))))
+         "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
     (build-system go-build-system)
     (arguments '(#:import-path "golang.org/x/term"))
     (propagated-inputs
-- 
2.39.2

[bug#62564] [PATCH v5 04/14] gnu: go-github-com-99designs-go-keyring: Update to 1.2.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-99designs-go-keyring): Update to 1.2.2.
[native-inputs] Delete go-golang-org-x-crypto. Add go-golang-org-x-term.
---
 gnu/packages/golang.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5d2fef8c33..513f60bcad 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11249,7 +11249,7 @@ (define-public go-github-com-go-libsecret
 (define-public go-github-com-99designs-go-keyring
   (package
     (name "go-github-com-99designs-go-keyring")
-    (version "1.1.6")
+    (version "1.2.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -11258,11 +11258,11 @@ (define-public go-github-com-99designs-go-keyring
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "08rcdqpxaa9n348q10fw40q4gxpjajkyrighykk71i7mxzwkcgwn"))))
+                "0mkvy7scyq07rkqhabfmkd8imcm4h9y7zj9palj04znpihpixa5m"))))
     (build-system go-build-system)
     (native-inputs
-     (list go-golang-org-x-crypto
-           go-golang-org-x-sys
+     (list go-golang-org-x-sys
+           go-golang-org-x-term
            go-github-com-mtibben-percent
            go-github-com-mitchellh-go-homedir
            go-github-com-dvsekhvalnov-jose2go
-- 
2.39.2

[bug#62564] [PATCH v5 05/14] gnu: pixterm: Add input go-golang-org-x-term.

[Nicolas Graves via Guix-patches via]

* gnu/packages/image-viewers.scm (pixterm): Add input go-golang-go-x-term.
---
 gnu/packages/image-viewers.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 96a3fa6615..a5b3e3e825 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -524,7 +524,8 @@ (define-public pixterm
     (inputs (list go-github-com-disintegration-imaging
                   go-github-com-lucasb-eyer-go-colorful
                   go-golang-org-x-crypto
-                  go-golang-org-x-image))
+                  go-golang-org-x-image
+                  go-golang-org-x-term))
     (home-page "https://github.com/eliukblau/pixterm")
     (synopsis "Draw images in your ANSI terminal with true color")
     (description "PIXterm shows images directly in your terminal, recreating
-- 
2.39.2

[bug#62564] [PATCH v5 06/14] gnu: curlie: Add input go-golang-org-x-term.

[Nicolas Graves via Guix-patches via]

* gnu/packages/curl.scm (curlie): Add input go-golang-x-term.
---
 gnu/packages/curl.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index bd00a6d274..4bfb0572a3 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -401,8 +401,10 @@ (define-public curlie
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/rs/curlie"))
-    (inputs
-     (list curl go-golang-org-x-crypto go-golang-org-x-sys))
+    (inputs (list curl
+                  go-golang-org-x-crypto
+                  go-golang-org-x-sys
+                  go-golang-org-x-term))
     (home-page "https://curlie.io")
     (synopsis "The power of curl, the ease of use of httpie")
     (description "If you like the interface of HTTPie but miss the features of
-- 
2.39.2

[bug#62564] [PATCH v5 07/14] gnu: Add go-github-com-aws-smithy-go.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-smithy-go): New variable.
---
 gnu/packages/golang.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 513f60bcad..c53db69194 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11143,6 +11143,30 @@ (define-public go-github-com-dvsekhvalnov-jose2go
     (home-page "https://github.com/dvsekhvalnov/jose2go")
     (license license:expat)))
 
+(define-public go-github-com-aws-smithy-go
+  (package
+    (name "go-github-com-aws-smithy-go")
+    (version "1.13.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/aws/smithy-go")
+                    (commit "v1.13.5")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/aws/smithy-go"))
+    (propagated-inputs
+     (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
+    (home-page "https://github.com/aws/smithy-go")
+    (synopsis "Smithy code generators for Go")
+    (description
+     "Package smithy provides the core components for a Smithy SDK.")
+    (license license:asl2.0)))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v5 08/14] gnu: Add go-github-com-aws-aws-sdk-go-v2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2): New variable.
---
 gnu/packages/golang.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c53db69194..8d472961c0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11167,6 +11167,31 @@ (define-public go-github-com-aws-smithy-go
      "Package smithy provides the core components for a Smithy SDK.")
     (license license:asl2.0)))
 
+(define-public go-github-com-aws-aws-sdk-go-v2
+  (package
+    (name "go-github-com-aws-aws-sdk-go-v2")
+    (version "1.17.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/aws/aws-sdk-go-v2")
+                    (commit "v1.17.3")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-jmespath-go-jmespath
+                             go-github-com-google-go-cmp-cmp
+                             go-github-com-aws-smithy-go))
+    (home-page "https://github.com/aws/aws-sdk-go-v2")
+    (synopsis "AWS SDK for Go v2")
+    (description
+     "Package sdk is the official AWS SDK v2 for the Go programming language.")
+    (license license:asl2.0)))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v5 09/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-config.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-config): New variable.
---
 gnu/packages/golang.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8d472961c0..648dc824dd 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11192,6 +11192,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2
      "Package sdk is the official AWS SDK v2 for the Go programming language.")
     (license license:asl2.0)))
 
+(define-public go-github-com-aws-aws-sdk-go-v2-config
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-config")
+    (version "1.18.5")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/config"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-google-go-cmp-cmp
+                             go-github-com-aws-smithy-go))))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v5 10/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-iam.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-iam): New variable.
---
 gnu/packages/golang.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 648dc824dd..305e0c88f8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11203,6 +11203,16 @@ (define-public go-github-com-aws-aws-sdk-go-v2-config
     (propagated-inputs (list go-github-com-google-go-cmp-cmp
                              go-github-com-aws-smithy-go))))
 
+(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-iam")
+    (version "1.44.161")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v5 11/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-sso.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sso): New variable.
---
 gnu/packages/golang.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 305e0c88f8..238eba3902 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11213,6 +11213,16 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-iam
        #:unpack-path "github.com/aws/aws-sdk-go-v2"))
     (propagated-inputs (list go-github-com-aws-smithy-go))))
 
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-sso")
+    (version "1.11.27")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v5 12/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-ssooidc.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-ssooidc): New variable.
---
 gnu/packages/golang.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 238eba3902..86fdc7e3aa 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11223,6 +11223,16 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-sso
        #:unpack-path "github.com/aws/aws-sdk-go-v2"))
     (propagated-inputs (list go-github-com-aws-smithy-go))))
 
+(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc")
+    (version "1.13.10")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v5 13/14] gnu: Add go-github-com-aws-aws-sdk-go-v2-service-sts.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sts): New variable.
---
 gnu/packages/golang.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 86fdc7e3aa..2a4ee90b0d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11233,6 +11233,16 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
        #:unpack-path "github.com/aws/aws-sdk-go-v2"))
     (propagated-inputs (list go-github-com-aws-smithy-go))))
 
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
+  (package
+    (inherit go-github-com-aws-aws-sdk-go-v2)
+    (name "go-github-com-aws-aws-sdk-go-v2-service-sts")
+    (version "1.17.7")
+    (arguments
+     '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts"
+       #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+    (propagated-inputs (list go-github-com-aws-smithy-go))))
+
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
2.39.2

[bug#62564] [PATCH v5 14/14] gnu: aws-vault: Update to 6.6.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/golang.scm (aws-vault): Update to 6.6.2.
[native-inputs] Delete go-github-aws-aws-sdk-go. Add
go-github-com-aws-aws-sdk-go-v2,
go-github-com-aws-aws-sdk-go-v2-config,
go-github-com-aws-aws-sdk-go-v2-service-iam,
go-github-com-aws-aws-sdk-go-v2-service-sso,
go-github-com-aws-aws-sdk-go-v2-service-ssooidc,
go-github-com-aws-aws-sdk-go-v2-service-sts.
---
 gnu/packages/golang.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 2a4ee90b0d..2253d28383 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11246,7 +11246,7 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-sts
 (define-public aws-vault
   (package
     (name "aws-vault")
-    (version "6.3.1")
+    (version "6.6.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -11255,25 +11255,31 @@ (define-public aws-vault
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "02zw0kl77yr56mw1fbvr51c4mz2265c9al2nzvnqqzdx5aha7nf8"))))
+                "0fjdslg7nhlm9hl7bg69j1izrjx6sspbhwk973d0m8ig9nkdja06"))))
     (build-system go-build-system)
     (native-inputs
      (list go-github-com-99designs-go-keyring
            go-github-com-mtibben-androiddnsfix
            go-github-com-mtibben-percent
            go-github-com-jmespath-go-jmespath
-           go-github-com-aws-aws-sdk-go
            go-github-com-dvsekhvalnov-jose2go
            go-github-com-godbus-dbus
            go-github-com-gsterjov-go-libsecret
            go-github-com-mitchellh-go-homedir
            go-golang-org-x-crypto
            go-golang-org-x-sys
+           go-golang-org-x-term
            go-gopkg-in-ini
            go-github-com-skratchdot-open-golang
            go-github-com-alecthomas-kingpin
            go-github-com-alecthomas-template
-           go-github-com-alecthomas-units))
+           go-github-com-alecthomas-units
+           go-github-com-aws-aws-sdk-go-v2
+           go-github-com-aws-aws-sdk-go-v2-config
+           go-github-com-aws-aws-sdk-go-v2-service-iam
+           go-github-com-aws-aws-sdk-go-v2-service-sso
+           go-github-com-aws-aws-sdk-go-v2-service-ssooidc
+           go-github-com-aws-aws-sdk-go-v2-service-sts))
     (arguments
      `(#:import-path "github.com/99designs/aws-vault"
        #:install-source? #f
-- 
2.39.2

[bug#62564] [PATCH v5 01/14] gnu: Remove go-github.com-howeyc-gopass.

[Leo Famulari]

On Sat, Apr 22, 2023 at 06:13:37PM +0200, Nicolas Graves via Guix-patches via wrote:
> * gnu/packages/terminals.scm (go-github.com-howeyc-gopass): Delete variable.

Thanks! Pushed as a8797329f9e663660383fab6c404c8fec6fbed28