diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-10-09 18:52:37 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-10-09 18:54:12 +0200 |
| commit | b33e191c86b7638517ea838b63a54d031a033554 (patch) | |
| tree | 46c73cb4a9c6f224de06278e02112ba68f6eb2b6 | |
| parent | 64965a068d82d1730097e61f6443a8812051934b (diff) | |
| download | patches-b33e191c86b7638517ea838b63a54d031a033554.tar patches-b33e191c86b7638517ea838b63a54d031a033554.tar.gz | |
guix build: '-f' accepts file-like objects.
* guix/scripts/build.scm (options->things-to-build)[validate-type]:
Check for 'file-like?'.
(options->derivations): Accept 'file-like?'.
* tests/guix-build.sh: Add a test with 'computed-file'.
* doc/guix.texi (Additional Build Options): Mention file-like objects.
| -rw-r--r-- | doc/guix.texi | 5 | ||||
| -rw-r--r-- | guix/scripts/build.scm | 6 | ||||
| -rw-r--r-- | tests/guix-build.sh | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 3c116fc0be..9b37270a83 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6365,9 +6365,8 @@ retrieved using the @option{--log-file} option. @item --file=@var{file} @itemx -f @var{file} - -Build the package or derivation that the code within @var{file} -evaluates to. +Build the package, derivation, or other file-like object that the code within +@var{file} evaluates to (@pxref{G-Expressions, file-like objects}). As an example, @var{file} might contain a package definition like this (@pxref{Defining Packages}): diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 5a6ba62bc3..f3aa5512d5 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -623,7 +623,7 @@ must be one of 'package', 'all', or 'transitive'~%") "Read the arguments from OPTS and return a list of high-level objects to build---packages, gexps, derivations, and so on." (define (validate-type x) - (unless (or (package? x) (derivation? x) (gexp? x) (procedure? x)) + (unless (or (derivation? x) (file-like? x) (gexp? x) (procedure? x)) (leave (G_ "~s: not something we can build~%") x))) (define (ensure-list x) @@ -700,6 +700,10 @@ package '~a' has no source~%") (set-guile-for-build (default-guile)) (proc)) #:system system))) + ((? file-like? obj) + (list (run-with-store store + (lower-object obj system + #:target (assoc-ref opts 'target))))) ((? gexp? gexp) (list (run-with-store store (mbegin %store-monad diff --git a/tests/guix-build.sh b/tests/guix-build.sh index 92e7299321..7842ce87c6 100644 --- a/tests/guix-build.sh +++ b/tests/guix-build.sh @@ -221,6 +221,10 @@ guix build -e "(begin guix build -e '#~(mkdir #$output)' -d guix build -e '#~(mkdir #$output)' -d | grep 'gexp\.drv' +# Same with a file-like object. +guix build -e '(computed-file "foo" #~(mkdir #$output))' -d +guix build -e '(computed-file "foo" #~(mkdir #$output))' -d | grep 'foo\.drv' + # Building from a package file. cat > "$module_dir/package.scm"<<EOF (use-modules (gnu)) |