futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gexp: 'computed-file' no longer has a #:modules parameter.

Browse Source 
* guix/gexp.scm (<computed-file>)[modules]: Remove.
(computed-file): Remove #:modules.
(computed-file-compiler): Likewise.
* doc/guix.texi (G-Expressions): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2016-07-12 17:43:19 +02:00
parent e9b046fdda
commit a769bffb65
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/guix.texi
View File

@ -3898,10 +3898,9 @@ This is the declarative counterpart of @code{text-file}.
@end deffn @end deffn
@deffn {Scheme Procedure} computed-file @var{name} @var{gexp} @ @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 Return an object representing the store item @var{name}, a file or
directory computed by @var{gexp}. @var{modules} specifies the set of directory computed by @var{gexp}. @var{options}
modules visible in the execution context of @var{gexp}. @var{options}
is a list of additional arguments to pass to @code{gexp->derivation}. is a list of additional arguments to pass to @code{gexp->derivation}.
This is the declarative counterpart of @code{gexp->derivation}. This is the declarative counterpart of @code{gexp->derivation}.

15
guix/gexp.scm
View File

@ -50,7 +50,6 @@
computed-file? computed-file?
computed-file-name computed-file-name
computed-file-gexp computed-file-gexp
computed-file-modules
computed-file-options computed-file-options
program-file program-file
@ -273,30 +272,28 @@ This is the declarative counterpart of 'text-file'."
(text-file name content references)))) (text-file name content references))))
(define-record-type <computed-file> (define-record-type <computed-file>
(%computed-file name gexp modules options) (%computed-file name gexp options)
computed-file? computed-file?
(name computed-file-name) ;string (name computed-file-name) ;string
(gexp computed-file-gexp) ;gexp (gexp computed-file-gexp) ;gexp
(modules computed-file-modules) ;list of module names
(options computed-file-options)) ;list of arguments (options computed-file-options)) ;list of arguments
(define* (computed-file name gexp (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 "Return an object representing the store item NAME, a file or directory
computed by GEXP. MODULES specifies the set of modules visible in the computed by GEXP. OPTIONS is a list of additional arguments to pass
execution context of GEXP. OPTIONS is a list of additional arguments to pass
to 'gexp->derivation'. to 'gexp->derivation'.
This is the declarative counterpart of '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?) (define-gexp-compiler (computed-file-compiler (file computed-file?)
system target) system target)
;; Compile FILE by returning a derivation whose build expression is its ;; Compile FILE by returning a derivation whose build expression is its
;; gexp. ;; gexp.
(match file (match file
(($ <computed-file> name gexp modules options) (($ <computed-file> name gexp options)
(apply gexp->derivation name gexp #:modules modules options)))) (apply gexp->derivation name gexp options))))
(define-record-type <program-file> (define-record-type <program-file>
(%program-file name gexp modules guile) (%program-file name gexp modules guile)