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 UGBIFhT9R2DcNQAA0tVLHw (envelope-from ) for ; Tue, 09 Mar 2021 22:56:20 +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 3r0sEhT9R2DMcwAAB5/wlQ (envelope-from ) for ; Tue, 09 Mar 2021 22:56:20 +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 14F63BE19 for ; Tue, 9 Mar 2021 23:56:19 +0100 (CET) Received: from localhost ([::1]:38518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJlH0-0005sh-8H for larch@yhetil.org; Tue, 09 Mar 2021 17:56:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJlFm-0004mn-PP for guix-patches@gnu.org; Tue, 09 Mar 2021 17:55:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJlFm-0000Im-As for guix-patches@gnu.org; Tue, 09 Mar 2021 17:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJlFm-0001xj-7K for guix-patches@gnu.org; Tue, 09 Mar 2021 17:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46866] [PATCH] gnu: b4: Fix setup.py version incompatibility. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Mar 2021 22:55:02 +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: Efraim Flashner Cc: 46866@debbugs.gnu.org Received: via spool by 46866-submit@debbugs.gnu.org id=B46866.16153304517471 (code B ref 46866); Tue, 09 Mar 2021 22:55:02 +0000 Received: (at 46866) by debbugs.gnu.org; 9 Mar 2021 22:54:11 +0000 Received: from localhost ([127.0.0.1]:48202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJlEw-0001wR-SP for submit@debbugs.gnu.org; Tue, 09 Mar 2021 17:54:11 -0500 Received: from out1.migadu.com ([91.121.223.63]:64366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJlEu-0001wH-8Z for 46866@debbugs.gnu.org; Tue, 09 Mar 2021 17:54:10 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1615330446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8VkK9dMH+Gh1RrJJHTc7pM8GrOh3dXwSv8pv3pgJs7o=; b=BDr7sXVhcHy7XuGmLxOp5EaG/xGo/qvSAu9VXLMAl7sEH/vngCdcXfIL6c9Ildjcnn5iuM 6mJpt+Kmzh+P9WVhGB2x8lFGBXKlbgmOCJaxA9DraqzMwePracNnUAmX93fxStmsPDfn87 soUTv37c4rhJL9UP0WyfXOvv0hFUan3odWD8FQiUXgC2kaTEHRThKPTZRnYiESCyw3ptX/ 9xmUg5qkt+wAgZ7MTumvGjiztPQa1g2BV9wSBSJj/EABJM4EdJFtH9sTR2tKCZ8nAXvCRe fz3kDuEeUaQf121B043BpfdcpYHbV14TkR3a0VN4aI66+5NEf7+WKi3zm2923Q== From: Kyle Meyer In-Reply-To: References: <20210302015158.16177-1-kyle@kyleam.com> Date: Tue, 09 Mar 2021 17:54:04 -0500 Message-ID: <87wnugym43.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Auth-User: kyle@kyleam.com 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=1615330580; 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: dkim-signature; bh=8VkK9dMH+Gh1RrJJHTc7pM8GrOh3dXwSv8pv3pgJs7o=; b=J+CnLrYuO3Gd52nTHN0uvm3dy2y/+afCZ+Ct1w7y2ugYRiIo6rF4ZMoM0ObUrIDajjXTIc WMBGSm05LJHKKwNCgU8fHSDaD06m8NX7sIYyRQkCSF7yAIW4pCNj4RsRm+YrAMbJ7GP208 CNxLAiSC1F5ecy6djjq1MTFDMDEQRzEpd+Ze8q7Aivyh/3z8W4YwBlfCp8BN+K+X/c1GfC fH+1tXFWS7ONgYUnHRGlUJAm2CPIaOvZSuoHNYzuR9kdFs8F+eoaMsi7AaYHypQ+O1qf12 HiTb5bMcbxur1YnjmNJS63Oym1opKiVzOBq06Lxp6S89m9oHEYrTvXV85PuoZA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615330580; a=rsa-sha256; cv=none; b=k8ii4P0qSJqNdpxizajQu9GiQyo62mJSRGUWsuL41nFLK3LoVkXhIPHCr5Wv3PoWJKByFs 6cd+FhAm3HZDIn2fa0dNjZrsuQthpOnN4RjPEJrnmUkyPkyL/9+pnRB48QwSsOuRGs+hjA omLIxJDqvR7LISDqUyLOs5ZDXHeY2UM3QWUGi91IYXAr441abn2am6tpHBKVS5QnQhufBH DPIpOL1OKUMNsiOgN7Qmq3/3rmvpHI1XYeLHOLC+xc1JQ12u/+r5B7rxQ8nVPmUMZqFII7 ZYGsOWi4lu9g+p2f2DdvaBcSScXN9zbK9augGDssRxZBdGg7qvX2pN3PI9mWFQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kyleam.com header.s=key1 header.b=BDr7sXVh; 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: -1.38 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kyleam.com header.s=key1 header.b=BDr7sXVh; 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: 14F63BE19 X-Spam-Score: -1.38 X-Migadu-Scanner: scn0.migadu.com X-TUID: jFpyDDuE/zG2 Efraim Flashner writes: > 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. Doh, thanks for catching that. > The second is that it's a lot of patch for a small amount of code > change. 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). > 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 Sounds fine to me. I have a slight preference that you put yourself as the author and put a Noticed-by: Kyle Meyer or Reported-by: Kyle Meyer trailer for me, but either way is okay. > @@ -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'") "'")) 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. Thank you for the review.