From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id wPMKD12nUmZxEwEAqHPOHw:P1 (envelope-from ) for ; Sun, 26 May 2024 05:07:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id wPMKD12nUmZxEwEAqHPOHw (envelope-from ) for ; Sun, 26 May 2024 05:07:09 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=k+dhqr8p; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716692829; a=rsa-sha256; cv=none; b=tN1Bn7Tk6+DSzdVOCDr7BeOPAsOqQUOcJ2OsyocvpMjnaPTkRJLmBsRZgG0rnccWTMqB5M /AWfBETZDxi+NDJ37pqEjMhtX/f20NKIMj4xdRn7+NkW/D+0jioYANfJ2iwsAEJK6vDzgV kdOk0JNGrNX+dRRZRB/b+EdyOVuKmz+8mJE5W6AvIKHlkNmIKRXkK9s1Dqk2vEpE1E25G6 4NCIljcyimTAxwwPHiue4gv7FVZeE0XhxchVOpN3Z8e1h90CkcaRH6CwzOuLm0Yyp4b+h9 XpoTi4JKpH60A0U4h/9uuKimze/N2+BrcB1SMDm+lH3GI1r5bpaYWVe9WPFn6Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=k+dhqr8p; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1716692829; 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=jHzePCpC2lY989WsH+a82j62vn88E7MPI2QoaSrxUGc=; b=gjbGYh7EYMdjZknTZo40pvtiz38QlBIaz3GIxjaWCx4gCLnzcL0SCjcAGvogVPwPP3BOS8 J8oPryP450Dw6bzzAx8R3VWVY4ZbwOguBcN2QFUTrYjfrM8vj2CBDdlQukXcy49ftJW5b1 iHmugsEpljrHPOBdAi4h8uw2B4FNm0j9yUwfoF0EiadA6ASYvPsXKAwbgn4ofNQ3NjadV+ hlknO7QaxckZ3e843Kjwjabya0QWhMawq7KmL7zBxQ67Q3L7Aq+M5AujMKisP4UyRkGwc5 Ic6EeYZHKxpds0w/8UxIGqbko1vRSAyneQE/UhTNCQeOKRQ/fYE3mcYIaFpBHw== 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 DDCC864C66 for ; Sun, 26 May 2024 05:07:08 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sB4Dp-0003Ij-22; Sat, 25 May 2024 23:06:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sB4Dm-0003IB-9P for guix-patches@gnu.org; Sat, 25 May 2024 23:06:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sB4Dm-0007Gb-1L for guix-patches@gnu.org; Sat, 25 May 2024 23:06:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sB4Dt-00081S-Se for guix-patches@gnu.org; Sat, 25 May 2024 23:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71024] Update diffoscope to 268 Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 May 2024 03:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71024 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Vagrant Cascadian Cc: 71024@debbugs.gnu.org Received: via spool by 71024-submit@debbugs.gnu.org id=B71024.171669278030778 (code B ref 71024); Sun, 26 May 2024 03:07:01 +0000 Received: (at 71024) by debbugs.gnu.org; 26 May 2024 03:06:20 +0000 Received: from localhost ([127.0.0.1]:38090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB4DD-00080M-Mh for submit@debbugs.gnu.org; Sat, 25 May 2024 23:06:20 -0400 Received: from mail-qk1-f181.google.com ([209.85.222.181]:51422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB4DB-000806-LP for 71024@debbugs.gnu.org; Sat, 25 May 2024 23:06:18 -0400 Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-794b94d1fe9so36058685a.2 for <71024@debbugs.gnu.org>; Sat, 25 May 2024 20:06:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716692702; x=1717297502; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=jHzePCpC2lY989WsH+a82j62vn88E7MPI2QoaSrxUGc=; b=k+dhqr8pDwaDrBKkZGeZbr6SUFhxRaQLissLwaLmzn3JbeCFIWgy1V9rhKa4AFmt5O +KA64VFKAnR0bK6cLxVwGpOxJkBsfzXFv+pYBMWUQcwLHlB+HHMLLidUNz0uPGUl/KNe aHZzWGojPmtYRPx21su9L8ttYsNSwkGoASC4V5V7vB0iaqqlsImq9AVR6du57y/NohqP h/wVOXb00YESpfLDqOztmqh6mJya0Le4PzGFNP6jGayqvefS7siQxbpwfKWGJDx0uyg5 qQT/GvQ7s4GUsfWeclQ6RYv0riXNkLxrFN6OYurc2Sd0ek/yjrVrjlK6xTO4tVCU5SVQ EaDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716692702; x=1717297502; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jHzePCpC2lY989WsH+a82j62vn88E7MPI2QoaSrxUGc=; b=LqPBrt+pVAZUdbWqhY/7QXBkXjrg1yB1sYD8eHdxm3g/K/dlP/Ap8aJ3i2nxjL+dUz yJewSZJbY761yTgq+emYXmzi3xC14KfZepvcCMhgcCBxw3BsqyAJ/ROlaPVRWhXoNq9l u7ok3huLlcn09SqtPW+WLyLH8k+JUgfuZ4a6225fOQQOBbXIunw5Vro2ENV6vujzBghs L1DrRchZNfYggbCwgYSkAQSh+bJzOhs/CejcfgX5+ZtD8cvHnspmnU2fAGtwOOqIqQiC AsqM3Sc+0Yei7w3QdIxgEWa1ZiDq6H68HBbcZMWLsyWTe5ahmziAfQIBBgfn5mv2YeJI zGWg== X-Gm-Message-State: AOJu0YyUmWl393GjciFnw35kM2v6gpZibmhxpbFxsSIFdMVDpCOMwGn+ PRvjLnsQ3cxyN6u6leedbydfpn0RIgTpT2+abj1heVbjfgvTok6Eh2J1bg== X-Google-Smtp-Source: AGHT+IE+ZaFSmT7l+AJ5yDHxoOCnykwmfqi+V8eBcw1GUJ34Mv5Yf89PYRtJbWDlUW/7/G8nxbUhog== X-Received: by 2002:a37:c241:0:b0:794:b4e0:a29a with SMTP id af79cd13be357-794b4e0a2c6mr257890485a.63.1716692702511; Sat, 25 May 2024 20:05:02 -0700 (PDT) Received: from hurd (dsl-10-130-164.b2b2c.ca. [72.10.130.164]) by smtp.gmail.com with ESMTPSA id af79cd13be357-794abcc3070sm190657885a.51.2024.05.25.20.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 May 2024 20:05:01 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <87bk4vp913.fsf@wireframe> (Vagrant Cascadian's message of "Fri, 24 May 2024 07:41:12 -0700") References: <87r0dzriwi.fsf@wireframe> <20240518035037.190183-1-vagrant@reproducible-builds.org> <875xv7vq3w.fsf_-_@gmail.com> <87bk4zr9db.fsf@wireframe> <87seybottm.fsf@wireframe> <874jaq676p.fsf@gmail.com> <87bk4vp913.fsf@wireframe> Date: Sat, 25 May 2024 23:05:00 -0400 Message-ID: <87bk4ti883.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: DDCC864C66 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 2.65 X-Spam-Score: 2.65 X-TUID: 8d5s1J/LBt9Y Hi Vagrant, Vagrant Cascadian writes: > On 2024-05-21, Maxim Cournoyer wrote: >> Vagrant Cascadian writes: >>> On 2024-05-20, Vagrant Cascadian wrote: >>>> On 2024-05-20, Maxim Cournoyer wrote: >>>>> vagrant@reproducible-builds.org writes: >>>>>> From: Vagrant Cascadian >>>> Or fixing diffoscope to work with the older xz version in master >>>> (5.2.x?) that guix is already using, which, now that I have spelled out >>>> all of the above, seems possibly a much better idea! >>> >>> This was "fixed" in upstream diffoscope git by setting a version >>> requirement on the test, and I think this was a new test, so not exactly >>> a regression in test coverage. >>> >>> https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/17c061e767e612540dd0227c3fd1f9cab460a78f >>> >>> So we could build diffoscope from that commit instead, or manually apply >>> the patch, or just wait till the next diffoscope version. >> >> Given the xz horror story, waiting a bit more seems a good option to me. >> Thanks for explaining it in more details; it seems upstream is working >> on a cleaned up 5.8.0 version, which isn't ready yet. > > Well, version 268 was just released, which fixes the xz issue ... but > introduces a test failure for 7z... which is worked around in the > attached patch. > > The other option might be to package 7zip (which seems more maintained > than p7zip)... but that seems a bit longer term. > > Yet another option would be to revert the patch that broke the test with > p7zip based 7z. > > But for now I propose the workaround to effectively skip this one > test. :) [...] > diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm > index fd2146456d..f7c5f07856 100644 > --- a/gnu/packages/diffoscope.scm > +++ b/gnu/packages/diffoscope.scm > @@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope) > (define-public diffoscope > (package > (name "diffoscope") > - (version "265") > + (version "268") > (source > (origin > (method git-fetch) > @@ -84,7 +84,7 @@ (define-public diffoscope > (commit version))) > (file-name (git-file-name name version)) > (sha256 > - (base32 "0fdaxihmzz1jf9ay8pwr1z60b2rnihawp4js4nw9l7wv0gij9vpg")))) > + (base32 "148r4grla92g9syjcxkyflxca2ydyb3rznb7wrrdl4zgpp4qirrh")))) > (build-system python-build-system) > (arguments > (list > @@ -114,6 +114,13 @@ (define (bin command) > (string-append "[\"" (bin command) "\",")) > (("\\[\"(getfacl)\"," _ command) > (string-append "[\"" (bin command) "\","))))) > + (add-after 'unpack 'workaround-sevenz-versioned-test > + ;; Detects incorrect 7z version from p7zip: > + ;; https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/376 > + (lambda _ > + (substitute* "tests/comparators/test_sevenz.py" > + ((", skip_unless_tool_is_at_least") ", skip_unless_tool_is_at_least, skip_unless_tool_is_at_most") > + (("@skip_unless_tool_is_at_least") "@skip_unless_tool_is_at_most(\"7z\", sevenz_version, \"63\")\n@skip_unless_tool_is_at_least")))) That would LGTM, if it didn't so severely bust our 80 maximum column width convention :-). Would you mind editing it into conformance? You can use actual newlines in the replacement text, and it's common to have the substitute form broken on multiple lines like: (substitute "some-file" (("some-pattern") "some-replacement")) -- Thanks, Maxim