From patchwork Fri May 24 14:41:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 64866 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ECF7D27BBE9; Fri, 24 May 2024 15:42:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A74DA27BBE2 for ; Fri, 24 May 2024 15:42:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAW7L-0001b7-CU; Fri, 24 May 2024 10:41:59 -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 1sAW7H-0001aN-T0 for guix-patches@gnu.org; Fri, 24 May 2024 10:41:56 -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 1sAW7H-0005xq-IJ for guix-patches@gnu.org; Fri, 24 May 2024 10:41:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sAW7O-0000Q7-8t for guix-patches@gnu.org; Fri, 24 May 2024 10:42: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: Fri, 24 May 2024 14:42: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.17165616961601 (code B ref 71024); Fri, 24 May 2024 14:42:02 +0000 Received: (at 71024) by debbugs.gnu.org; 24 May 2024 14:41:36 +0000 Received: from localhost ([127.0.0.1]:37484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAW6y-0000Pl-7t for submit@debbugs.gnu.org; Fri, 24 May 2024 10:41:36 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:57510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAW6u-0000Pf-9g for 71024@debbugs.gnu.org; Fri, 24 May 2024 10:41:35 -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 A41A41AE65; Fri, 24 May 2024 07:41:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1716561675; bh=geWya39AOLh2GTlow2GH4MwQhfCYtFRrF0S5Pbl69EY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=J6TBY91s7GPOpSYyRcLr9Gu51141lg50XIR7Nn65zq7iu7/u2AdIQkg8FWu3HnhIF e2jQQfNi8gxTCbnUi9agVpRkA7VaJ/CDRNqyyGSY9SF158E56iIXhkf/CvBULRfsOs krTWplyZ9wiSde6T2qkzfFFxrpatE/impFt8o5zsWJrxaPgRl92bagaNu2UtzTglwF pe5MDYv+Lfl5RZ9avJ8ltXeks5aV6A6wc6s4nUjPsVZHgVCIw5YA6jwbEQZhpetG7v wuSiiyuBUTKcEahQchaUYuhCXKKyg+MKB17moF0AZMXIDsPb37kud4ADdO9iMy1VCr 1/YBRwxpK1vUA== From: Vagrant Cascadian In-Reply-To: <874jaq676p.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> Date: Fri, 24 May 2024 07:41:12 -0700 Message-ID: <87bk4vp913.fsf@wireframe> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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. :) live well, vagrant From 31c4b7ce41eb36aaf58913b3cc17021643e5fefe Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 24 May 2024 04:16:32 -0700 Subject: [PATCH] gnu: diffoscope: Update to 268. * gnu/packages/diffoscope.scm (diffoscope): Update to 268. [phases] Add 'workaround-sevenz-versioned-test. --- gnu/packages/diffoscope.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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")))) (add-after 'build 'build-man-page (lambda _ (invoke "make" "-C" "doc"))) base-commit: c5e63e19ac672f9e63fc8ee98fa9a16f978ce19c -- 2.39.2