From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id gCJGAydcVmbOCgAAe85BDQ:P1 (envelope-from ) for ; Wed, 29 May 2024 00:35:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id gCJGAydcVmbOCgAAe85BDQ (envelope-from ) for ; Wed, 29 May 2024 00:35:19 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=reproducible-builds.org header.s=1.vagrant header.b=nN27+qIx; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1716935719; 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=0lbqcb7plvqKS6x0gCHMIoHKvUubKIQ05Rh/sSRWg4M=; b=t3NLA6ZCC2FpbDpCkaEdlkfVXnoD2MykAxlGMPYDbU/q5mCFv+XbROW0ntryVXxDQkq2OJ +iHpAbVeoSxIMsemL73Irvdm/kZUjBuxNrY+AWsapuM5VXplGzwk5Wk50hxT2V3ccukkCH JkDladuLDQbP0FSD8KFp/iqQvR7vc3ZiroZHXpBuZBzyfcw76U5RyA/rjQR4APE55BwNIA b9f6+CUnm/UexRS5ckh+zDrDkmj5MqhBxKN7LE/H7tPBiQaJeW8diFv4/Yc8+F2zE9aYix AszSLG1f3QrMvA6HbwZadV7bCR8U8SQ5avzTd3wIs2tN/ejB1u33a/ep17ANvg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=reproducible-builds.org header.s=1.vagrant header.b=nN27+qIx; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716935719; a=rsa-sha256; cv=none; b=quk8hx+ptiuMkGC1RO0SSCVxbg/Fc394GOvPrDQi0HhYnq++IqRHOytUcH32Ynk37m/mXX ZqsvfJnVKvKnLkn6MntVBRaxsn/u/rn+12gCPngPozwp9OO3Ed54oU8f3nKgQCf6C5TV1d NQxHpTh8v/zf8zHetT7gNe16ZOvdUKWoDnJAmJN9NCHTF0VXkmpwmSSSVrTWA8mQ7iBcUE Uzbvveqw3WxW2C6KHp3iPKpgEWeuyv1Nk7hJ5iZegjLSXFRJPkcNAHXW639fy71es4KWBj GMVEarBrOJ5yqw6AMdLwmq1rhdM9ji5FHemgke+AoBrPMKS+bUGXaqkt+37WTw== 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 63B4051E03 for ; Wed, 29 May 2024 00:35:18 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sC5PC-00080S-Nq; Tue, 28 May 2024 18:34:54 -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 1sC5PB-00080A-AP for guix-patches@gnu.org; Tue, 28 May 2024 18:34:53 -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 1sC5PA-0003Sk-VT for guix-patches@gnu.org; Tue, 28 May 2024 18:34:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sC5PK-0007yh-8B for guix-patches@gnu.org; Tue, 28 May 2024 18:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71024] Update diffoscope to 268 Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 May 2024 22:35:02 +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: Maxim Cournoyer Cc: 71024@debbugs.gnu.org Received: via spool by 71024-submit@debbugs.gnu.org id=B71024.171693565830575 (code B ref 71024); Tue, 28 May 2024 22:35:02 +0000 Received: (at 71024) by debbugs.gnu.org; 28 May 2024 22:34:18 +0000 Received: from localhost ([127.0.0.1]:60906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sC5Ob-0007x3-D4 for submit@debbugs.gnu.org; Tue, 28 May 2024 18:34:17 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:39740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sC5OY-0007we-8z for 71024@debbugs.gnu.org; Tue, 28 May 2024 18:34:15 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 837281AEAC; Tue, 28 May 2024 15:33:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1716935605; bh=dPEJ6FrDRVgZODzPK9YLxnItiUsJ2yQFYR7BqaaQmc0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=nN27+qIxCQWyA/TlNIYJWaPJlKWh0zt2UhjZUOZ69Y7oAl5EzONibNY2LkPH8m+eF LhCMQbn45sFfMV+mEF8BUzVpPlmXfee4WIuP6DkAtnW1Sre9H+UjlMoQQ5KtGOEf/n 5Ye3dXGQTMxT6X9oRDuOsOzsyYwFyFzm4kOyqcvr7YLmrhRgfWd0CbAyct+K8z0hx/ s3PK3PkLxJg7ljnM3PrgfeEuZC/amxQEAVdnIdWtcMvkOnZeULM8oMU1I3EomViZVW RYe3xblntULT/a9nobjV7c9rhfjs84UozLlEV5vhTqUVoDuLB+UhljPpM8wCYyT27I VeA25vwD6Unxw== From: Vagrant Cascadian In-Reply-To: <87bk4ti883.fsf@gmail.com> 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> <87bk4ti883.fsf@gmail.com> Date: Tue, 28 May 2024 15:33:22 -0700 Message-ID: <87plt5o9cd.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.95 X-Spam-Score: -3.95 X-Migadu-Queue-Id: 63B4051E03 X-Migadu-Scanner: mx13.migadu.com X-TUID: Y9nsc5kI6unF --=-=-= Content-Type: text/plain On 2024-05-25, Maxim Cournoyer wrote: > 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! ... >> 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. ... >> + (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? Oops. must not have guix linted that one! Well, again, upstream has fixed it even better: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/2a361d7dff135d3e832161f587a55a62fcbec9f2 Tested fine for me building against that commit. So ... wait again till another release (and maybe find new breakage in the new release), or build against an untagged commit, or pull in a patch from the upstream commit? :) live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZlZbsgAKCRDcUY/If5cW qlBsAP95msCr6fOFxcFDz95DbHk6OwPSATL9Zp1YlPg+uXIqXwD9F8r0hbvB/7j3 b5UCHoMEzsSOJIzM5rKahiDUMxZWmAY= =LBEi -----END PGP SIGNATURE----- --=-=-=--