From patchwork Mon Apr 18 11:43:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 38650 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 070E327BBEA; Mon, 18 Apr 2022 12:46:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C0B7A27BBE9 for ; Mon, 18 Apr 2022 12:46:07 +0100 (BST) Received: from localhost ([::1]:34250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngPpV-0002Jc-1B for patchwork@mira.cbaines.net; Mon, 18 Apr 2022 07:46:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ngPoV-0002IC-Vw for guix-patches@gnu.org; Mon, 18 Apr 2022 07:45:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ngPoV-0003N7-56 for guix-patches@gnu.org; Mon, 18 Apr 2022 07:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ngPoV-0008JI-3k for guix-patches@gnu.org; Mon, 18 Apr 2022 07:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54798] [PATCH v3 2/4] gnu: awscli: Update to 1.22.90. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Apr 2022 11:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54798@debbugs.gnu.org, Ludovic =?utf-8?q?Court=C3=A8s?= , Maxime Devos Cc: Felix Gruber Received: via spool by 54798-submit@debbugs.gnu.org id=B54798.165028226431786 (code B ref 54798); Mon, 18 Apr 2022 11:45:03 +0000 Received: (at 54798) by debbugs.gnu.org; 18 Apr 2022 11:44:24 +0000 Received: from localhost ([127.0.0.1]:38314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ngPns-0008Gb-FT for submit@debbugs.gnu.org; Mon, 18 Apr 2022 07:44:24 -0400 Received: from mout01.posteo.de ([185.67.36.65]:43835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ngPnq-0008GB-Fk for 54798@debbugs.gnu.org; Mon, 18 Apr 2022 07:44:23 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 6CFAF24002C for <54798@debbugs.gnu.org>; Mon, 18 Apr 2022 13:44:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1650282256; bh=2KkYF6dhs8HghcPS7BKJc+89OwQuI9B9GnzZdhwmAxo=; h=From:To:Cc:Subject:Date:From; b=KdfVMnf+jjsEMq8jzsu546c4nxGk5GxAOU6kV3gSq5G8dEjJdhnF84sAvv5eKnnji SD5y4hwOVqCheR5WKmOAAeotFb07K3vDaxPsAcjhJwz7wC/2zNJ8RimVziShm7gt/U wE8HBSmvK0g30EnnC60E9V0V/10Dr33AVic9AwJy6HlfBljnGIMoONK5qIa/+FZx3a 175LwKPFVlBgq6IIPiRZt1Gb4MxnXDZzC5BA1kYQDSFQefu99N6Wv2vwj8omcWA539 gvMxy0Km8RTr/Xa4Ge5IH6zUqXfa0HD759YqfEqalFNkP+DuUSC02InauxPHoDxFiP UvQHq5CHd6I7Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4KhlTC47bYz9rxS; Mon, 18 Apr 2022 13:44:15 +0200 (CEST) From: Felix Gruber Date: Mon, 18 Apr 2022 11:43:45 +0000 Message-Id: <20220418114345.2888-1-felgru@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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. --- gnu/packages/python-web.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 @@ (define-public awscli (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 @@ (define-public awscli "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