From 9b0187ac1e28edb987cb5b76c4c3ae8330bcf7eb Mon Sep 17 00:00:00 2001 From: Kyle Meyer 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 Signed-off-by: Efraim Flashner --- 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 ;;; Copyright © 2014, 2016, 2019 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2015, 2018, 2020 Kyle Meyer +;;; Copyright © 2015, 2018, 2020, 2021 Kyle Meyer ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Nikita @@ -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