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 2GuFE4bQV2ZOdwEAe85BDQ:P1 (envelope-from ) for ; Thu, 30 May 2024 03:04:06 +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 2GuFE4bQV2ZOdwEAe85BDQ (envelope-from ) for ; Thu, 30 May 2024 03:04:06 +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=a78Y7PrC; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717031046; 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=FuDPgNTP17WfJlVbgI+BlaP4VLxPm8DJWXlGHObyNUY=; b=tP6G7vgrzynTEAqLnzspDVz7/16lv9IhBRV2tcAG4Vz9n1kPvX0h4CjHPLSPuky1MtJTjr jVO+GtngKzmdx6oXWBaOQ4oY+TVAEduVT01pjiQ9FMuGj+IGMNOAbFO2KmkUknhdwipl5t JpRNdriMnHCpUjURXj4ARRRgKyFLYM5InQn/gpcZD90R0ditI0hcmT1Fk1SEFen2MVfWqs BQPGNxMRuVtekg3wcdQ2SBXUuIkztr1Y7sAKXc9xDntNgfGEB7keSAAdihYsl3gG9xOJ5X Sr48oO0waCrvzAwsnlygJHciiYvA0rWZZ8V7PLUeJFT4scKIVpIBdUP7dlGOmA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=a78Y7PrC; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717031046; a=rsa-sha256; cv=none; b=tNRJwkE/E3oGVAjgH+ZE9O/22xHJklX8A+CBt2PJucSbAJMTsjYxpDWn/3JwMC/Izrj6Lw OFh5updwDjt641v4HKP3OLTZFh+m+V+TKt8FRlJIVBBU4IwS6IFCRA/Wz4hgQVKoq+EtGU 9djgKTtU5B0PLYDhpp293xZMn6LMAzQ6YG0giLcXonynGznAymamQT0WJWhh1p2Ug7qkyc nzIfMW5YXI5kGaoMGd6tyaTb5MeMbgcEABEpGPmL9xJXdkp2/9mwY0n/gW7x8DG62nM2K2 kzFp5N3m8FE+hZYh0NDfNq/6hgYjvx8x96cDy8bQwu1GtReA3A7DtMP4HvIAUw== 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 59E3C6158B for ; Thu, 30 May 2024 03:04:03 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCUCv-0006LL-O7; Wed, 29 May 2024 21:03:53 -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 1sCUCu-0006Kx-7R for guix-patches@gnu.org; Wed, 29 May 2024 21:03:52 -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 1sCUCt-0000Iz-PP for guix-patches@gnu.org; Wed, 29 May 2024 21:03:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sCUD3-0007GU-QB for guix-patches@gnu.org; Wed, 29 May 2024 21:04: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: Thu, 30 May 2024 01:04: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.171703103327909 (code B ref 71024); Thu, 30 May 2024 01:04:01 +0000 Received: (at 71024) by debbugs.gnu.org; 30 May 2024 01:03:53 +0000 Received: from localhost ([127.0.0.1]:36759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCUCv-0007G5-3e for submit@debbugs.gnu.org; Wed, 29 May 2024 21:03:53 -0400 Received: from mail-qk1-f178.google.com ([209.85.222.178]:46439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCUCt-0007Fn-4u for 71024@debbugs.gnu.org; Wed, 29 May 2024 21:03:51 -0400 Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-794c3946468so27886785a.1 for <71024@debbugs.gnu.org>; Wed, 29 May 2024 18:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717030954; x=1717635754; 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=FuDPgNTP17WfJlVbgI+BlaP4VLxPm8DJWXlGHObyNUY=; b=a78Y7PrCpafgK3Pz9N2fOhjgRMADSRRBlPwD0J9OEEpwI1FLqhEro/7DUGh+apZY1A YArNhz1Y7akTmqevgl8BOXjhBAxCigcjT+bL+UCfW3pmvls3Eh3+x4gwWwneL72xeLMc CEEWX4qDwRmna08PJQXo9oExTFweh552FeGD4iHfbtES9ft8x49sB098fmzHmBdyr7jn hiqaxAd55ohw837E74BJCyVlM9dKBrsxsJglhzAmHnjg262tEwkhFcMfwgbTQmXPFFAH j776qjBQeghTuur2mD2MW90KuIhDKg9lXtxqmroY4vZEebw3vqTNHxmGOf9SIX5xIhE7 dakw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717030954; x=1717635754; 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=FuDPgNTP17WfJlVbgI+BlaP4VLxPm8DJWXlGHObyNUY=; b=mhy0zizXCKH99ofN9kKY437UNGrMnmj/1WjwtqFZqoU6ex4xK6pWRFeigB5ZJqMjCL UOZhS7ydxt7Mke113cT5BgLFYBibOXLuXaqf3uveYQKQEVfdmy2UdiiMcJgOhdt7mqmv W9vq8jfDi8/D9neZRTu5psqi7sbu0Fvuc5OZAtktCfIFTnNqufLXgRv7OWGtx2a5L6Pj qIF/VTSztr9/m7/gD4og2CdyIIrEhjC3855PVHfjpXOz6R4LSeoJx0H8DBfdAeY4pY8D GDv5/f7WmC8leUQKsS2p8ezi//60KLG5RM2cBeyjYCqKFc9GoJwDldyUYh8mBId5KL6R /n0A== X-Gm-Message-State: AOJu0Yy8BHllbNX1NmMiPJXTxebiXrMZXBk9z7qxVKbZDCTE4tdCaoGB jjkp4MWrGy8s/UBzTvDCBN1PkmdjaDVN0+JYbRdt0ifuvVu4M3YzdOFj5wgE X-Google-Smtp-Source: AGHT+IEA6GK4CNIw1zaoC7knwP6/e6lJGOA3crmWejE9nL6ftWDYQ07TJllinDhSeEPRw7SRUhG1Tw== X-Received: by 2002:a05:620a:5757:b0:794:b350:a4b4 with SMTP id af79cd13be357-794e9dc0bdcmr84839085a.46.1717030954360; Wed, 29 May 2024 18:02:34 -0700 (PDT) Received: from hurd (dsl-10-133-96.b2b2c.ca. [72.10.133.96]) by smtp.gmail.com with ESMTPSA id af79cd13be357-794cbe471f6sm223918685a.43.2024.05.29.18.02.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 18:02:33 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <87plt5o9cd.fsf@wireframe> (Vagrant Cascadian's message of "Tue, 28 May 2024 15:33:22 -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> <87bk4ti883.fsf@gmail.com> <87plt5o9cd.fsf@wireframe> Date: Wed, 29 May 2024 21:02:32 -0400 Message-ID: <87ttigf6xj.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 2.65 X-Spam-Score: 2.65 X-Migadu-Queue-Id: 59E3C6158B X-Migadu-Scanner: mx13.migadu.com X-TUID: ENhxQJBF2kCG Hi Vagrant, Vagrant Cascadian writes: > 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? :) If you want to get done with this, I'd recommend pulling a patch from the upstream commit. Then when we get to upgrading to the next release we can drop such patch. Hope that helps, -- Thanks, Maxim