[bug#68769] [PATCH 0/2] Update Disarchive to 0.6.0

[Ludovic Courtès]

Hi Timothy,

I thought I had replied but apparently not (?).

Timothy Sample <samplet@ngyro.com> skribis:

> This small series updates Disarchive to 0.6.0, bringing in support for bzip2.
> I would appreciate someone giving it a once over, since the Guix package
> depends on the Disarchive package.  Fortunately, we have the existing XZ
> support, so I just followed that example.  :)
>
> I ran tests and made sure that I could ‘guix pull’ from my checkout.  I even
> tested that Disarchive from the resulting profile could be used on bzip2 and
> XZ files.  I did a similar test of the Guix package.  Everything looks pretty
> good.

This is excellent news!  LGTM!

I applied the patches and built Disarchive + guile-bzip2 on
x86_64-linux.  ‘make as-derivation’ also gives me a valid ‘guix’.
So green lights from me.

One change that’s missing is this, used for
<https://ci.guix.gnu.org/jobset/disarchive>:

diff --git a/etc/disarchive-manifest.scm b/etc/disarchive-manifest.scm
index 41f64eae4f..3dbfa356df 100644
--- a/etc/disarchive-manifest.scm
+++ b/etc/disarchive-manifest.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021-2024 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35,6 +35,8 @@ (define (tarball-origin? origin)
      (and (origin-hash origin)
           (or (string-suffix? ".tar.gz" file)
               (string-suffix? ".tgz" file)
+              (string-suffix? ".tar.bz2" file)
+              (string-suffix? ".tbz2" file)
               (string-suffix? ".tar.xz" file)
               (string-suffix? ".tar" file))))))
 

Go for it!

Ludo’.