mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
pack: Add "--derivation".
* guix/scripts/pack.scm (%options, show-help): Add "--derivation". (guix-pack): Honor it. * tests/guix-pack.sh: Test it. * doc/guix.texi (Invoking guix pack): Document it.
This commit is contained in:
parent
59cd751852
commit
a2e661e95f
3 changed files with 24 additions and 5 deletions
|
@ -5253,6 +5253,10 @@ added to it or removed from it after extraction of the pack.
|
|||
One use case for this is the Guix self-contained binary tarball
|
||||
(@pxref{Binary Installation}).
|
||||
|
||||
@item --derivation
|
||||
@itemx -d
|
||||
Print the name of the derivation that builds the pack.
|
||||
|
||||
@item --bootstrap
|
||||
Use the bootstrap binaries to build the pack. This option is only
|
||||
useful to Guix developers.
|
||||
|
|
|
@ -800,6 +800,10 @@ (define %options
|
|||
(option '(#\n "dry-run") #f #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
|
||||
(option '(#\d "derivation") #f #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'derivation-only? #t result)))
|
||||
|
||||
(option '(#\f "format") #t #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'format (string->symbol arg) result)))
|
||||
|
@ -918,6 +922,8 @@ (define (show-help)
|
|||
-r, --root=FILE make FILE a symlink to the result, and register it
|
||||
as a garbage collector root"))
|
||||
(display (G_ "
|
||||
-d, --derivation return the derivation of the pack"))
|
||||
(display (G_ "
|
||||
-v, --verbosity=LEVEL use the given verbosity LEVEL"))
|
||||
(display (G_ "
|
||||
--bootstrap use the bootstrap binaries to build the pack"))
|
||||
|
@ -1002,6 +1008,7 @@ (define properties
|
|||
(assoc-ref opts 'system)
|
||||
#:graft? (assoc-ref opts 'graft?))))
|
||||
(let* ((dry-run? (assoc-ref opts 'dry-run?))
|
||||
(derivation? (assoc-ref opts 'derivation-only?))
|
||||
(relocatable? (assoc-ref opts 'relocatable?))
|
||||
(proot? (eq? relocatable? 'proot))
|
||||
(manifest (let ((manifest (manifest-from-args store opts)))
|
||||
|
@ -1070,11 +1077,15 @@ (define properties
|
|||
#:archiver
|
||||
archiver)))
|
||||
(mbegin %store-monad
|
||||
(munless derivation?
|
||||
(show-what-to-build* (list drv)
|
||||
#:use-substitutes?
|
||||
(assoc-ref opts 'substitutes?)
|
||||
#:dry-run? dry-run?)
|
||||
(munless dry-run?
|
||||
#:dry-run? dry-run?))
|
||||
(mwhen derivation?
|
||||
(return (format #t "~a~%"
|
||||
(derivation-file-name drv))))
|
||||
(munless (or derivation? dry-run?)
|
||||
(built-derivations (list drv))
|
||||
(mwhen gc-root
|
||||
(register-root* (match (derivation->output-paths drv)
|
||||
|
|
|
@ -36,6 +36,10 @@ export GUIX_BUILD_OPTIONS
|
|||
test_directory="`mktemp -d`"
|
||||
trap 'chmod -Rf +w "$test_directory"; rm -rf "$test_directory"' EXIT
|
||||
|
||||
# Compute the derivation of a pack.
|
||||
drv="`guix pack coreutils -d --no-grafts`"
|
||||
guix gc -R "$drv" | grep "`guix build coreutils -d --no-grafts`"
|
||||
|
||||
# Build a tarball with no compression.
|
||||
guix pack --compression=none --bootstrap guile-bootstrap
|
||||
|
||||
|
|
Loading…
Reference in a new issue