[bug#52710] [PATCH 0/2] Update Disarchive

[bug#52710] [PATCH 0/2] Update Disarchive

[Timothy Sample]

Hello,

These two patches update Disarchive to 0.4.0.  This version of Disarchive has
support for XZ, which requires Guile-LZMA.  Since Disarchive is a dependency
of the Guix package, I’m hoping someone else can look over the patches before
I push them.

I made sure to check the following things:

  • Building the Guix package
  • Running ‘guix pull’
  • Recovering a GZip-compressed tarball from Guix
  • Recovering a XZ-compressed tarball from Guix
  • Cross-compiling Guile-LZMA, Disarchive, and Guix itself
  • Running Guix from a cross-built Hurd image

I couldn’t use Disarchive recovery from the Hurd, but I’m inclined to
assume that it’s not a regression [1].  Other than that, everything seemed
okay to me.

If you want to test recovering an XZ source, you can use (amusingly)
the ‘gzip’ package source code (as of writing it’s the only XZ spec
available).  You need to run the Guix daemon in an environment that
provides the new Disarchive and Guile-LZMA (I used ‘./pre-inst-env
guix shell -D guix’).  Then, you can run

  $ GUIX_DOWNLOAD_FALLBACK_TEST=disarchive-mirrors \
        ./pre-inst-env guix build --check -S gzip

Thanks in advance!

[1]: AFAICS, it fails when the SWH downloader tries to pipe the tarball
it’s downloading into ‘tar’ to extract it.


-- Tim

[bug#52710] [PATCH 1/2] gnu: Add guile-lzma.

[Timothy Sample]

* gnu/packages/guile.scm (guile-lzma): New variable.
---
 gnu/packages/guile.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 28887dd69f..25c2029dfc 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2019 Taylan Kammer <taylan.kammer@gmail.com>
 ;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2021 Timothy Sample <samplet@ngyro.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -904,4 +905,34 @@ (define-public guile-zstd
 compression library.")
     (license license:gpl3+)))
 
+(define-public guile-lzma
+  (package
+    (name "guile-lzma")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://files.ngyro.com/guile-lzma/guile-lzma-"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "1f7pd3frckpwsi5p0bln4wf8xy41x0szlpy273phjdmjacw69hzb"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("guile" ,guile-3.0)
+       ("guile-bytestructures" ,guile-bytestructures)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("guile" ,guile-3.0)
+       ("xz" ,xz)))
+    (propagated-inputs
+     `(("guile-bytestructures" ,guile-bytestructures)))
+    (home-page "https://ngyro.com/software/guile-lzma.html")
+    (synopsis "Guile bindings for liblzma (XZ)")
+    (description "Guile-LZMA is a Guile wrapper for the liblzma (XZ)
+library.  It exposes an interface similar to other Guile compression
+libraries, like Guile-zlib.")
+    (license license:gpl3+)))
+
 ;;; guile.scm ends here
-- 
2.34.0

[bug#52710] [PATCH 2/2] gnu: disarchive: Update to 0.4.0.

[Timothy Sample]

* gnu/packages/backup.scm (disarchive)[source]: Update to 0.4.0.
[native-inputs, inputs]: Add guile-lzma.
* gnu/packages/package-management.scm (guix)[arguments]: Include
guile-lzma in the 'wrap-program' phase.
[inputs]: Add guile-lzma.
---
 gnu/packages/backup.scm             | 7 ++++---
 gnu/packages/package-management.scm | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index fdb84898bb..32e0532c46 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1109,14 +1109,14 @@ (define-public burp
 (define-public disarchive
   (package
     (name "disarchive")
-    (version "0.3.0")
+    (version "0.4.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://files.ngyro.com/disarchive/"
                                   "disarchive-" version ".tar.gz"))
               (sha256
                (base32
-                "0jgc53rrbas8i4z13l2ii99cpav1ma73spsjg70ygihf0635r3dh"))))
+                "1pql8cspsxyx8cpw3xyhirnisv6rb4vj5mxr1d7w9la72q740n8s"))))
     (build-system gnu-build-system)
     (native-inputs
      (list autoconf
@@ -1124,11 +1124,12 @@ (define-public disarchive
            pkg-config
            guile-3.0 ;for cross-compilation
            guile-gcrypt
+           guile-lzma
            guile-quickcheck))
     (inputs
      (list guile-3.0 zlib))
     (propagated-inputs
-     (list guile-gcrypt))
+     (list guile-gcrypt guile-lzma))
     (home-page "https://ngyro.com/software/disarchive.html")
     (synopsis "Software archive disassembler")
     (description "Disarchive can disassemble software archives into data
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 12736c6caf..cdf0c17598 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -328,10 +328,11 @@ (define-public guix
                                (ssh    (assoc-ref inputs "guile-ssh"))
                                (gnutls (assoc-ref inputs "gnutls"))
                                (disarchive (assoc-ref inputs "disarchive"))
+                               (lzma (assoc-ref inputs "guile-lzma"))
                                (locales (assoc-ref inputs "glibc-utf8-locales"))
                                (deps   (list gcrypt json sqlite gnutls git
                                              bs ssh zlib lzlib zstd guile-lib
-                                             disarchive))
+                                             disarchive lzma))
                                (deps*  (if avahi (cons avahi deps) deps))
                                (effective
                                 (read-line
@@ -434,6 +435,7 @@ (define-public guix
          ("bootstrap/xz" ,(bootstrap-executable "xz" (%current-system)))
 
          ("disarchive" ,disarchive)               ;for 'guix perform-download'
+         ("guile-lzma" ,guile-lzma)               ;for Disarchive
 
          ("glibc-utf8-locales" ,glibc-utf8-locales)))
       (propagated-inputs
-- 
2.34.0

[bug#52710] [PATCH 0/2] Update Disarchive

[Mathieu Othacehe]

Hello Timothy,

> +    (native-inputs
> +     `(("autoconf" ,autoconf)
> +       ("automake" ,automake)
> +       ("guile" ,guile-3.0)
> +       ("guile-bytestructures" ,guile-bytestructures)
> +       ("pkg-config" ,pkg-config)))
> +    (inputs
> +     `(("guile" ,guile-3.0)
> +       ("xz" ,xz)))
> +    (propagated-inputs
> +     `(("guile-bytestructures" ,guile-bytestructures)))

You should update those to fit the new style.

Otherwise looks fine!

Thanks,

Mathieu

bug#52710: [PATCH 0/2] Update Disarchive

[Timothy Sample]

Hi Mathieu,

Mathieu Othacehe <othacehe@gnu.org> writes:

> Hello Timothy,
>
>> +    (native-inputs
>> +     `(("autoconf" ,autoconf)
>> +       ("automake" ,automake)
>> +       ("guile" ,guile-3.0)
>> +       ("guile-bytestructures" ,guile-bytestructures)
>> +       ("pkg-config" ,pkg-config)))
>> +    (inputs
>> +     `(("guile" ,guile-3.0)
>> +       ("xz" ,xz)))
>> +    (propagated-inputs
>> +     `(("guile-bytestructures" ,guile-bytestructures)))
>
> You should update those to fit the new style.

Of course!  Old habits....  :)

> Otherwise looks fine!
>
> Thanks,

Pushed.  Thank you!


-- Tim