From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +BG/DpyhyGN+JQAAbAwnHQ (envelope-from ) for ; Thu, 19 Jan 2023 02:49:16 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 0AC8DpyhyGOLmAAA9RJhRA (envelope-from ) for ; Thu, 19 Jan 2023 02:49:16 +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 1C5658C99 for ; Thu, 19 Jan 2023 02:49:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIK36-0001g3-HT; Wed, 18 Jan 2023 20:49:04 -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 1pIK35-0001fv-2B for guix-patches@gnu.org; Wed, 18 Jan 2023 20:49: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 1pIK34-0004nw-Qe for guix-patches@gnu.org; Wed, 18 Jan 2023 20:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pIK34-0001wQ-Ds for guix-patches@gnu.org; Wed, 18 Jan 2023 20:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60941] Update diffoscope to 232 Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jan 2023 01:49: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: Vagrant Cascadian Cc: 60941@debbugs.gnu.org Received: via spool by 60941-submit@debbugs.gnu.org id=B60941.16740929127419 (code B ref 60941); Thu, 19 Jan 2023 01:49:02 +0000 Received: (at 60941) by debbugs.gnu.org; 19 Jan 2023 01:48:32 +0000 Received: from localhost ([127.0.0.1]:42152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIK2a-0001vb-7l for submit@debbugs.gnu.org; Wed, 18 Jan 2023 20:48:32 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:35672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIK2X-0001vJ-Gv for 60941@debbugs.gnu.org; Wed, 18 Jan 2023 20:48:30 -0500 Received: by mail-qt1-f182.google.com with SMTP id g9so514441qtu.2 for <60941@debbugs.gnu.org>; Wed, 18 Jan 2023 17:48:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=tggyaPjJ68aidOd4x2RIVGy9q+Hv4mPRdCbNtMqV4zY=; b=oUUrQRq8UHW3RiY/kuclnePGHn4tekvO6jeENknEOi7kNhr3aoSGkNXkqHgZ3dPsr0 cUCxGJEbNDd0v1x8n50e3NUw4Sc69iu/EaFpRvDzU4nnaFiir8RX2BV4GDSuoOW3G8tZ w6YDXzLPwk8iuyVa3cnXjwN+DxoeOMqIVlZQuAppOCDVZ5LhY8C78bRH1irkRuYcia4A aTT7eVtLAdTRfFAfjTHkQ40IUPZksrxOQ+FVOePwalYCdIStMlz4HqslCS9/q8XVxTn7 2ylCPpWc0eh6Fq2GjDM4uDGYPtOsmdH/jTY/4sgohi/BLMqL15nYYxYh05D+Ic69FNwW GMag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tggyaPjJ68aidOd4x2RIVGy9q+Hv4mPRdCbNtMqV4zY=; b=T7ZGvMeDs0q3FNa5aKnrhfN3CMvP93hL4BbcAWvYSJA/BWERISHxdgTCYKwkVNtdf4 AZmW7dFrwiK5/8Rya/VLj5km6Q9HdwbkpxH9t9/3n5h6yXGGph/oh4JnpTtDyZ2eEE1a fRlBQpHg+741hHABmVrCTHrW2AevD8U/LryQXRyYMLz//XETaJRGg6H9OohMGq6h4ZBZ QOOihTkAtxxHPuSQXikYX0S4Nr2GvA47dn3Or0zurtiQm14hmUwIfzGc3OK8W73mTp6o cW7m8SvJ0XBloQHmW+wHnT54fl1ioq0dS8HalQZ/OJDZsgzfzgKubvUTGFr/vVOiU0Bj eE6A== X-Gm-Message-State: AFqh2koXgfKzzd2UYy9+GC9bNHf0qtKZCOrsqyag/xfu6BVaYClaFASB NNex0seG2NUt3SE1VYG+Cy3hMfztxp5d1e2+ X-Google-Smtp-Source: AMrXdXt6eY8DlmGxAK37NcJ/3MuaXBAUQVYU1PeKakPu6A2FazC6ltbAawJPFGfluZ6hdV65ocQZwQ== X-Received: by 2002:ac8:5287:0:b0:3b6:2bb3:fb53 with SMTP id s7-20020ac85287000000b003b62bb3fb53mr12772960qtn.16.1674092903661; Wed, 18 Jan 2023 17:48:23 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id z26-20020ac8101a000000b003a70a675066sm18139603qti.79.2023.01.18.17.48.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 17:48:23 -0800 (PST) From: Maxim Cournoyer References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> <87a62fz4lj.fsf@contorta> Date: Wed, 18 Jan 2023 20:48:22 -0500 In-Reply-To: <87a62fz4lj.fsf@contorta> (Vagrant Cascadian's message of "Wed, 18 Jan 2023 17:38:00 -0800") Message-ID: <87lelze1ll.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674092955; a=rsa-sha256; cv=none; b=avD4sS+CH6U1fOyWYjqrEbpFo0bv/va+oVw8Y+piQf3dXJZMG3GLGsIfAy4TM5r5dvINx1 vqMbOcjg5kyEihrlHdeKrA2F6Ks5cVs+rvspmF+WUJXBMDFQ1mGe0yRiCKH08rU3Oc/bG2 0d7NtH8rUoRg8fAYyn9STvIg3rVc86U1UwEU40eMfHVOuWBOBAUIKVJScxQRfR3wAnFaGR bYAN5JKTMHi0NByKxoF8RNZybMyBCc0i6/9JN3In2Ju4OixHSW0wPQEN7VdDYLc5YyCA/C fVvCbOlR0syPPpCjqx5ZUtoB2p3Yl7vae6poQqNfThGEMHVFfUmrzAHVs7RtCQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=oUUrQRq8; 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=1674092955; 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=tggyaPjJ68aidOd4x2RIVGy9q+Hv4mPRdCbNtMqV4zY=; b=iabc17jUDth0Tm2upGUTeRzEy/0iNIchC2ygsJFqApxWRttk0I/KcuA4PEid5Y6XQKDmso psAUuV8VFNfzVEnyD8fjjJdNrfxwVrvu66VyeW7HMn/4dXBsysU2H+Ff4OYKhmV+Aagx1+ sljGY8PEn49V57PrwDxpLbzlh4eSQBvW/PjSWtsdPRhCrj+kqCs4Jz+eLbzwQA+SDSGJHu cj255D9nM6qYgWWQBD0z0iMi9m8h1cqBujD2uT62YX//NWhhUgmqp8AFm2DYvbdv3gEwRq YDIuzdJnvoambDXIVjx7UYz90MHcXN0kVoYF0QIQVvqQfC8e6m5SYes1iWZSlw== X-Spam-Score: 5.38 X-Migadu-Queue-Id: 1C5658C99 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=oUUrQRq8; 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" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: 5.38 X-TUID: 2Aw587Slr9pG Hi, Vagrant Cascadian writes: > From 784d33dad1ff114e4f8043b7b766c785e7fef79f 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. Nitpick: GNU Change Logs style doesn't use a hanging indent in the left margin (see: info '(standards) Style of Change Logs'). > --- > 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 > --- 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 "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 > - (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 nitpick: stand-alone comments should end with a period (complete sentence). > + (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) There are no #:make-flags argument for the python or pyproject build systems, so that's useless. > (apply invoke "make" "-C" "doc" make-flags))) > @@ -160,7 +175,7 @@ (define-public diffoscope > python-pytest > python-chardet > python-h5py > - python-pypdf2 > + python-pypdf > python-progressbar33 > > abootimg > @@ -195,6 +210,7 @@ (define-public diffoscope > libarchive > llvm-9 > lz4 > + lzip > ocaml > odt2txt > openssh The rest LGTM, thanks for the update! -- Thanks, Maxim