* [bug#55547] [PATCH] gnu: gandi.cli: Fix build.
@ 2022-05-20 20:06 Pierre Langlois
2022-05-30 14:28 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Pierre Langlois @ 2022-05-20 20:06 UTC (permalink / raw)
To: 55547
[-- Attachment #1.1: Type: text/plain, Size: 269 bytes --]
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
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 519 bytes --]
[-- Attachment #2: 0001-gnu-python-click-8-Remove-redundant-package.patch --]
[-- Type: text/x-patch, Size: 2290 bytes --]
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(-)
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
[-- Attachment #3: 0002-gnu-gandi.cli-Fix-by-downgrading-python-click.patch --]
[-- Type: text/x-patch, Size: 2216 bytes --]
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#55547] [PATCH] gnu: gandi.cli: Fix build.
2022-05-20 20:06 [bug#55547] [PATCH] gnu: gandi.cli: Fix build Pierre Langlois
@ 2022-05-30 14:28 ` Ludovic Courtès
2022-05-30 21:19 ` bug#55547: " Pierre Langlois
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2022-05-30 14:28 UTC (permalink / raw)
To: Pierre Langlois; +Cc: 55547
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!
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’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#55547: [PATCH] gnu: gandi.cli: Fix build.
2022-05-30 14:28 ` Ludovic Courtès
@ 2022-05-30 21:19 ` Pierre Langlois
0 siblings, 0 replies; 3+ messages in thread
From: Pierre Langlois @ 2022-05-30 21:19 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 55547-done, Pierre Langlois
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
Ludovic Courtès <ludo@gnu.org> writes:
> 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.
>
> 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 519 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-30 21:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-20 20:06 [bug#55547] [PATCH] gnu: gandi.cli: Fix build Pierre Langlois
2022-05-30 14:28 ` Ludovic Courtès
2022-05-30 21:19 ` bug#55547: " Pierre Langlois
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.