[PATCH] gnu: diffoscope: Update to 263.

  • Done
  • quality assurance status badge
Details
3 participants
  • Christopher Baines
  • Vagrant Cascadian
  • Wilko Meyer
Owner
unassigned
Submitted by
Wilko Meyer
Severity
normal
W
W
Wilko Meyer wrote on 9 Apr 00:27 +0200
(address . guix-patches@gnu.org)(name . Wilko Meyer)(address . w@wmeyer.eu)
625bdf88fb1069252ffde40f3cceb1c9d7ce193f.1712615253.git.w@wmeyer.eu
* gnu/packages/diffoscope.scm (diffoscope): Update to 263.

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

Toggle diff (26 lines)
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
V
V
Vagrant Cascadian wrote on 9 Apr 18:36 +0200
(name . Christopher Baines)(address . mail@cbaines.net)
87le5m4ho3.fsf@wireframe
On 2024-04-09, Wilko Meyer wrote:
Toggle quote (2 lines)
> * 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

Toggle quote (31 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZhVujAAKCRDcUY/If5cW
qlSPAQCP1Xy0S0OKBkECtr7QksFywEzCztBlMHbemk9O7vz1NgEAwv2EeTUhRDH2
P5CYeEgs1wtFMp4w/hTlrOVVHQrMLgo=
=Q7fu
-----END PGP SIGNATURE-----

V
V
Vagrant Cascadian wrote on 9 Apr 19:40 +0200
(name . Christopher Baines)(address . mail@cbaines.net)
87il0q4eq4.fsf@wireframe
On 2024-04-09, Vagrant Cascadian wrote:
Toggle quote (9 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZhV9cwAKCRDcUY/If5cW
qg4QAQDOSHNN7my0uzayQHzrgeWK+NPHE5OwbMYF/5qLxuBxDAEA/0tmBW/R0KAc
FNJ3D8dWXBgfHm8x8A7ceJBDdvotrQ0=
=UJx7
-----END PGP SIGNATURE-----

C
C
Christopher Baines wrote on 9 Apr 19:49 +0200
(name . Wilko Meyer)(address . w@wmeyer.eu)
87r0febf44.fsf@cbaines.net
Wilko Meyer <w@wmeyer.eu> writes:

Toggle quote (7 lines)
> * 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
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYVf7tfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XfzDg//WmJi8bUG9oF7jLead8yw6HmwtsaB+R99
Otm2m9g15Sh+BVwrTXsisLQQtKixThvktM4mxuSZfVCBhpoIrPmHg+CdEjAjA3qj
M/BAfeVcuyWQ9kjWRB4tLAF2mP6yvnNrb2ZeNPtjrsfkEt41NiGEqLne4L1N8VqF
Sm3mLDU3RbnCNCf1L+a3NoCy8nuW8fPdRlmtGl9N+wAEQ4ekm5qQ/2p6mZ+i707G
DvaYvmD9RxLHOq8JQICfIuH8n2/nX1xeFJTsJlAI5dwFIVGdM1pYiYoqmEl6GeiR
vGBPLOBwqleNTOhaaNho1si3YsC6jETGxrTt/Oez8yettqImrlhrCRaCE7poPEb7
xJPi5ZlArkrSQWq14Ra2cQEX1cuapqXLp5elt34JNhda7L56j4dMpZO6nYVf5TKk
g6DNe4IzzZdJyAmQbRg0Na/G70lvRI5ZDywXeostifwIWRYyR/QyUWZkvAmJypa+
0GvIpxVn8/cxXi3Pfh/HVfhaUyPnAhfkLASFjC0SwyRhvhFt7m+mNu5bgHOaXuEt
cpTjB0HtkW9YdV6CTpgXN0Vvt5+FjjrGRQ0K1FkUuaEKBLMPO3TYtIU7fPmHP8ov
m4KJtoP+7CtScG2BhZsXseTG9LosRylzhXLU14lzbv7BjuBuv14z5weB5hJ3b5CY
h2JLqgiAJtk=
=A6xx
-----END PGP SIGNATURE-----

Closed
C
C
Christopher Baines wrote on 9 Apr 20:03 +0200
(name . Vagrant Cascadian)(address . vagrant@reproducible-builds.org)
87il0qbegl.fsf@cbaines.net
Vagrant Cascadian <vagrant@reproducible-builds.org> writes:

Toggle quote (20 lines)
> 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.
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYVgwpfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XdEtA/+NUMd+2QGreA3jDfiDPD6OVlQDp0XPnOq
eaIAtBmaMpQFezshv5zVcg+0k8COKU5iaLabTqvxd313A31fmD66thE324hoQPGG
RcSH/MkG7Qdfy0pR4Zq1iGmFPXR3Ll/7gJP/YdvlKxeMaIfcHENmLgcs49SQqRu2
JMeUuppqZDXHv98AYu/gY/1RZBXPHf2hL6m3iOGcTTbvAQOI6T0DA6KqU3Dg72Np
fE5fY7ydeYmFz1FEEnQROHuvxSrDfup61yT9Hum5ALfZrdG9/R0VACC/uY5KwqQt
J9AjNq7L0DVODUOU708irhAUFhXwFpynKIxhiNbe+RNKruGNAXrHL+drAYI2IBjj
KB6+TFyGXj+3Z4RWTvl840L3HyqDA8QX13RzigxUHyxurJfyrBIeiyrIE+VZmETV
OJQR8NfZXLUHyMrLbDOreYhdelnIPP79XUytMoW3n3liwVS3pCKarE2/rmQ9Xqse
yjOWtWm4MMEtxoLKZlgwpaIwcybOlgXtQtgHyovAwT5AwhFT1w0+vP6Jjw0v8tgU
FeM4obwymaLeC/vyrV4ke2N+iJQMafq1JSLpPXWWeCoELqG4qqBkaoKQElZstmKE
AlYOIiZgiBSLClYD81GmaLjFeQSUN5+iPL+jtDBalfYkOLHf5o57qQnfQv7PPuUQ
mbcyw3dsY4E=
=E4Nr
-----END PGP SIGNATURE-----

V
V
Vagrant Cascadian wrote on 9 Apr 20:32 +0200
(name . Christopher Baines)(address . mail@cbaines.net)
87a5m24c9x.fsf@wireframe
On 2024-04-09, Christopher Baines wrote:
Toggle quote (22 lines)
> Vagrant Cascadian <vagrant@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:


644 passed, 66 skipped

:)

Toggle quote (3 lines)
> 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:


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


live well,
vagrant
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZhWJ2gAKCRDcUY/If5cW
qi7EAP4xdNtpLzC+N9xtIicehjwpFSb2radc8+pvalKf+Ov7CQD9FsXys6OprqKv
8FP61ofo5oKTGjpzrw/wbtqRQj0jKA4=
=njRi
-----END PGP SIGNATURE-----

V
V
Vagrant Cascadian wrote on 10 Apr 22:50 +0200
(name . Christopher Baines)(address . mail@cbaines.net)
871q7d3ptd.fsf@wireframe
On 2024-04-09, Vagrant Cascadian wrote:
Toggle quote (29 lines)
> On 2024-04-09, Christopher Baines wrote:
>> Vagrant Cascadian <vagrant@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.
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZhb7jgAKCRDcUY/If5cW
qpQiAP41T1tgFRXN7V0h51TPPnZtcRrLzJN6Ke/JtILzZM2VngEA60g7ldwuFCEs
khg/Pko26KY4iaAOhbOCgg1kGEbozQI=
=4YRQ
-----END PGP SIGNATURE-----

?
Your comment

This issue is archived.

To comment on this conversation send an email to 70293@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70293
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch