diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-08-04 13:41:27 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-08-04 13:41:27 +0200 |
commit | f35d3132654bd1be5c7453f9eb43eb6e9de85a15 (patch) | |
tree | f62c3a069153d1612a5c270e991eebe43c4f5cae /doc/guix.texi | |
parent | 1dff73acf908125b292de2ab2fc5b25155ad77d8 (diff) | |
parent | e920037793faeebf8fb2a918b50a1751b125a0af (diff) | |
download | guix-patches-f35d3132654bd1be5c7453f9eb43eb6e9de85a15.tar guix-patches-f35d3132654bd1be5c7453f9eb43eb6e9de85a15.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'doc/guix.texi')
-rw-r--r-- | doc/guix.texi | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index c2da4ce173..cb60d5c7b7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5854,8 +5854,11 @@ should be added to the package definition via the In its @code{configure} phase, this build system will make any source inputs specified in the @code{#:cargo-inputs} and @code{#:cargo-development-inputs} -parameters available to cargo. The @code{install} phase installs any crate -the binaries if they are defined by the crate. +parameters available to cargo. The @code{update-cargo-lock} phase will, +when there is a @code{Cargo.lock} file, update the @code{Cargo.lock} file +with the inputs and their versions available at build time. The +@code{install} phase installs any crate the binaries if they are defined by +the crate. @end defvr @cindex Clojure (programming language) @@ -7439,7 +7442,8 @@ This is the declarative counterpart of @code{gexp->derivation}. @end deffn @deffn {Monadic Procedure} gexp->script @var{name} @var{exp} @ - [#:guile (default-guile)] [#:module-path %load-path] + [#:guile (default-guile)] [#:module-path %load-path] @ + [#:system (%current-system)] [#:target #f] Return an executable script @var{name} that runs @var{exp} using @var{guile}, with @var{exp}'s imported modules in its search path. Look up @var{exp}'s modules in @var{module-path}. @@ -8048,7 +8052,7 @@ guix build --with-branch=guile-sqlite3=master cuirass @item --with-commit=@var{package}=@var{commit} This is similar to @code{--with-branch}, except that it builds from @var{commit} rather than the tip of a branch. @var{commit} must be a valid -Git commit SHA1 identifier. +Git commit SHA1 identifier or a tag. @end table @node Additional Build Options |