From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id cGqVEkafyGNzMgAAbAwnHQ (envelope-from ) for ; Thu, 19 Jan 2023 02:39:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id YFStEUafyGNaMgAAG6o9tA (envelope-from ) for ; Thu, 19 Jan 2023 02:39:18 +0100 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 12C491F2D6 for ; Thu, 19 Jan 2023 02:39:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIJtR-0007wh-2u; Wed, 18 Jan 2023 20:39:05 -0500 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 1pIJtP-0007wR-6x for guix-patches@gnu.org; Wed, 18 Jan 2023 20:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIJtO-0003PV-Sc for guix-patches@gnu.org; Wed, 18 Jan 2023 20:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pIJtO-0001cH-Id for guix-patches@gnu.org; Wed, 18 Jan 2023 20:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60941] [PATCH 2/2] gnu: diffoscope: Update to 232. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jan 2023 01:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60941@debbugs.gnu.org Received: via spool by 60941-submit@debbugs.gnu.org id=B60941.16740922946155 (code B ref 60941); Thu, 19 Jan 2023 01:39:02 +0000 Received: (at 60941) by debbugs.gnu.org; 19 Jan 2023 01:38:14 +0000 Received: from localhost ([127.0.0.1]:42138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJsb-0001bD-KO for submit@debbugs.gnu.org; Wed, 18 Jan 2023 20:38:13 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:60100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJsZ-0001b1-LO for 60941@debbugs.gnu.org; Wed, 18 Jan 2023 20:38:12 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id C8AA61AB68 for <60941@debbugs.gnu.org>; Wed, 18 Jan 2023 17:38:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674092284; bh=k0RQpkdKKEhoqiZrsHqeqlapJOimXGTW3qupV7GQ4SE=; h=From:To:Subject:In-Reply-To:References:Date:From; b=3aaAJJpHTAAPf3w/pWgFDebqhnBQtmi6syM1Db64/yf0cuBMO6Z/y7S4M+bdxrU2S M/oyALOOoNFZl/qQ1eIP4ahRrrjXr3BajGv/3FFAf5Ajaiwu9x0grCcDnrnh+X7qxu ZilCNwJhZTEGbh/UNJrQySSNQEJOuemEtKKSMLcu6OUAPRYCtXeKjCyMk4BGXbYJ+d FSAKZO0ap9RVxdpc6QJgaUkXziS9ZSZEFck+68XQNOC56uWuE/QcexH2U+tJkqomAz EMjnkY2+d163Ao9hB57wHyelPi2eUNRfy/Fv6MUwRLInZ0Wad5Hxq/s8NMm4yNr49C J201mTsADZfBg== From: Vagrant Cascadian In-Reply-To: <87edrrz4nd.fsf@contorta> References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> Date: Wed, 18 Jan 2023 17:38:00 -0800 Message-ID: <87a62fz4lj.fsf@contorta> 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674092358; a=rsa-sha256; cv=none; b=dbUf+JqK5jTehEOl5UPG1yAMpG+B8bG6VV+ig/xcVtzXukN3zzKXQLT8xs4Hw6rcL1c15N cN1SjclJba4cAisx+IuOexXhHWSPs/LWB6KiBiVtL5P0W3yF9CpY0SdTTwNQwPl1kObxak C9Ev2PRQ+0n4rFmnfzxRG1P0dTdRbSuqLJFXl7Xv8yIz5lENavuIOLlqsdCgF7qkkbBQi8 yloBb5IsiYAW6GODyE4Di11do4aBl+wdylepEDWYEOSrynLNWWhKHEzA2ZlnkHrAlE/CZZ ATKDXrv2jVkruZHXzPuDZybc/9dQ13/patwFeXQT/xW+Vy7bh1K94mDb1DRDKA== 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=3aaAJJpH; dmarc=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=1674092358; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=Px8YFOzgQN6Rb3PtLhSE3s8x3Y/SaJKO/EdLaC+iLBc=; b=Z3HHwShklHUcjXCoOV4T69Q4xS0EKlAFIf9XOyJnDt2a0hPtAuoMfVxvVhEL8WPtPQb1sg zygzGXUmIBumJPmxGUr+5fQbtzBlVvws2GKHHoPqVYP5BPSqgcMdMRmmP+A1DsDpdjzJW+ QeXTCf0s06yN2TpBIS6NCM8IhPv6/bqy+etk7zbgY88SiOhZ93+VjC2V43fYlN0lm8Ps5J YfLcfWdib5zrXiSryqruYNT32IWeLCdKdcEd7FUL+fXAucmjm71p3d9jxNrd29M/NiGiuP ZVCLtDnRn3h7lhEOGD8WY1udKEJNGrIFa1zpVfXgSIQ5dWJJCxkLGxRZxKos9Q== X-Spam-Score: -1.72 X-Migadu-Queue-Id: 12C491F2D6 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=reproducible-builds.org header.s=1.vagrant header.b=3aaAJJpH; dmarc=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" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -1.72 X-TUID: kWTY7a/NPEyv --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-diffoscope-Update-to-232.patch Content-Transfer-Encoding: quoted-printable From=20784d33dad1ff114e4f8043b7b766c785e7fef79f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 18 Jan 2023 11:00:46 -0800 Subject: [PATCH 2/2] gnu: diffoscope: Update to 232. * gnu/packages/diffoscope.scm (diffoscope): Update to 232. [native-inputs]: Add lzip and python-pdf, drop python-pypdf2. [phases]: Add lzip-external-tool and remove-mono-external-tool. =2D-- gnu/packages/diffoscope.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f730d976fe..59875c2e8e 100644 =2D-- 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") =2D (version "224") + (version "232") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (define-public diffoscope (commit version))) (file-name (git-file-name name version)) (sha256 =2D (base32 "1qdivsf4yygg2az5018pw0q4169zas3hfqjydd0q3bhdrfpl0q4q")) + (base32 "0zix2m1rlgj7kyx8bkfjb9dnc5idblz6xhmxqq0w3jpnkxxjj8yq")) (patches (search-patches "diffoscope-fix-llvm-test.patch")))) (build-system python-build-system) @@ -112,6 +112,21 @@ (define-public diffoscope (string-append "[\"" (which "stat") "\",")) (("\\[\"getfacl\",") (string-append "[\"" (which "getfacl") "\","))))) + (add-after 'unpack 'lzip-external-tool + ;; Fixed upstream, remove this phase when updating to + ;; diffoscope 233 + (lambda _ + (substitute* "diffoscope/external_tools.py" + ((".debian.: .lzip.") + "\"debian\": \"lzip\", \"guix\": \"lzip\"")))) + (add-after 'unpack 'remove-mono-external-tool + ;; Fixed upstream, remove this phase when updating to + ;; diffoscope 233 + (lambda _ + (substitute* "diffoscope/external_tools.py" + ;; "guix": "mono", + ((".guix.: .mono.,") + "")))) (add-after 'build 'build-man-page (lambda* (#:key (make-flags '()) #:allow-other-keys) (apply invoke "make" "-C" "doc" make-flags))) @@ -160,7 +175,7 @@ (define-public diffoscope python-pytest python-chardet python-h5py =2D python-pypdf2 + python-pypdf python-progressbar33 =20 abootimg @@ -195,6 +210,7 @@ (define-public diffoscope libarchive llvm-9 lz4 + lzip ocaml odt2txt openssh =2D-=20 2.39.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY8ie+AAKCRDcUY/If5cW ql8qAP9AGfllaFnK0LEg96nnZeyK6Fxa2XEtqqTKWxFykotbzAEA0D7iqvnPrI2H lz9gFZxosHLS01wI9FDrxXoq5xy2/wY= =ISJT -----END PGP SIGNATURE----- --==-=-=--