diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-07-12 17:43:19 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-07-12 22:47:08 +0200 |
| commit | a769bffb65d6ddfc108a4904641b310029f4924f (patch) | |
| tree | 5688497269e12aa5dbb6de9f896885831e75e844 | |
| parent | e9b046fddaefbb98c931260821399090c221173d (diff) | |
gexp: 'computed-file' no longer has a #:modules parameter.
* guix/gexp.scm (<computed-file>)[modules]: Remove.
(computed-file): Remove #:modules.
(computed-file-compiler): Likewise.
* doc/guix.texi (G-Expressions): Adjust accordingly.
| -rw-r--r-- | doc/guix.texi | 5 | ||||
| -rw-r--r-- | guix/gexp.scm | 15 |
2 files changed, 8 insertions, 12 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 37e854dc59..1a14ff9f0e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3898,10 +3898,9 @@ This is the declarative counterpart of @code{text-file}. @end deffn @deffn {Scheme Procedure} computed-file @var{name} @var{gexp} @ - [#:modules '()] [#:options '(#:local-build? #t)] + [#:options '(#:local-build? #t)] Return an object representing the store item @var{name}, a file or -directory computed by @var{gexp}. @var{modules} specifies the set of -modules visible in the execution context of @var{gexp}. @var{options} +directory computed by @var{gexp}. @var{options} is a list of additional arguments to pass to @code{gexp->derivation}. This is the declarative counterpart of @code{gexp->derivation}. diff --git a/guix/gexp.scm b/guix/gexp.scm index 60f8905ea4..ec4fe0896a 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -50,7 +50,6 @@ computed-file? computed-file-name computed-file-gexp - computed-file-modules computed-file-options program-file @@ -273,30 +272,28 @@ This is the declarative counterpart of 'text-file'." (text-file name content references)))) (define-record-type <computed-file> - (%computed-file name gexp modules options) + (%computed-file name gexp options) computed-file? (name computed-file-name) ;string (gexp computed-file-gexp) ;gexp - (modules computed-file-modules) ;list of module names (options computed-file-options)) ;list of arguments (define* (computed-file name gexp - #:key (modules '()) (options '(#:local-build? #t))) + #:key (options '(#:local-build? #t))) "Return an object representing the store item NAME, a file or directory -computed by GEXP. MODULES specifies the set of modules visible in the -execution context of GEXP. OPTIONS is a list of additional arguments to pass +computed by GEXP. OPTIONS is a list of additional arguments to pass to 'gexp->derivation'. This is the declarative counterpart of 'gexp->derivation'." - (%computed-file name gexp modules options)) + (%computed-file name gexp options)) (define-gexp-compiler (computed-file-compiler (file computed-file?) system target) ;; Compile FILE by returning a derivation whose build expression is its ;; gexp. (match file - (($ <computed-file> name gexp modules options) - (apply gexp->derivation name gexp #:modules modules options)))) + (($ <computed-file> name gexp options) + (apply gexp->derivation name gexp options)))) (define-record-type <program-file> (%program-file name gexp modules guile) |