mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1657 from plesiv/docs-typeof-fix

Browse source 
Mention "float" type in the docs
This commit is contained in:
Eelco Dolstra 2017-11-02 16:26:30 +01:00 committed by GitHub
commit ac4a1ef0c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
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
@ -600,6 +600,16 @@ x: x + 456</programlisting>
</varlistentry> </varlistentry>
<varlistentry><term><function>builtins.isFloat</function>
<replaceable>e</replaceable></term>
<listitem><para>Return <literal>true</literal> if
<replaceable>e</replaceable> evaluates to a float, and
<literal>false</literal> otherwise.</para></listitem>
</varlistentry>
<varlistentry><term><function>builtins.isBool</function> <varlistentry><term><function>builtins.isBool</function>
<replaceable>e</replaceable></term> <replaceable>e</replaceable></term>
@ -1245,8 +1255,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>