diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-12-26 12:29:44 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-12-26 12:29:44 +0100 |
| commit | 3c45b53ec9025f4b95ec003ff99caa3e6fe506ab (patch) | |
| tree | 8ffbfcf6c5c6a1d55af9eea1f48564713eb48b16 /tests/pack.scm | |
| parent | dedc66ef8ecc91fe753f1e6c23102bfa9d79a808 (diff) | |
gnu: Remove squashfs-tools-next.
* 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.
Diffstat (limited to 'tests/pack.scm')
| -rw-r--r-- | tests/pack.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/pack.scm b/tests/pack.scm index 71ff5aec181..0c1406e6874 100644 --- a/tests/pack.scm +++ b/tests/pack.scm | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #:use-module (guix tests) | 28 | #:use-module (guix tests) |
| 29 | #:use-module (guix gexp) | 29 | #:use-module (guix gexp) |
| 30 | #:use-module (gnu packages bootstrap) | 30 | #:use-module (gnu packages bootstrap) |
| 31 | #:use-module ((gnu packages compression) #:select (squashfs-tools-next)) | 31 | #:use-module ((gnu packages compression) #:select (squashfs-tools)) |
| 32 | #:use-module (srfi srfi-64)) | 32 | #:use-module (srfi srfi-64)) |
| 33 | 33 | ||
| 34 | (define %store | 34 | (define %store |
| @@ -199,7 +199,7 @@ | |||
| 199 | (string-append "." #$profile "/bin")) | 199 | (string-append "." #$profile "/bin")) |
| 200 | 200 | ||
| 201 | (setenv "PATH" | 201 | (setenv "PATH" |
| 202 | (string-append #$squashfs-tools-next "/bin")) | 202 | (string-append #$squashfs-tools "/bin")) |
| 203 | (invoke "unsquashfs" #$image) | 203 | (invoke "unsquashfs" #$image) |
| 204 | (with-directory-excursion "squashfs-root" | 204 | (with-directory-excursion "squashfs-root" |
| 205 | (when (and (file-exists? (string-append bin | 205 | (when (and (file-exists? (string-append bin |