From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id GvIRL64tR2BlDQAA0tVLHw (envelope-from ) for ; Tue, 09 Mar 2021 08:11:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id qH2gKq4tR2DGMwAA1q6Kng (envelope-from ) for ; Tue, 09 Mar 2021 08:11:26 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E905E27344 for ; Tue, 9 Mar 2021 09:11:25 +0100 (CET) Received: from localhost ([::1]:41240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJXSf-0001fW-3I for larch@yhetil.org; Tue, 09 Mar 2021 03:11:25 -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-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="uXDqZ/Zd0YR47bTr" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615277486; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=MOJ/KGAFd64cOQYDqZSFfcg+NtdmsQeRZEg3u+HE0Yc=; b=OZPP5FdbvUOpy0VIXrcPOr3VdernjLkH9vVq/sBEE3FAyL5Gz7F2mX8dopzuNUbFYvTBbl Zpi3QAojqHdn3nSSprFWbWAuo402GCrCynGos3jiXQFuCXggYUa45a9DV+ezhHmAGhLUnc rkmUoj4QQ+5XnbttB8xkW1DBhdrRBSKQXPme1KZj0dg4xYhqtFd4cWnc4GR/bh6CVq6D6i xRMC1zQ/xoSlPqkM6L5J43tFXW6fgiwrxEOduuj10uwK+YMwxCTy3ansCSlNupvFdTzYme bpSRUCBzB4cj8FWf3fF9TeF83gFe01sBek9BRHd9gO2DOIR4XN3+WpIaX/3p5A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615277486; a=rsa-sha256; cv=none; b=UX3V0NHurj+clh+yIcoVtFWa9tHl3PuNs26p9xQpC0WVsHaOD7MtqI5wm+0oQ3ee3A6wa1 Y3dbl9hgSlWRjTIsqB+0zW3HcE7jZM/7Qgnb1+RMsVV3yStcoBJA0MMflNda85HpgIam5w RsH7eZz4YkWBMijtbmJyZnFOxNZFbxhES296MQIokSW5AsAGJhUxfP+Xd6U3nMaBlrNBHi w38huPJjMTMc3wipqza6HlLxjPp/K053HTuzdN4BXgCtLhj7TRGkI0eB28BiMRToeBCPye RX6z/0iOdFOPNajzDRBFe+aSBt7dZfHfwlX5UBlkkv7ACuS7gCiREF5qR6JqcA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.98 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E905E27344 X-Spam-Score: -3.98 X-Migadu-Scanner: scn0.migadu.com X-TUID: gPeD1chyV398 --uXDqZ/Zd0YR47bTr Content-Type: multipart/mixed; boundary="Y7FJMawKeU7NSi3X" Content-Disposition: inline --Y7FJMawKeU7NSi3X Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --Y7FJMawKeU7NSi3X Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-b4-Fix-setup.py-version-incompatibility.patch" Content-Transfer-Encoding: quoted-printable =46rom 9b0187ac1e28edb987cb5b76c4c3ae8330bcf7eb Mon Sep 17 00:00:00 2001 =46rom: 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-contro= l.scm index 8292a5df15..4051efed9c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -7,7 +7,7 @@ ;;; Copyright =C2=A9 2014, 2015, 2016 Mark H Weaver ;;; Copyright =C2=A9 2014, 2016, 2019 Eric Bavier ;;; Copyright =C2=A9 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flash= ner -;;; Copyright =C2=A9 2015, 2018, 2020 Kyle Meyer +;;; Copyright =C2=A9 2015, 2018, 2020, 2021 Kyle Meyer ;;; Copyright =C2=A9 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright =C2=A9 2016, 2017 Leo Famulari ;;; Copyright =C2=A9 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. S= ee upstream commit: + ;; https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=3D= 31348a14afdb1d39e7faf9576eaddea1ced76e19 + (substitute* "setup.py" + (("\\.0'") "'")) + #t)))) (build-system python-build-system) (arguments '(#:tests? #f)) ; No tests. (inputs --=20 2.30.1 --Y7FJMawKeU7NSi3X-- --uXDqZ/Zd0YR47bTr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmBHLT8ACgkQQarn3Mo9 g1F4zhAAqNFLXWsx4Rk//pk4ivzZv70XfH4PtxK2fEUeA0EN+XWRGm/6y9/0KsPh +RbpnSlgDMEmBiui2bQKu5TRj/1Nc5n2aqDgV5HOVN32GvaJkoTuUMM6KRCT7jQx vSnVazhVFLWNdwUiaNcZ7+DXwF4m2wUh0kHZ3U2Btv9L03KZNw//2hdEv/cmDo2E ARelTIi7yQtvah2v6Abcol/btyPQrty50cVNOCTFEJNXrXXaexqe4AuQpJiBHimz eugtQdN9hXfTciWUUZ+MsGJa/xk63p2q2n3lT5pf3ZcdqvWBKB03GVTjNpOaaIWj aXy8QGMlsXYuzCkyh7S9yf1b4CpY5gnDLeq72UYknl516huD74WXwecKhxB6ihVj SCkWcjhr0K2nU5NiOMBIYGJ2TpOsg+qn0sDFWmNxt7iz1eeVg1vXReGojGDxQYuC y+xia6FJUVtaHhhcsG5BSVKv4kSu8zeG4aphVC/OrMrM1uq6jLD2MIN1MFlnsIwJ P2dT2r6gFimevuIPgRUoBKn5124AUiNx1+OMHxxZjRrcNC2GJqgOQ98z5Q7gxXBE geDRDzowuFdhlpOKzkpHCFGU5kyFvE5og6x423rNqrEF3JWWbtuMQOXT3ERapb4E SiRynQ9leinC6jvXzMA39gndcVefXW/V7jP+Cy9bVo+ov+ks3c4= =quQA -----END PGP SIGNATURE----- --uXDqZ/Zd0YR47bTr--