nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pack: Rename "tar" to "archiver". 

* guix/scripts/pack.scm (self-contained-tarball, docker-image): Accept
"archiver" argument; remove "tar" argument.
(guix-pack): Invoke "build-image" with "archiver" argument.
This commit is contained in:
Ricardo Wurmus 2018-05-25 16:22:30 +02:00 committed by Ricardo Wurmus
parent 3ec07ced8a
commit 5ffac538aa
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
guix/scripts/pack.scm
View File

@ -93,7 +93,7 @@ found."
(compressor (first %compressors)) (compressor (first %compressors))
localstatedir? localstatedir?
(symlinks '()) (symlinks '())
(tar tar)) (archiver tar))
"Return a self-contained tarball containing a store initialized with the "Return a self-contained tarball containing a store initialized with the
closure of PROFILE, a derivation. The tarball contains /gnu/store; if closure of PROFILE, a derivation. The tarball contains /gnu/store; if
LOCALSTATEDIR? is true, it also contains /var/guix, including /var/guix/db LOCALSTATEDIR? is true, it also contains /var/guix, including /var/guix/db
@ -142,7 +142,7 @@ added to the pack."
;; 2014-07-28. For testing, we use the bootstrap tar, which is ;; 2014-07-28. For testing, we use the bootstrap tar, which is
;; older and doesn't support it. ;; older and doesn't support it.
(define tar-supports-sort? (define tar-supports-sort?
(zero? (system* (string-append #+tar "/bin/tar") (zero? (system* (string-append #+archiver "/bin/tar")
"cf" "/dev/null" "--files-from=/dev/null" "cf" "/dev/null" "--files-from=/dev/null"
"--sort=name"))) "--sort=name")))
@ -151,7 +151,7 @@ added to the pack."
(string-append #$(if localstatedir? (string-append #$(if localstatedir?
(file-append guix "/sbin:") (file-append guix "/sbin:")
"") "")
#$tar "/bin")) #$archiver "/bin"))
;; Note: there is not much to gain here with deduplication and there ;; Note: there is not much to gain here with deduplication and there
;; is the overhead of the '.links' directory, so turn it off. ;; is the overhead of the '.links' directory, so turn it off.
@ -220,7 +220,7 @@ added to the pack."
(compressor (first %compressors)) (compressor (first %compressors))
localstatedir? localstatedir?
(symlinks '()) (symlinks '())
(tar tar)) (archiver tar))
"Return a derivation to construct a Docker image of PROFILE. The "Return a derivation to construct a Docker image of PROFILE. The
image is a tarball conforming to the Docker Image Specification, compressed image is a tarball conforming to the Docker Image Specification, compressed
with COMPRESSOR. It can be passed to 'docker load'. If TARGET is true, it with COMPRESSOR. It can be passed to 'docker load'. If TARGET is true, it
@ -268,7 +268,7 @@ the image."
(use-modules (guix docker) (srfi srfi-19) (guix build store-copy)) (use-modules (guix docker) (srfi srfi-19) (guix build store-copy))
(setenv "PATH" (string-append #$tar "/bin")) (setenv "PATH" (string-append #$archiver "/bin"))
(build-docker-image #$output (build-docker-image #$output
(call-with-input-file "profile" (call-with-input-file "profile"
@ -626,7 +626,7 @@ Create a bundle of PACKAGE.\n"))
(compressor (if bootstrap? (compressor (if bootstrap?
bootstrap-xz bootstrap-xz
(assoc-ref opts 'compressor))) (assoc-ref opts 'compressor)))
(tar (if bootstrap? (archiver (if bootstrap?
%bootstrap-coreutils&co %bootstrap-coreutils&co
tar)) tar))
(symlinks (assoc-ref opts 'symlinks)) (symlinks (assoc-ref opts 'symlinks))
@ -654,8 +654,8 @@ Create a bundle of PACKAGE.\n"))
symlinks symlinks
#:localstatedir? #:localstatedir?
localstatedir? localstatedir?
#:tar #:archiver
tar))) archiver)))
(mbegin %store-monad (mbegin %store-monad
(show-what-to-build* (list drv) (show-what-to-build* (list drv)
#:use-substitutes? #:use-substitutes?