[PATCH] gnu: gandi.cli: Fix build.

DoneSubmitted by Pierre Langlois.
Details
2 participants
  • Ludovic Courtès
  • Pierre Langlois
Owner
unassigned
Severity
normal
P
P
Pierre Langlois wrote on 20 May 22:06 +0200
(address . guix-patches@gnu.org)
871qwoarr0.fsf@gmx.com
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
-----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-----

From 5741ab7a0d5d4a657ae4bf98c4fa01284830e1c8 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
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(-)

Toggle diff (43 lines)
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 © 2019 Jack Hill <jackhill@jackhill.us>
 ;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
-;;; Copyright © 2019, 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2019, 2020, 2021, 2022 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
 ;;; Copyright © 2019, 2020, 2021 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2019 Wiktor ┼╗elazny <wzelazny@vurv.cz>
@@ -3655,18 +3655,6 @@ (define-public python-click-5
         (base32 "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337"))))
     (arguments `())))
 
-(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, that
-- 
2.36.1
From 7fe4df8b6595d491ab6fbb7c41b207f0a611423f Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
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(-)

Toggle diff (46 lines)
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 <glv@posteo.net>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022 Simon South <simon@simonsouth.net>
+;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
 ;;;
 ;;; 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
L
L
Ludovic Courtès wrote on 30 May 16:28 +0200
(name . Pierre Langlois)(address . pierre.langlois@gmx.com)(address . 55547@debbugs.gnu.org)
87fskr3xi9.fsf@gnu.org
Hi,

Pierre Langlois <pierre.langlois@gmx.com> skribis:

Toggle quote (3 lines)
> The patches are pretty trivial, I guess I should be able to just push
> them? I'm never too sure :-).

Yes please, go ahead!

For the record, the rules are given here:


To me these patches fall under the “trivial patch” rule (and also under
the “two week” rule actually!).

Thanks,
Ludo’.
P
P
Pierre Langlois wrote on 30 May 23:19 +0200
(name . Ludovic Courtès)(address . ludo@gnu.org)
87k0a2aesl.fsf@gmx.com
Ludovic Courtès <ludo@gnu.org> writes:

Toggle quote (9 lines)
> Hi,
>
> Pierre Langlois <pierre.langlois@gmx.com> skribis:
>
>> The patches are pretty trivial, I guess I should be able to just push
>> them? I'm never too sure :-).
>
> Yes please, go ahead!

Pushed with b8fc3403d3c09c00a4b0ab68c9f4f296928479b9.

Toggle quote (8 lines)
>
> For the record, the rules are given here:
>
> https://guix.gnu.org/manual/devel/en/html_node/Commit-Access.html#Commit-Policy
>
> To me these patches fall under the “trivial patch” rule (and also under
> the “two week” rule actually!).

Ah thanks for clarifying! I wasn't aware of the "two week" rule.

Pierre
-----BEGIN PGP SIGNATURE-----

iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmKVN5oYHHBpZXJyZS5s
YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U2FcH/i2wyOAzlOKph8eAyHA7LrPR
ZnOZJrJXtqsK7ODJUAjeOBFY0CgU8QOAcnll4Z+IihACpyRj3iVNYSkxi//UFXdR
iJuYBJoX7+isbIou/rqhk8fI8EIi4z8UxpJAVbmIfpqyl7yjJBA9c58uQaXU8o68
EGppkJOAwNqfQ68P5euCdrbJZcN1vBFHIACwRFC0tguQTTcFvULL327TAsC7yz+y
l68KlF5xGc5QQqC7kYJLQc219vgMMvllFHe4rAdlpHVal/x9Bn9jNhDeaCwd+vxp
u1xbueH/LpoZ+nDrwA/Nz2SdkVXVHInTnKqcXZOkEm7eJgqj7EQyWd29MC+NBjM=
=/ipl
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 55547@debbugs.gnu.org