diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-21 23:48:56 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-21 23:49:53 +0100 |
| commit | 2096ef47aad57a9988c8fdfaa46a70770a0e0b12 (patch) | |
| tree | df34acabcf3170fcfbf0f40ba8367d0ee31b2117 | |
| parent | 93cc13aabbbac3341a06a27bb8016d94622350cd (diff) | |
| download | patches-2096ef47aad57a9988c8fdfaa46a70770a0e0b12.tar patches-2096ef47aad57a9988c8fdfaa46a70770a0e0b12.tar.gz | |
derivations: Remove unused 'derivation' parameter.
* guix/derivations.scm (derivation): Remove unused #:hash-mode parameter.
* doc/guix.texi (Derivations): Adjust accordingly.
| -rw-r--r-- | doc/guix.texi | 4 | ||||
| -rw-r--r-- | guix/derivations.scm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 36e68668ef..78736fadf2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1486,13 +1486,13 @@ a derivation is the @code{derivation} procedure: @deffn {Scheme Procedure} derivation @var{store} @var{name} @var{builder} @ @var{args} [#:outputs '("out")] [#:hash #f] [#:hash-algo #f] @ - [#:recursive? #f] [#:hash-mode #f] [#:inputs '()] [#:env-vars '()] @ + [#:recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system (%current-system)] [#:references-graphs #f] @ [#:local-build? #f] Build a derivation with the given arguments, and return the resulting @code{<derivation>} object. -When @var{hash}, @var{hash-algo}, and @var{hash-mode} are given, a +When @var{hash} and @var{hash-algo} are given, a @dfn{fixed-output derivation} is created---i.e., one whose result is known in advance, such as a file download. If, in addition, @var{recursive?} is true, then that fixed output may be an executable diff --git a/guix/derivations.scm b/guix/derivations.scm index 4f060a6aa2..82a0173232 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -558,11 +558,11 @@ HASH-ALGO, of the derivation NAME. RECURSIVE? has the same meaning as for #:key (system (%current-system)) (env-vars '()) (inputs '()) (outputs '("out")) - hash hash-algo hash-mode recursive? + hash hash-algo recursive? references-graphs local-build?) "Build a derivation with the given arguments, and return the resulting -<derivation> object. When HASH, HASH-ALGO, and HASH-MODE are given, a +<derivation> object. When HASH and HASH-ALGO are given, a fixed-output derivation is created---i.e., one whose result is known in advance, such as a file download. If, in addition, RECURSIVE? is true, then that fixed output may be an executable file or a directory and HASH must be |