GNU bug report logs - #55547
[PATCH] gnu: gandi.cli: Fix build.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 55547 in the body.
You can then email your comments to 55547 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Pierre Langlois <pierre.langlois <at> gmx.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: gandi.cli: Fix build.
Date: Fri, 20 May 2022 21:06:53 +0100

[Message part 1 (text/plain, inline)]

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

[signature.asc (application/pgp-signature, inline)]

[0001-gnu-python-click-8-Remove-redundant-package.patch (text/x-patch, inline)]

From 5741ab7a0d5d4a657ae4bf98c4fa01284830e1c8 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois <at> gmx.com>
Date: Tue, 17 May 2022 20:46:09 +0100
Subject: [PATCH 1/2] gnu: python-click <at> 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 © 2019 Jack Hill <jackhill <at> jackhill.us>
 ;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv <at> posteo.net>
 ;;; Copyright © 2019, 2020 Alex Griffin <a <at> ajgrf.com>
-;;; Copyright © 2019, 2020, 2021 Pierre Langlois <pierre.langlois <at> gmx.com>
+;;; Copyright © 2019, 2020, 2021, 2022 Pierre Langlois <pierre.langlois <at> gmx.com>
 ;;; Copyright © 2019 Jacob MacDonald <jaccarmac <at> gmail.com>
 ;;; Copyright © 2019, 2020, 2021 Giacomo Leidi <goodoldpaul <at> autistici.org>
 ;;; Copyright © 2019 Wiktor Żelazny <wzelazny <at> 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

[0002-gnu-gandi.cli-Fix-by-downgrading-python-click.patch (text/x-patch, inline)]

From 7fe4df8b6595d491ab6fbb7c41b207f0a611423f Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois <at> 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(-)

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 <at> posteo.net>
 ;;; Copyright © 2021 Maxime Devos <maximedevos <at> telenet.be>
 ;;; Copyright © 2022 Simon South <simon <at> simonsouth.net>
+;;; Copyright © 2022 Pierre Langlois <pierre.langlois <at> 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

Message #8 received at 55547 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Pierre Langlois <pierre.langlois <at> gmx.com>
Cc: 55547 <at> debbugs.gnu.org
Subject: Re: bug#55547: [PATCH] gnu: gandi.cli: Fix build.
Date: Mon, 30 May 2022 16:28:46 +0200

Hi,

Pierre Langlois <pierre.langlois <at> 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!

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!).

Thanks,
Ludo’.

Message #13 received at 55547-done <at> debbugs.gnu.org (full text, mbox):

From: Pierre Langlois <pierre.langlois <at> gmx.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 55547-done <at> debbugs.gnu.org, Pierre Langlois <pierre.langlois <at> gmx.com>
Subject: Re: bug#55547: [PATCH] gnu: gandi.cli: Fix build.
Date: Mon, 30 May 2022 22:19:55 +0100

[Message part 1 (text/plain, inline)]

Ludovic Courtès <ludo <at> gnu.org> writes:

> Hi,
>
> Pierre Langlois <pierre.langlois <at> 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.

>
> 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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.