diff options
| -rw-r--r-- | etc/disarchive-manifest.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/backup.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/package-management.scm | 4 | ||||
| -rw-r--r-- | guix/self.scm | 5 |
4 files changed, 15 insertions, 5 deletions
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 @@ (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)))))) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index f160efd37d..f89f1205fe 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1271,27 +1271,28 @@ backup.") (define-public disarchive (package (name "disarchive") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "https://files.ngyro.com/disarchive/" "disarchive-" version ".tar.gz")) (sha256 (base32 - "16sjplkn9nr7zhfrqll7l1m2b2j4hg8k29p6bqjap9fkj6zpn2q2")))) + "1s4lyhhh1zsaxgn11hy2b1kdvnvpipii68wba0hwr471rd43m08k")))) (build-system gnu-build-system) (native-inputs (list autoconf automake pkg-config guile-3.0 ;for cross-compilation + guile-bzip2 guile-gcrypt guile-lzma guile-quickcheck)) (inputs (list guile-3.0 zlib)) (propagated-inputs - (list guile-gcrypt guile-lzma)) + (list guile-bzip2 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 75c45aaa7d..e5c86da418 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -411,11 +411,12 @@ $(prefix)/etc/openrc\n"))) (ssh (assoc-ref inputs "guile-ssh")) (gnutls (assoc-ref inputs "guile-gnutls")) (disarchive (assoc-ref inputs "disarchive")) + (bzip2 (assoc-ref inputs "guile-bzip2")) (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 lzma)) + disarchive bzip2 lzma)) (deps* (if avahi (cons avahi deps) deps)) (effective (read-line @@ -520,6 +521,7 @@ $(prefix)/etc/openrc\n"))) ("bootstrap/xz" ,(bootstrap-executable "xz" (%current-system))) ("disarchive" ,disarchive) ;for 'guix perform-download' + ("guile-bzip2" ,guile-bzip2) ;for Disarchive ("guile-lzma" ,guile-lzma) ;for Disarchive ("git-minimal" ,git-minimal) ;for 'guix perform-download' diff --git a/guix/self.scm b/guix/self.scm index f378548959..19c6d08e01 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -65,6 +65,7 @@ ("guile-gnutls" . ,(ref 'tls 'guile-gnutls)) ("guix-daemon" . ,(ref 'package-management 'guix-daemon)) ("disarchive" . ,(ref 'backup 'disarchive)) + ("guile-bzip2" . ,(ref 'guile 'guile-bzip2)) ("guile-lzma" . ,(ref 'guile 'guile-lzma)) ("gzip" . ,(ref 'compression 'gzip)) ("bzip2" . ,(ref 'compression 'bzip2)) @@ -827,6 +828,9 @@ itself." (define disarchive (specification->package "disarchive")) + (define guile-bzip2 + (specification->package "guile-bzip2")) + (define guile-lzma (specification->package "guile-lzma")) @@ -1058,6 +1062,7 @@ itself." #:source source #:dependencies (cons* disarchive + guile-bzip2 guile-lzma dependencies) #:guile guile-for-build |