Subject: Re: [bug#46866] [PATCH] gnu: b4: Fix setup.py version incompatibility.

From: Efraim Flashner <[email-masked]>
Date: Tue, 9 Mar 2021 10:09:35 +0200

Indeed, it does fail at startup. Two things about your patch, you've
added a patch file but didn't register it in gnu/local.mk. This means
it'll get dropped during a 'make dist' which would be a problem. The
second is that it's a lot of patch for a small amount of code change.
With your permission I'd like to commit the attached patch instead.

-- 
Efraim Flashner   <[email-masked]>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
From 9b0187ac1e28edb987cb5b76c4c3ae8330bcf7eb Mon Sep 17 00:00:00 2001
From: Kyle Meyer <[email-masked]>
Date: Tue, 9 Mar 2021 10:06:13 +0200
Subject: [PATCH] gnu: b4: Fix setup.py version incompatibility.

* gnu/packages/version-control.scm (b4)[source]: Add snippet to not
require too specific of a version.

Co-authored with Efraim Flashner <[email-masked]>

Signed-off-by: Efraim Flashner <[email-masked]>
---
 gnu/packages/version-control.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8292a5df15..4051efed9c 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <[email-masked]>
 ;;; Copyright © 2014, 2016, 2019 Eric Bavier <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <[email-masked]>
-;;; Copyright © 2015, 2018, 2020 Kyle Meyer <[email-masked]>
+;;; Copyright © 2015, 2018, 2020, 2021 Kyle Meyer <[email-masked]>
 ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2016, 2017 Leo Famulari <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Nikita <[email-masked]>
@@ -2347,7 +2347,15 @@ based on a manifest file published by servers.")
        (method url-fetch)
        (uri (pypi-uri "b4" version))
        (sha256
-        (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z"))))
+        (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Fixes issue with dependency requirements being too strict. See upstream commit:
+           ;; https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=31348a14afdb1d39e7faf9576eaddea1ced76e19
+           (substitute* "setup.py"
+             (("\\.0'") "'"))
+           #t))))
     (build-system python-build-system)
     (arguments '(#:tests? #f))          ; No tests.
     (inputs
-- 
2.30.1