From patchwork Fri May 20 20:06:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39547 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 7F31427BBEA; Fri, 20 May 2022 21:13:14 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS 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 E7FB627BBE9 for ; Fri, 20 May 2022 21:13:13 +0100 (BST) Received: from localhost ([::1]:38762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ns8zp-0005A4-4j for patchwork@mira.cbaines.net; Fri, 20 May 2022 16:13:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ns8ze-00059i-AN for guix-patches@gnu.org; Fri, 20 May 2022 16:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ns8ze-0006SP-1E for guix-patches@gnu.org; Fri, 20 May 2022 16:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ns8zd-0001AQ-Rm for guix-patches@gnu.org; Fri, 20 May 2022 16:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55547] [PATCH] gnu: gandi.cli: Fix build. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 May 2022 20:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55547 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55547@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16530775334422 (code B ref -1); Fri, 20 May 2022 20:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 May 2022 20:12:13 +0000 Received: from localhost ([127.0.0.1]:40169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ns8yi-000196-61 for submit@debbugs.gnu.org; Fri, 20 May 2022 16:12:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:38868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ns8yf-00018w-W9 for submit@debbugs.gnu.org; Fri, 20 May 2022 16:12:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ns8yf-00057Y-QR for guix-patches@gnu.org; Fri, 20 May 2022 16:12:01 -0400 Received: from mout.gmx.net ([212.227.17.20]:53681) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ns8ya-0006P0-4E for guix-patches@gnu.org; Fri, 20 May 2022 16:12:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1653077513; bh=ppQnvhgBnbrKE+E2goFBYKDM4PUN0HIvZpPOgiyJT9I=; h=X-UI-Sender-Class:From:To:Subject:Date; b=OFRd0qP7IcauP3TU4k7Aj7aPrxSsTgxJgHSJvJQr4lw/1aKe/W6vluTN0QoRlInI2 0MbhQquKfn1p2Hkq+JbMu0gHo1qrnLcbn4jSoOJ6gZB6InthIEGiphdjFjiFZhanOx +FNwIXB8FwDgxFKNHzbthz778wAbaxoLoOCBbInI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MpUUm-1nX3qe37Nc-00pusi for ; Fri, 20 May 2022 22:11:52 +0200 User-agent: mu4e 1.6.10; emacs 28.1 From: Pierre Langlois Date: Fri, 20 May 2022 21:06:53 +0100 Message-ID: <871qwoarr0.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:M0YbQnvpX0huW4bIxSXwlTWlto6rnMbiu5VOyXmjs+1oE5fvuzF IGKLQPQWkkzbaiSU9xj3Y9tge/wxiAol4PUSh2/kUw+Sg5+Mk9kV1hmDSYzcJz/vmV0Jx3S 9yRAu2NDCaGmXINSoKnGpk/NvdlmcjZj+ZqnIX8J/wcO7Vh4wMi2ZlCLy2IglUneFYh9aaP A1LnzvDrsmPzrcxq/vpHQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:yWvy2JHChq8=:nhsdELD9SVMo/nGOPUMMTf uRCZmboTsQ9C3bVIv9HRPHHGHbuwn9BdcgM+ivg2JuyANZv87RtT3u4o+WbHVuvDNU3OsoiUC 8C3RyhmcFDEkEZEI2Z2fY7BFD4LUgUHARABgcdTowLM6lq/u05DV+Ij6N5oSr2VNkhm2af/rY oVx1LqUORqdfQbUcOLE6xr8OhGAONwJI9XIVpHUFUXHYlQsI/uLXVcmXfdMdCvauKPTeZocT+ RwvRQR9vCQp+z8bLYax+7lsc5Qr4raMDEYTuKHvFC87Abo5waprsDWYgBy6iczCVrLGkCs6lm US/zbxWdnU1mtnfNZkjam3o1s5MVy3ADDO1fQ51ggzcf8b7wbsyFrltzCNYW//ARLCvxEt/xh u/fz146yrDNSpvgjQ7QbdchEE2IXHNWELv2r1+AWmF6J8CF/DBtn5pr/FODb5wyohOh82VidX dUmaZJkvU2CLtZsL+XPJm6Sw11dSd+VLwg9QMK6XvD/dVBzNYvEN1Deeopm2UYaLQpdvYFe/F 1WXzKly0Fe7Y2JZMwI9aUhpPGZb7vk/XaV3OQgq9u45tt3WAwaQH9rjFzqV9SIwKo4AV8VcH6 N8LuPEmdAMd986cj8EPLNGssAS1IRrZRZ7WR9/hZy/eTmuxZGKPM7a6/QB005Pbe6gMr0q+bv Px44QZN9o4efCJbCW3UnVsv2IyNLn9w+Iu8ZPPQ8XJjGjq3Ja0mLB+3Li9YEstU+pbvCKipuv u9fsGKIdsPat+HXzTd4/bIMqMGJ2hQelWH9QGTqqkF3J/nZDQUVXP6Y5P/65n3edwvlSgxitA +tS3T8JF29tbXLVR6YetGBX8l+MheDidQVD6lJFgRoS+OfqbKXpnF7YFSoP9g6MfthEzYr7gi 5L8/iL40NC+L762MSkqvG+IlAxjLd3rsGdVS3GBXVBEuacm70KDH4bqG2zD8HeVNdcVwumZPa R6AbaK9ALF84XPiBalRGvs+SGh6Z+BPjAlk9FULI5GdpXi8AlX7Kcrpg58VnSBuVp/MKhUzft JkAAyIuUhaKl2OAalwKb21DNNNsDiy6Q02MPez5AUvUaVkKCQRsVhg62KASxXziZgviX+iIpo Kkv5qGmtVV17TmDLaop6pNHgwxjuojs72+K06R447kxLqDWnP1rKI9+iQ== Received-SPF: pass client-ip=212.227.17.20; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hi Guix! I just realized the gandi.cli program doens't build, it appear to require version 7 of python-click. Here are a couple of patches to fix it. The patches are pretty trivial, I guess I should be able to just push them? I'm never too sure :-). Thanks, Pierre From 7fe4df8b6595d491ab6fbb7c41b207f0a611423f Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 17 May 2022 20:46:53 +0100 Subject: [PATCH 2/2] gnu: gandi.cli: Fix by downgrading python-click. * gnu/packages/python-xyz.scm (python-click-7): New variable. * gnu/packages/networking.scm (gandi.cli)[inputs]: Depend on python-click-7. --- gnu/packages/networking.scm | 3 ++- gnu/packages/python-xyz.scm | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9010e1f120..c9a6dd1706 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Simon South +;;; Copyright © 2022 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -1654,7 +1655,7 @@ (define-public gandi.cli (propagated-inputs (list openssh)) ; used by gandi/cli/modules/iass.py (inputs - (list openssl python-click python-ipy python-pyyaml python-requests)) + (list openssl python-click-7 python-ipy python-pyyaml python-requests)) (home-page "https://cli.gandi.net") (synopsis "Command-line interface to the Gandi.net Web API") (description diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b64757f21e..44056f8d44 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3643,6 +3643,18 @@ (define-public python-click with sensible defaults out of the box.") (license license:bsd-3))) +(define-public python-click-7 + (package (inherit python-click) + (name "python-click") + (version "7.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "click" version)) + (sha256 + (base32 "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj")))) + (arguments `()))) + (define-public python-click-5 (package (inherit python-click) (name "python-click") -- 2.36.1