GNU bug report logs - #70293
[PATCH] gnu: diffoscope: Update to 263.

Previous Next

To reply to this bug, email your comments to 70293 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Wilko Meyer <w <at> wmeyer.eu>
To: guix-patches <at> gnu.org
Cc: Wilko Meyer <w <at> wmeyer.eu>
Subject: [PATCH] gnu: diffoscope: Update to 263.
Date: Tue,  9 Apr 2024 00:27:34 +0200

* gnu/packages/diffoscope.scm (diffoscope): Update to 263.

Change-Id: I8c9fce87dcf78fbc0f5ed319fa9e8b6d2e37fee1
---
 gnu/packages/diffoscope.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 5bbb4f51e2..bceb465d5b 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -74,7 +74,7 @@ (define-module (gnu packages diffoscope)
 (define-public diffoscope
   (package
     (name "diffoscope")
-    (version "261")
+    (version "263")
     (source
      (origin
        (method git-fetch)
@@ -83,7 +83,7 @@ (define-public diffoscope
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0v56i2wyc4p843crl5b5w6j1awhp1a6xbfb92hm0pp8558f1h76i"))))
+        (base32 "1bq45gyn214hf9brnn5xlj9xvcg6p0yr8cc2p153f93pgzsyqlg4"))))
     (build-system python-build-system)
     (arguments
      (list

base-commit: 3571e4752501fb0f7da7785a3834009f522eb24c
-- 
2.41.0

Message #8 received at 70293 <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: Wilko Meyer <w <at> wmeyer.eu>, 70293 <at> debbugs.gnu.org
Cc: Christopher Baines <mail <at> cbaines.net>
Subject: Re: [bug#70293] [PATCH] gnu: diffoscope: Update to 263.
Date: Tue, 09 Apr 2024 09:36:28 -0700

[Message part 1 (text/plain, inline)]

On 2024-04-09, Wilko Meyer wrote:
> * gnu/packages/diffoscope.scm (diffoscope): Update to 263.

Thanks for the update!

Not a *huge* deal, but this version should have perl added to native
inputs, as some tests now use "zipdetails" from perl, and are skipped if
it is not present. Or does something else pull in perl?

In general, checking the diff between the old diffoscope version and the
new version would reveal things like this, e.g. in tests/ you might look
for things like:

  -@skip_unless_tools_exist("zipinfo")
  +@skip_unless_tools_exist("zipinfo", "zipdetails")

Also, strange as it may sound, reading debian/changelog might also hint
at changes like this (which would be included in the diff between
versions)!


live well,
  vagrant

> Change-Id: I8c9fce87dcf78fbc0f5ed319fa9e8b6d2e37fee1
> ---
>  gnu/packages/diffoscope.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
> index 5bbb4f51e2..bceb465d5b 100644
> --- a/gnu/packages/diffoscope.scm
> +++ b/gnu/packages/diffoscope.scm
> @@ -74,7 +74,7 @@ (define-module (gnu packages diffoscope)
>  (define-public diffoscope
>    (package
>      (name "diffoscope")
> -    (version "261")
> +    (version "263")
>      (source
>       (origin
>         (method git-fetch)
> @@ -83,7 +83,7 @@ (define-public diffoscope
>               (commit version)))
>         (file-name (git-file-name name version))
>         (sha256
> -        (base32 "0v56i2wyc4p843crl5b5w6j1awhp1a6xbfb92hm0pp8558f1h76i"))))
> +        (base32 "1bq45gyn214hf9brnn5xlj9xvcg6p0yr8cc2p153f93pgzsyqlg4"))))
>      (build-system python-build-system)
>      (arguments
>       (list
>
> base-commit: 3571e4752501fb0f7da7785a3834009f522eb24c
> -- 
> 2.41.0

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 70293 <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: Wilko Meyer <w <at> wmeyer.eu>, 70293 <at> debbugs.gnu.org
Cc: Christopher Baines <mail <at> cbaines.net>
Subject: Re: [bug#70293] [PATCH] gnu: diffoscope: Update to 263.
Date: Tue, 09 Apr 2024 10:40:03 -0700

[Message part 1 (text/plain, inline)]

On 2024-04-09, Vagrant Cascadian wrote:
> On 2024-04-09, Wilko Meyer wrote:
>> * gnu/packages/diffoscope.scm (diffoscope): Update to 263.
>
> Thanks for the update!
>
> Not a *huge* deal, but this version should have perl added to native
> inputs, as some tests now use "zipdetails" from perl, and are skipped if
> it is not present. Or does something else pull in perl?

For a build without perl, the test coverage is:

  638 passed, 72 skipped

With perl added to native-inputs:

  644 passed, 66 skipped

That seems like a nice improvement. :)


live well,
  vagrant

[signature.asc (application/pgp-signature, inline)]

Message #16 received at 70293-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Wilko Meyer <w <at> wmeyer.eu>
Cc: Vagrant Cascadian <vagrant <at> reproducible-builds.org>,
 70293-done <at> debbugs.gnu.org
Subject: Re: [bug#70293] [PATCH] gnu: diffoscope: Update to 263.
Date: Tue, 09 Apr 2024 18:49:47 +0100

[Message part 1 (text/plain, inline)]

Wilko Meyer <w <at> wmeyer.eu> writes:

> * gnu/packages/diffoscope.scm (diffoscope): Update to 263.
>
> Change-Id: I8c9fce87dcf78fbc0f5ed319fa9e8b6d2e37fee1
> ---
>  gnu/packages/diffoscope.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Thanks, I've pushed this to master as
ff5ef67110b6b4cf9dd165876ed53ece5b8514a7.

Chris

[signature.asc (application/pgp-signature, inline)]

Message #19 received at 70293 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
Cc: Wilko Meyer <w <at> wmeyer.eu>, 70293 <at> debbugs.gnu.org
Subject: Re: [bug#70293] [PATCH] gnu: diffoscope: Update to 263.
Date: Tue, 09 Apr 2024 19:03:54 +0100

[Message part 1 (text/plain, inline)]

Vagrant Cascadian <vagrant <at> reproducible-builds.org> writes:

> On 2024-04-09, Vagrant Cascadian wrote:
>> On 2024-04-09, Wilko Meyer wrote:
>>> * gnu/packages/diffoscope.scm (diffoscope): Update to 263.
>>
>> Thanks for the update!
>>
>> Not a *huge* deal, but this version should have perl added to native
>> inputs, as some tests now use "zipdetails" from perl, and are skipped if
>> it is not present. Or does something else pull in perl?
>
> For a build without perl, the test coverage is:
>
>   638 passed, 72 skipped
>
> With perl added to native-inputs:
>
>   644 passed, 66 skipped
>
> That seems like a nice improvement. :)

Cool, I think it would be useful if we could get the test suite to log
more as well, since 66 is still quite a few tests.

[signature.asc (application/pgp-signature, inline)]

Message #22 received at 70293 <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: Christopher Baines <mail <at> cbaines.net>
Subject: Re: [bug#70293] [PATCH] gnu: diffoscope: Update to 263.
Date: Tue, 09 Apr 2024 11:32:58 -0700

[Message part 1 (text/plain, inline)]

On 2024-04-09, Christopher Baines wrote:
> Vagrant Cascadian <vagrant <at> reproducible-builds.org> writes:
>
>> On 2024-04-09, Vagrant Cascadian wrote:
>>> On 2024-04-09, Wilko Meyer wrote:
>>>> * gnu/packages/diffoscope.scm (diffoscope): Update to 263.
>>>
>>> Thanks for the update!
>>>
>>> Not a *huge* deal, but this version should have perl added to native
>>> inputs, as some tests now use "zipdetails" from perl, and are skipped if
>>> it is not present. Or does something else pull in perl?
>>
>> For a build without perl, the test coverage is:
>>
>>   638 passed, 72 skipped
>>
>> With perl added to native-inputs:
>>
>>   644 passed, 66 skipped
>>
>> That seems like a nice improvement. :)

Or at least, not a regression from diffoscope 261:

  https://ci.guix.gnu.org/build/3903616/log/raw

  644 passed, 66 skipped

:)

> Cool, I think it would be useful if we could get the test suite to log
> more as well, since 66 is still quite a few tests.

You mean log why something was skipped? Yeah, that would be
nice... maybe cranking up the verbosity on the tests suites would help,
if it doesn't generate too much noise.


For the most part there are a few things not yet packaged for guix. I
sometimes use this to hunt for additional things in need of packaging:

  guix shell --pure diffoscope $(guix shell --pure diffoscope  -- diffoscope --list-missing | awk -F packages: '/Guix/{print $2}' | tr -d , | tr ' ' '\n' | sed -e '/^$/d') python-argcomplete python-androguard python-defusedxml python-jsondiff  -- diffoscope --list-missing

Which currently outputs:

  Available-in-Arch Linux-packages: mono
  Available-in-Debian-packages: aapt, apksigcopier, apksigner, apktool, coreboot-utils, dexdump, fontforge-extras, mono-utils, oggvideotools, perl, procyon-decompiler, xmlbeans
  Available-in-FreeBSD-packages: mono
  Available-in-GNU Guix-packages:
  External-Tools-Required: aapt2, apksigcopier, apksigner, apktool, cbfstool, dexdump, dumpxsb, lipo, oggDump, otool, pedump, procyon, showttf, zipdetails
  Missing-Python-Modules: guestfs, r2pipe


Notably, I just added the mapping to get zipdetails for guix:

  https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/90dd18830d9330c8fb8f87dd2ca50972574b6926

In the past I have sometimes temporarily monkey-patched such updates
until it lands in a new upstream version.


live well,
  vagrant

[signature.asc (application/pgp-signature, inline)]

Message #25 received at 70293 <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: Christopher Baines <mail <at> cbaines.net>
Cc: Wilko Meyer <w <at> wmeyer.eu>, 70293 <at> debbugs.gnu.org
Subject: Re: [bug#70293] [PATCH] gnu: diffoscope: Update to 263.
Date: Wed, 10 Apr 2024 13:50:22 -0700

[Message part 1 (text/plain, inline)]

On 2024-04-09, Vagrant Cascadian wrote:
> On 2024-04-09, Christopher Baines wrote:
>> Vagrant Cascadian <vagrant <at> reproducible-builds.org> writes:
>>
>>> On 2024-04-09, Vagrant Cascadian wrote:
>>>> On 2024-04-09, Wilko Meyer wrote:
>>>>> * gnu/packages/diffoscope.scm (diffoscope): Update to 263.
>>>>
>>>> Thanks for the update!
>>>>
>>>> Not a *huge* deal, but this version should have perl added to native
>>>> inputs, as some tests now use "zipdetails" from perl, and are skipped if
>>>> it is not present. Or does something else pull in perl?
>>>
>>> For a build without perl, the test coverage is:
>>>
>>>   638 passed, 72 skipped
>>>
>>> With perl added to native-inputs:
>>>
>>>   644 passed, 66 skipped
>>>
>>> That seems like a nice improvement. :)
>
> Or at least, not a regression from diffoscope 261:
>
>   https://ci.guix.gnu.org/build/3903616/log/raw
>
>   644 passed, 66 skipped

I pushed a fix for this regression as
c1c9d6b3cdf5955f1bf5fded2a0c496ce2e631f1.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.