From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Vagrant Cascadian <vagrant@reproducible-builds.org>
Cc: 60941@debbugs.gnu.org
Subject: [bug#60941] Update diffoscope to 232
Date: Wed, 18 Jan 2023 20:48:22 -0500 [thread overview]
Message-ID: <87lelze1ll.fsf_-_@gmail.com> (raw)
In-Reply-To: <87a62fz4lj.fsf@contorta> (Vagrant Cascadian's message of "Wed, 18 Jan 2023 17:38:00 -0800")
Hi,
Vagrant Cascadian <vagrant@reproducible-builds.org> writes:
> From 784d33dad1ff114e4f8043b7b766c785e7fef79f Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian <vagrant@reproducible-builds.org>
> 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
next prev parent reply other threads:[~2023-01-19 1:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 1:31 [bug#60941] Update diffoscope to 232 Vagrant Cascadian
[not found] ` <handler.60941.B.16740919305557.ack@debbugs.gnu.org>
2023-01-19 1:36 ` [bug#60941] [PATCH 1/2] gnu: Add python-pypdf Vagrant Cascadian
2023-01-19 1:38 ` [bug#60941] [PATCH 2/2] gnu: diffoscope: Update to 232 Vagrant Cascadian
2023-01-19 1:48 ` Maxim Cournoyer [this message]
2023-01-22 3:26 ` [bug#60941] Update diffoscope " Vagrant Cascadian
2023-01-23 1:04 ` Maxim Cournoyer
2023-01-22 3:32 ` [bug#60941] [PATCH v2 2/2] gnu: diffoscope: Update to 233 Vagrant Cascadian
2023-01-19 1:42 ` [bug#60941] [PATCH 1/2] gnu: Add python-pypdf Maxim Cournoyer
2023-01-22 3:30 ` [bug#60941] [PATCH v2 " Vagrant Cascadian
2023-01-22 7:03 ` [bug#60941] [PATCH v3 " Vagrant Cascadian
2023-01-22 7:06 ` [bug#60941] [PATCH v3 2/2] gnu: diffoscope: Update to 233 Vagrant Cascadian
2023-01-23 1:07 ` bug#60941: " Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lelze1ll.fsf_-_@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=60941@debbugs.gnu.org \
--cc=vagrant@reproducible-builds.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).