From 7cf080aa71872523dc3dbe856967e4fa5a76030b Mon Sep 17 00:00:00 2001
From: Felix Gruber <felgru@posteo.net>
Date: Mon, 18 Apr 2022 11:43:45 +0000
Subject: gnu: awscli: Update to 1.22.90.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/python-web.scm (awscli): Update to 1.22.90.
[arguments] Use search-input-file to find groff.
[inputs]: Replace python-botocore-for-awscli with python-botocore.
Add groff.
[native-inputs]: Remove groff.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/python-web.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 28c934e896..5fcfd27914 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2870,14 +2870,14 @@ supports url redirection and retries, and also gzip and deflate decoding.")
   (package
     ;; Note: updating awscli typically requires updating botocore as well.
     (name "awscli")
-    (version "1.21.11")
+    (version "1.22.90")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri name version))
        (sha256
         (base32
-         "0fkivwbx4nind5b7l4jhqm5bb9drgqsclcslrg4aggf9rcs4g4s0"))))
+         "0ky4ax4xh7s8w1l0hwc7w9ii8afvh9nib3kz09qhiqdinxzrlv54"))))
     (build-system python-build-system)
     (arguments
      ;; FIXME: The 'pypi' release does not contain tests.
@@ -2891,21 +2891,22 @@ supports url redirection and retries, and also gzip and deflate decoding.")
                             "setup.py")
                (("<5.5") "<=6"))))
          (add-after 'unpack 'fix-reference-to-groff
-           (lambda _
+           (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "awscli/help.py"
                (("if not self._exists_on_path\\('groff'\\):") "")
                (("raise ExecutableNotFoundError\\('groff'\\)") "")
                (("cmdline = \\['groff'")
-                (string-append "cmdline = ['" (which "groff") "'"))))))))
+                (string-append "cmdline = ['"
+                               (search-input-file inputs "bin/groff")
+                               "'"))))))))
     (inputs
-     (list python-colorama-for-awscli
-           python-botocore-for-awscli
+     (list groff
+           python-colorama-for-awscli
+           python-botocore
            python-s3transfer
            python-docutils-0.15
            python-pyyaml
            python-rsa))
-    (native-inputs
-     (list groff))
     (home-page "https://aws.amazon.com/cli/")
     (synopsis "Command line client for AWS")
     (description "AWS CLI provides a unified command line interface to the
-- 
cgit v1.2.3