diff options
Diffstat (limited to 'doc/manual/command-ref')
| -rw-r--r-- | doc/manual/command-ref/conf-file.xml | 3 | ||||
| -rw-r--r-- | doc/manual/command-ref/nix-env.xml | 14 | ||||
| -rw-r--r-- | doc/manual/command-ref/opt-common.xml | 22 |
3 files changed, 25 insertions, 14 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml index d2c9145e0505..6c0af39ecda9 100644 --- a/doc/manual/command-ref/conf-file.xml +++ b/doc/manual/command-ref/conf-file.xml @@ -18,7 +18,8 @@ <refsection><title>Description</title> <para>A number of persistent settings of Nix are stored in the file -<filename><replaceable>sysconfdir</replaceable>/nix/nix.conf</filename>. +<filename><replaceable>sysconfdir</replaceable>/nix/nix.conf</filename> or +<filename>$NIX_CONF_DIR/nix.conf</filename> if <envar>NIX_CONF_DIR</envar> is set. This file is a list of <literal><replaceable>name</replaceable> = <replaceable>value</replaceable></literal> pairs, one per line. Comments start with a <literal>#</literal> character. Here is an example diff --git a/doc/manual/command-ref/nix-env.xml b/doc/manual/command-ref/nix-env.xml index 2ed4a5d9f666..85f10e0760bc 100644 --- a/doc/manual/command-ref/nix-env.xml +++ b/doc/manual/command-ref/nix-env.xml @@ -493,17 +493,11 @@ set returned by calling the function defined in source: <screen> -$ nix-env -f pkgs/top-level/all-packages.nix -i f-spot --dry-run +$ nix-env -f '<nixpkgs>' -iA hello --dry-run (dry run; not doing anything) -installing `f-spot-0.0.10' -the following derivations will be built: - /nix/store/0g63jv9aagwbgci4nnzs2dkxqz84kdja-libgnomeprintui-2.12.1.tar.bz2.drv - /nix/store/0gfarvxq6sannsdw8a1ir40j1ys2mqb4-ORBit2-2.14.2.tar.bz2.drv - /nix/store/0i9gs5zc04668qiy60ga2rc16abkj7g8-sqlite-2.8.17.drv - <replaceable>...</replaceable> -the following paths will be substituted: - /nix/store/8zbipvm4gp9jfqh9nnk1n3bary1a37gs-perl-XML-Parser-2.34 - /nix/store/b8a2bg7gnyvvvjjibp4axg9x1hzkw36c-mono-1.1.4 +installing ‘hello-2.10’ +these paths will be fetched (0.04 MiB download, 0.19 MiB unpacked): + /nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76n-hello-2.10 <replaceable>...</replaceable></screen> </para> diff --git a/doc/manual/command-ref/opt-common.xml b/doc/manual/command-ref/opt-common.xml index bc26a90616e4..2a076877a1b4 100644 --- a/doc/manual/command-ref/opt-common.xml +++ b/doc/manual/command-ref/opt-common.xml @@ -191,6 +191,23 @@ </varlistentry> +<varlistentry><term><option>--no-build-hook</option></term> + + <listitem> + + <para>Disables the build hook mechanism. This allows to ignore remote + builders if they are setup on the machine.</para> + + <para>It's useful in cases where the bandwidth between the client and the + remote builder is too low. In that case it can take more time to upload the + sources to the remote builder and fetch back the result than to do the + computation locally.</para> + + </listitem> + +</varlistentry> + + <varlistentry><term><option>--readonly-mode</option></term> @@ -218,9 +235,8 @@ named <replaceable>name</replaceable>, it will call it with value <replaceable>value</replaceable>.</para> - <para>For instance, the file - <literal>pkgs/top-level/all-packages.nix</literal> in Nixpkgs is - actually a function: + <para>For instance, the top-level <literal>default.nix</literal> in + Nixpkgs is actually a function: <programlisting> { # The system (e.g., `i686-linux') for which to build the packages. |