From patchwork Sun Jan 22 03:32:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 46335 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 2DB7C27BBED; Sun, 22 Jan 2023 03:33:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 1015727BBE9 for ; Sun, 22 Jan 2023 03:33:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJR6O-0006Y9-Cf; Sat, 21 Jan 2023 22:33: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 1pJR6M-0006Xc-Jb for guix-patches@gnu.org; Sat, 21 Jan 2023 22:33:02 -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 1pJR6M-00057K-BP for guix-patches@gnu.org; Sat, 21 Jan 2023 22:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJR6M-0004df-3B for guix-patches@gnu.org; Sat, 21 Jan 2023 22:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60941] [PATCH v2 2/2] gnu: diffoscope: Update to 233. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Jan 2023 03:33: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.167435837017813 (code B ref 60941); Sun, 22 Jan 2023 03:33:02 +0000 Received: (at 60941) by debbugs.gnu.org; 22 Jan 2023 03:32:50 +0000 Received: from localhost ([127.0.0.1]:50218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJR69-0004dE-Uw for submit@debbugs.gnu.org; Sat, 21 Jan 2023 22:32:50 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:53336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJR68-0004d1-4H for 60941@debbugs.gnu.org; Sat, 21 Jan 2023 22:32:48 -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 6B5F81AB81 for <60941@debbugs.gnu.org>; Sat, 21 Jan 2023 19:32:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674358361; bh=w+tJ2inN3jk9SKKtvnUYy214md8eeKvEbTRVvfqa/tQ=; h=From:To:Subject:In-Reply-To:References:Date:From; b=hOO/iiA1S2+gsnIg5a8F3ASAdT5WlvzMPwdhOKMNP+Ly1sDpbz9dbUMHX2rFa/R3w WtzH57DW9m7n7ZhhXBkXqeYND2mEfZ/Fp13aaFvf2RWAWPX9iGuvF191ohov+Lqr5a ndxn9JZlItFLclJURzi5jFwVWteDehClsZDpnwPteWMGdhfrV8RGCrD7E0RXhKhNzj iLwamZ2DMbYSDkhCXP/HWbwmXNCUxa10ej/ItTe8uspFmdHNDWszRxYNf4vtGt4IGF hCI+spo3mlIPFRm3ifabgj6FlwtYtGUM6xy4zIiixYZUHfRgjzYS4gaii0rCxBozJT iiPkfoxs0x0sQ== From: Vagrant Cascadian In-Reply-To: <87a62fz4lj.fsf@contorta> References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> <87a62fz4lj.fsf@contorta> Date: Sat, 21 Jan 2023 19:32:37 -0800 Message-ID: <878rhv6y7e.fsf@contorta> 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 New upstream version which includes some of the changes monkey-patched in from the previous version. From 7d56d84b140931d434c8b0178797de5b93474173 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 21 Jan 2023 19:17:46 -0800 Subject: [PATCH 2/2] gnu: diffoscope: Update to 233. * gnu/packages/diffoscope.scm (diffoscope): Update to 233. [native-inputs]: Add lzip and python-pdf, drop python-pypdf2. --- gnu/packages/diffoscope.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f730d976fe..6decb86f02 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 "233") (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 "1m6fc7k8cd7ahra05vqccw1fdbjj6d20vr3q8v67ynnyih5nmbnb")) (patches (search-patches "diffoscope-fix-llvm-test.patch")))) (build-system python-build-system) @@ -160,7 +160,7 @@ (define-public diffoscope python-pytest python-chardet python-h5py - python-pypdf2 + python-pypdf python-progressbar33 abootimg @@ -195,6 +195,7 @@ (define-public diffoscope libarchive llvm-9 lz4 + lzip ocaml odt2txt openssh -- 2.39.0