From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id mDyUCln2h2Lr/AAAbAwnHQ (envelope-from ) for ; Fri, 20 May 2022 22:13:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id eBKOCln2h2IhgQEAauVa8A (envelope-from ) for ; Fri, 20 May 2022 22:13:13 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9C7D7C811 for ; Fri, 20 May 2022 22:13:12 +0200 (CEST) Received: from localhost ([::1]:38762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ns8zm-0005A4-Su for larch@yhetil.org; Fri, 20 May 2022 16:13:10 -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 Content-Type: multipart/mixed; boundary="=-=-=" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1653077592; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=gB+RC2twc6jpQjjZNDx7UD9Xq/REZndct0RA5TglT8A=; b=r2iTe/2AkqHlH/3ouEypX87yPT3KLEIPHny9ADCdbN+KAFmUET3BS7vtQ5/pPMKVnVOKc7 DNZD6SL9gmFhIihnPZWCIgbAViCnVXQdZ0zThsnvihg83j77cQYfvoPpJXGdhJOSjaTYlz x6toWtxxewjP0OtLQmfBQglGHTtQnTPxYM8bRQfWS1JufLNwAuF/nx26drH36BNMp80XOl sHPk4gqXn/cunsulp7DGQQAoGRZA/8MKQp1gqxju5E/Fj/4FXuMI5ZBHN3APURqkx31RYc XgpA6hV8IF1Kp/dK6xVfgGNqDUGt37853bIqaG8gXVEmLOI182qOiomHoNwtgQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653077592; a=rsa-sha256; cv=none; b=IbvvpBhyH6apxApMzd5oXNvAIkxCheK+BGfAzlGbAr43hozGdv+bZCKf5qUWkyFpdKdFlv Pshi672M+4/K1okc8+7BkvPhaPRcj7RkIhkj9oLMVuO0GiTtnnxH2AluoKK6ttn3abpbof WEU88IiOL9T/BRTw2d+oVqz9LTFjpQK0eusl0mMHu+Udcn5RbZSRGJwdTfvwaaonPuLygs efoExb5mRhOeAlKkZhKpgnH6x1ElvrJ8npZUO1ZD934HpwYPXLCiCXRJtNYaqplKXlcY8s nhDOnTIzNjE9BQKuKZMG46ytD6otGZXnlXdZAIujAtORF4rON9lcq7SiRLmRZg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=OFRd0qP7; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.56 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=OFRd0qP7; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 9C7D7C811 X-Spam-Score: 3.56 X-Migadu-Scanner: scn1.migadu.com X-TUID: gUuSXIw6xXme --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain 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 --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmKH9gMYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UceAIAIu2i1P+8Iwl3nOOWuA1ERL4 VkVZwriRQKllR85hXFyGGyuMuqtu2S6alAmiBC788mfmkUqg9T9phWBxUH2iYYpQ 6rxk+ybUGn3pFunNKLVeQ4sD7VpYIcrB4YF6VXg2QvW+5YN9rnFLm88LjgMUrYIe /u8+hGbvqjLLzq5Nnw/efdomk0g+UU6lBWJ8/HpsTMWXVtqknIGqqb5kaHb9L1PE k1hsKi1c/nLdTSN0rZwi5HPVrElxfzDfL6k66f/QpC4RywdMAeW9LZIUUDNfm/GU WuT0faLADAUPPWLUhLXzETnHFgQ9wjIF7JWEtr16B8r7bXqmy6LNSOd+QncjdCE= =eEy0 -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-python-click-8-Remove-redundant-package.patch Content-Transfer-Encoding: quoted-printable >From 5741ab7a0d5d4a657ae4bf98c4fa01284830e1c8 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 17 May 2022 20:46:09 +0100 Subject: [PATCH 1/2] gnu: python-click@8: Remove redundant package. The python-click package is already version 8. * gnu/packages/python-xyz.scm (python-click-8): Remove remove variable. (python-proselint)[propagated-inputs]: Depend on python-click. --- gnu/packages/python-xyz.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b8fd857fd6..b64757f21e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -61,7 +61,7 @@ ;;; Copyright =C2=A9 2019 Jack Hill ;;; Copyright =C2=A9 2019, 2020, 2021 Guillaume Le Vaillant ;;; Copyright =C2=A9 2019, 2020 Alex Griffin -;;; Copyright =C2=A9 2019, 2020, 2021 Pierre Langlois +;;; Copyright =C2=A9 2019, 2020, 2021, 2022 Pierre Langlois ;;; Copyright =C2=A9 2019 Jacob MacDonald ;;; Copyright =C2=A9 2019, 2020, 2021 Giacomo Leidi ;;; Copyright =C2=A9 2019 Wiktor =C5=BBelazny @@ -3655,18 +3655,6 @@ (define-public python-click-5 (base32 "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337")))) (arguments `()))) =20 -(define-public python-click-8 - (package (inherit python-click) - (name "python-click") - (version "8.1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "click" version)) - (sha256 - (base32 "0whs38a2i0561kwbgigs6vic9r0a1887m2v1aw3rmv6r2kz0g5s7")))) - (arguments `()))) - (define-public python-cligj (package (name "python-cligj") @@ -18267,7 +18255,7 @@ (define-public python-proselint (lambda _ (setenv "HOME" "/tmp")))))) (propagated-inputs - (list python-click-8 python-future python-six)) + (list python-click python-future python-six)) (home-page "https://github.com/amperser/proselint") (synopsis "Linter for prose") (description "@code{python-proselint} is a linter for English prose, t= hat --=20 2.36.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-gandi.cli-Fix-by-downgrading-python-click.patch Content-Transfer-Encoding: quoted-printable >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 =C2=A9 2021 Guillaume Le Vaillant ;;; Copyright =C2=A9 2021 Maxime Devos ;;; Copyright =C2=A9 2022 Simon South +;;; Copyright =C2=A9 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))) =20 +(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") --=20 2.36.1 --=-=-=--