From eea8a872ff59e9edd2d8c54bac9857aac7a01ff6 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sat, 21 Jan 2023 23:06:21 -0800
Subject: gnu: diffoscope: Update to 233.

* gnu/packages/diffoscope.scm (diffoscope): Update to 233.
[native-inputs]: Add lzip and python-pypdf, drop python-pypdf2.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/diffoscope.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

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-public diffoscope
   (package
     (name "diffoscope")
-    (version "224")
+    (version "233")
     (source
      (origin
        (method git-fetch)
@@ -84,7 +84,7 @@
              (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 @@
              python-pytest
              python-chardet
              python-h5py
-             python-pypdf2
+             python-pypdf
              python-progressbar33
 
              abootimg
@@ -195,6 +195,7 @@
              libarchive
              llvm-9
              lz4
+             lzip
              ocaml
              odt2txt
              openssh
-- 
cgit v1.2.3

dden' name='id' value='219901a7b26062e9e9a6fb9df1b30aca2e4b778e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=219901a7b26062e9e9a6fb9df1b30aca2e4b778e'>root</a>/<a href='/guix/log/guix.scm?id=219901a7b26062e9e9a6fb9df1b30aca2e4b778e'>guix.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/guix.scm?id=219901a7b26062e9e9a6fb9df1b30aca2e4b778e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-07-12 01:17:45 +0200'>2022-07-12</span></td><td><a href='/guix/commit/guix.scm?id=4574ef267e543bcac97d9c400f30cb731df29181'>guix: Really export 'define-public'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 3858275962f1ac567b5dce2355035f9eddea0a05, which
didn't have any effect.

* guix.scm: Explicitly use (guix packages) so #:re-export-and-replace
is effective.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-09-14 11:50:58 +0200'>2021-09-14</span></td><td><a href='/guix/commit/guix.scm?id=3858275962f1ac567b5dce2355035f9eddea0a05'>guix: Replace 'define-public'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 8531997d2a1e10d574a6e9ab70bc86ade6af4733.

* guix.scm: Use #:re-export-and-replace for 'define-public'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-06-29 00:00:13 +0200'>2021-06-29</span></td><td><a href='/guix/commit/guix.scm?id=e059adcb6001ab0353d969b24030d0c342f8830e'>(guix) no longer pulls in (guix ftp-client).</a><span class='msg-avail'>...<span class='msg-tooltip'>That choice was made in 2014 and never made much sense.

* guix.scm (%public-modules): Remove 'ftp-client'.
</span></span></td><td>Ludovic Courtès</td></tr>