From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SEDBOP2lUGDXKgAA0tVLHw (envelope-from ) for ; Tue, 16 Mar 2021 12:35:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 8NOnNP2lUGDqGwAAB5/wlQ (envelope-from ) for ; Tue, 16 Mar 2021 12:35:09 +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 B165E18EED for ; Tue, 16 Mar 2021 13:35:09 +0100 (CET) Received: from localhost ([::1]:43192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM8ui-0003Du-SA for larch@yhetil.org; Tue, 16 Mar 2021 08:35:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM8rj-0000uX-JR for guix-patches@gnu.org; Tue, 16 Mar 2021 08:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55094) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM8rj-0001nx-Ae for guix-patches@gnu.org; Tue, 16 Mar 2021 08:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM8rj-0004lA-5s for guix-patches@gnu.org; Tue, 16 Mar 2021 08:32:03 -0400 Subject: bug#46866: [PATCH] gnu: b4: Fix setup.py version incompatibility. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 12:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 46866 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kyle Meyer Cc: 46866-done@debbugs.gnu.org Mail-Followup-To: 46866@debbugs.gnu.org, efraim@flashner.co.il, kyle@kyleam.com Received: via spool by 46866-done@debbugs.gnu.org id=D46866.161589787017823 (code D ref 46866); Tue, 16 Mar 2021 12:32:02 +0000 Received: (at 46866-done) by debbugs.gnu.org; 16 Mar 2021 12:31:10 +0000 Received: from localhost ([127.0.0.1]:38405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM8qe-0004bL-Hq for submit@debbugs.gnu.org; Tue, 16 Mar 2021 08:31:06 -0400 Received: from flashner.co.il ([178.62.234.194]:54244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM8qI-0004Wq-7I for 46866-done@debbugs.gnu.org; Tue, 16 Mar 2021 08:30:46 -0400 Received: from localhost (unknown [31.210.181.184]) by flashner.co.il (Postfix) with ESMTPSA id A1A6D40478; Tue, 16 Mar 2021 12:30:27 +0000 (UTC) Date: Tue, 16 Mar 2021 14:29:49 +0200 From: Efraim Flashner Message-ID: References: <20210302015158.16177-1-kyle@kyleam.com> <87wnugym43.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ayJS2/MbsUNiq/8U" Content-Disposition: inline In-Reply-To: <87wnugym43.fsf@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 X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: B165E18EED X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: gmhR661JQAhc --ayJS2/MbsUNiq/8U Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 09, 2021 at 05:54:04PM -0500, Kyle Meyer wrote: > Efraim Flashner writes: >=20 > > 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. >=20 > Doh, thanks for catching that. >=20 > > The second is that it's a lot of patch for a small amount of code > > change. >=20 > I like that a patch fails loudly once it's no longer valid, but I'm > happy to defer to your opinion that it's an overkill here (and will try > to recalibrate for future patches). >=20 > > With your permission I'd like to commit the attached patch instead. > [...] > > 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 >=20 > Sounds fine to me. I have a slight preference that you put yourself as > the author and put a >=20 > Noticed-by: Kyle Meyer >=20 > or >=20 > Reported-by: Kyle Meyer >=20 > trailer for me, but either way is okay. >=20 > > @@ -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 stric= t. See upstream commit: > > + ;; https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?i= d=3D31348a14afdb1d39e7faf9576eaddea1ced76e19 > > + (substitute* "setup.py" > > + (("\\.0'") "'")) >=20 > Just a note: This won't catch a similar problem if dkimpy (1.0.5) is > upgraded before b4, though perhaps that's unlikely and not worth > worrying about. >=20 > Thank you for the review. Not sure how I forgot I had this waiting for me. I changed the substitution from "\\.0'" to change the ~=3D to >=3D and pushed it. --=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 --ayJS2/MbsUNiq/8U Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmBQpL0ACgkQQarn3Mo9 g1GR2A//W+TDQRKTedaFJ84u8VsGdlb/+HCXn9/iXPglaw2wEWcMg+ZDOLj9khDR Cos/HuHkwsRTc6luHP6mT3me5KywXePP5kgke3/Oe4VQOhCcRY+VriCqOJi748KK AEKu7aFlOMweGxVRfDyaG9wJ7Koz4QTEaYci1+EMTmzOA4gAgXtLPvIxF50H5N3i k+NeVf1C3vbcrMR70yDaFMde0I5jqi9HeSik4GA4l/0P3h27Az0Tu4JesMdD7W86 MOXG2jbhdBgIh/+qZMT5KuIsMmpyh2QiFcXwisffuskbdLDjZ1jWBMpOUnI0cBER d1PNfO0R6/iSGKv9jNPK/Pli1KfuyGWWfa0fOBKQUwKer1STOSkLoZ8diqdE52uc xrs41RN2RGsCOahzlcwebYFpMbtNsz5yza0zSp6oSGvrnNGpBV0A356ZYCvT5Hj2 A5T090G17xbNp3xUthEgE/QrAX9SfmrL8nh0TyhcqgV/FViajI7P1qeBgUv3bxVv xg+iMLf9uKmqmDcy3q/+3QpTNAnkPx7VcBmtSDzqMa8UfkkrOKH4cHxG7gHX+ykI iAhfQtoSp9fMgL4p+MsYuyik9742CcMvnQOk8uZXUdcmfJu8OOrQ7CQ2N15Gbxiy Ny3atfi74GNL8mI3UV2H845m1tHs+f1FBiC7gmNWBmxT3vhsSaQ= =x9bZ -----END PGP SIGNATURE----- --ayJS2/MbsUNiq/8U--