* gnu/packages/compression.scm (squashfs-tools-next): Remove variable.
* guix/scripts/pack.scm (squashfs-image, guix-pack): Use squashfs-tools.
* tests/pack.scm: Use squashfs-tools.
extract such file systems.")
(license license:gpl2+)))
-;; We need this for building squashfs images with symlinks.
-(define-public squashfs-tools-next
- (let ((commit "fb33dfc32b131a1162dcf0e35bd88254ae10e265")
- (revision "1"))
- (package (inherit squashfs-tools)
- (name "squashfs-tools-next")
- (version (string-append "4.3-" revision (string-take commit 7)))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/plougher/squashfs-tools.git")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1x2skf8hxzfch978nzx5mh46d4hhi6gl22270hiarjszsjk3bnsx")))))))
-
(define-public pigz
(package
(name "pigz")
entry-point
localstatedir?
(symlinks '())
- (archiver squashfs-tools-next))
+ (archiver squashfs-tools))
"Return a squashfs image containing a store initialized with the closure of
PROFILE, a derivation. The image contains a subset of /gnu/store, empty mount
points for virtual file systems (like procfs), and optional symlinks.
bootstrap-xz
(assoc-ref opts 'compressor)))
(archiver (if (equal? pack-format 'squashfs)
- squashfs-tools-next
+ squashfs-tools
(if bootstrap?
%bootstrap-coreutils&co
tar)))
#:use-module (guix tests)
#:use-module (guix gexp)
#:use-module (gnu packages bootstrap)
- #:use-module ((gnu packages compression) #:select (squashfs-tools-next))
+ #:use-module ((gnu packages compression) #:select (squashfs-tools))
#:use-module (srfi srfi-64))
(define %store
(string-append "." #$profile "/bin"))
(setenv "PATH"
- (string-append #$squashfs-tools-next "/bin"))
+ (string-append #$squashfs-tools "/bin"))
(invoke "unsquashfs" #$image)
(with-directory-excursion "squashfs-root"
(when (and (file-exists? (string-append bin