amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove squashfs-tools-next.

Browse source 
* 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.
This commit is contained in:
Ricardo Wurmus 2019-12-26 12:29:44 +01:00
parent dedc66ef8e
commit 3c45b53ec9
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
3 changed files with 4 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/compression.scm
View file

@ -819,23 +819,6 @@ systems where low overhead is needed. This package allows you to create and
extract such file systems.") extract such file systems.")
(license license:gpl2+))) (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 (define-public pigz
(package (package
(name "pigz") (name "pigz")

4
guix/scripts/pack.scm
View file

@ -319,7 +319,7 @@ to the search paths of PROFILE."
entry-point entry-point
localstatedir? localstatedir?
(symlinks '()) (symlinks '())
(archiver squashfs-tools-next)) (archiver squashfs-tools))
"Return a squashfs image containing a store initialized with the closure of "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 PROFILE, a derivation. The image contains a subset of /gnu/store, empty mount
points for virtual file systems (like procfs), and optional symlinks. points for virtual file systems (like procfs), and optional symlinks.
@ -1045,7 +1045,7 @@ Create a bundle of PACKAGE.\n"))
bootstrap-xz bootstrap-xz
(assoc-ref opts 'compressor))) (assoc-ref opts 'compressor)))
(archiver (if (equal? pack-format 'squashfs) (archiver (if (equal? pack-format 'squashfs)
squashfs-tools-next squashfs-tools
(if bootstrap? (if bootstrap?
%bootstrap-coreutils&co %bootstrap-coreutils&co
tar))) tar)))

4
tests/pack.scm
View file

@ -28,7 +28,7 @@
#:use-module (guix tests) #:use-module (guix tests)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (gnu packages bootstrap) #: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)) #:use-module (srfi srfi-64))
(define %store (define %store
@ -199,7 +199,7 @@
(string-append "." #$profile "/bin")) (string-append "." #$profile "/bin"))
(setenv "PATH" (setenv "PATH"
(string-append #$squashfs-tools-next "/bin")) (string-append #$squashfs-tools "/bin"))
(invoke "unsquashfs" #$image) (invoke "unsquashfs" #$image)
(with-directory-excursion "squashfs-root" (with-directory-excursion "squashfs-root"
(when (and (file-exists? (string-append bin (when (and (file-exists? (string-append bin