From patchwork Tue Mar 9 08:09:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 27554 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DBDEF27BC51; Tue, 9 Mar 2021 08:11:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 31CF627BC50 for ; Tue, 9 Mar 2021 08:11:25 +0000 (GMT) Received: from localhost ([::1]:41240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJXSe-0001fW-6q for patchwork@mira.cbaines.net; Tue, 09 Mar 2021 03:11:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJXSL-0001aa-TX for guix-patches@gnu.org; Tue, 09 Mar 2021 03:11:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJXSI-0007uN-7j for guix-patches@gnu.org; Tue, 09 Mar 2021 03:11:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJXSI-0000hK-19 for guix-patches@gnu.org; Tue, 09 Mar 2021 03:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46866] [PATCH] gnu: b4: Fix setup.py version incompatibility. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Mar 2021 08:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46866 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kyle Meyer Cc: 46866@debbugs.gnu.org Received: via spool by 46866-submit@debbugs.gnu.org id=B46866.16152774242624 (code B ref 46866); Tue, 09 Mar 2021 08:11:01 +0000 Received: (at 46866) by debbugs.gnu.org; 9 Mar 2021 08:10:24 +0000 Received: from localhost ([127.0.0.1]:45540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJXRY-0000fy-F0 for submit@debbugs.gnu.org; Tue, 09 Mar 2021 03:10:24 -0500 Received: from flashner.co.il ([178.62.234.194]:43908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJXRX-0000fj-DK for 46866@debbugs.gnu.org; Tue, 09 Mar 2021 03:10:16 -0500 Received: from localhost (unknown [31.210.181.184]) by flashner.co.il (Postfix) with ESMTPSA id 491F14020F; Tue, 9 Mar 2021 08:10:09 +0000 (UTC) Date: Tue, 9 Mar 2021 10:09:35 +0200 From: Efraim Flashner Message-ID: References: <20210302015158.16177-1-kyle@kyleam.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210302015158.16177-1-kyle@kyleam.com> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. 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