lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Mention "float" type in builtins.typeOf section of the docs

Browse source 
+ remove trailing whitespace from the file
This commit is contained in:
Zoran Plesivčak 2017-11-01 21:31:20 +00:00
parent 212e72c609
commit 3050395810
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
doc/manual/expressions/builtins.xml
View file

@ -264,13 +264,13 @@ stdenv.mkDerivation { … }
Note that when obtaining the hash with <varname>nix-prefetch-url Note that when obtaining the hash with <varname>nix-prefetch-url
</varname> the option <varname>--unpack</varname> is required. </varname> the option <varname>--unpack</varname> is required.
</para> </para>
<para>This function can also verify the contents against a hash. <para>This function can also verify the contents against a hash.
In that case, the function takes a set instead of a URL. The set In that case, the function takes a set instead of a URL. The set
requires the attribute <varname>url</varname> and the attribute requires the attribute <varname>url</varname> and the attribute
<varname>sha256</varname>, e.g. <varname>sha256</varname>, e.g.
<programlisting> <programlisting>
with import (fetchTarball { with import (fetchTarball {
url = https://github.com/NixOS/nixpkgs-channels/archive/nixos-14.12.tar.gz; url = https://github.com/NixOS/nixpkgs-channels/archive/nixos-14.12.tar.gz;
@ -279,7 +279,7 @@ with import (fetchTarball {
stdenv.mkDerivation { … } stdenv.mkDerivation { … }
</programlisting> </programlisting>
</para> </para>
<para>This function is not available if <link <para>This function is not available if <link
@ -1245,8 +1245,9 @@ stdenv.mkDerivation (rec {
<replaceable>e</replaceable>, namely <literal>"int"</literal>, <replaceable>e</replaceable>, namely <literal>"int"</literal>,
<literal>"bool"</literal>, <literal>"string"</literal>, <literal>"bool"</literal>, <literal>"string"</literal>,
<literal>"path"</literal>, <literal>"null"</literal>, <literal>"path"</literal>, <literal>"null"</literal>,
<literal>"set"</literal>, <literal>"list"</literal> or <literal>"set"</literal>, <literal>"list"</literal>,
<literal>"lambda"</literal>.</para></listitem> <literal>"lambda"</literal> or
<literal>"float"</literal>.</para></listitem>
</varlistentry> </varlistentry>