diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2019-08-06 10:07:36 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-08-06 10:07:36 +0200 |
commit | 378d94e51b00c30b19a39154278d01f1f3c4dbc1 (patch) | |
tree | 0c9ed3a1c1b6db778b05ad03fa8edd91cfb737f4 /doc/guix.texi | |
parent | d350d5e71434704d147b1252d21e46daf6bb9885 (diff) | |
parent | 6a5198170ed5f10e1eee2e25fc6a39f3f33a40fd (diff) |
Merge remote-tracking branch 'origin/master' into wip-texlive
Diffstat (limited to 'doc/guix.texi')
-rw-r--r-- | doc/guix.texi | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 8c5fa5f741..cb60d5c7b7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -28,7 +28,7 @@ Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* -Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* +Copyright @copyright{} 2015, 2016, 2017, 2019 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* @@ -564,6 +564,10 @@ $ wget @value{OPENPGP-SIGNING-KEY-URL} \ @noindent and rerun the @code{gpg --verify} command. + +Take note that a warning like ``This key is not certified with a trusted +signature!'' is normal. + @c end authentication part @item @@ -746,7 +750,7 @@ or later; @c FIXME: Specify a version number once a release has been made. @uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August 2017 or later; -@item @uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON}; +@item @uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON} 3.x; @item @url{https://zlib.net, zlib}; @item @url{https://www.gnu.org/software/make/, GNU Make}. @end itemize @@ -1911,6 +1915,10 @@ $ wget @value{OPENPGP-SIGNING-KEY-URL} \ @noindent and rerun the @code{gpg --verify} command. + +Take note that a warning like ``This key is not certified with a trusted +signature!'' is normal. + @c end duplication This image contains the tools necessary for an installation. @@ -5846,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) @@ -7431,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}. @@ -8040,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 |