diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-01T22·03-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-01T22·03-0400 |
| commit | 9c2decaa1935ae4bf99a9b723d4eab188f8f88ef (patch) | |
| tree | 97cf99d322e6b3495c2629b66fead0813378bd07 /doc | |
| parent | 5170c5691aac1bd6abc69be65cf880316e11fe24 (diff) | |
| parent | 234ce610e0671410cb8a9ce4d8725e55472e8d47 (diff) | |
Merge branch 'master' into no-manifests
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual/opt-common-syn.xml | 5 | ||||
| -rw-r--r-- | doc/manual/opt-common.xml | 12 | ||||
| -rw-r--r-- | doc/manual/package-management.xml | 15 |
3 files changed, 16 insertions, 16 deletions
diff --git a/doc/manual/opt-common-syn.xml b/doc/manual/opt-common-syn.xml index 6628fde935..d65f4009ee 100644 --- a/doc/manual/opt-common-syn.xml +++ b/doc/manual/opt-common-syn.xml @@ -37,6 +37,11 @@ <option>-I</option> <replaceable>path</replaceable> </arg> +<arg> + <option>--option</option> + <replaceable>name</replaceable> + <replaceable>value</replaceable> +</arg> <sbr /> </nop> diff --git a/doc/manual/opt-common.xml b/doc/manual/opt-common.xml index b9df23dcfb..0b57517670 100644 --- a/doc/manual/opt-common.xml +++ b/doc/manual/opt-common.xml @@ -337,7 +337,7 @@ <listitem><para>Causes Nix to print out a stack trace in case of Nix expression evaluation errors.</para></listitem> - + </varlistentry> @@ -351,6 +351,16 @@ </varlistentry> +<varlistentry><term><option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable></term> + + <listitem><para>Set the Nix configuration option + <replaceable>name</replaceable> to <replaceable>value</replaceable>. + This overrides settings in the Nix configuration file (see + <citerefentry><refentrytitle>nix.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).</para></listitem> + +</varlistentry> + + </variablelist> diff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml index 8cc6aa857e..314218daf3 100644 --- a/doc/manual/package-management.xml +++ b/doc/manual/package-management.xml @@ -175,21 +175,6 @@ upgrading `coreutils-5.0' to `coreutils-5.2.1'</screen> </para> -<para>If you grow bored of specifying the Nix expressions using -<parameter>-f</parameter> all the time, you can set a default -location: - -<screen> -$ nix-env -I nixpkgs-<replaceable>version</replaceable></screen> - -After this you can just say, for instance, <literal>nix-env -u -'*'</literal>.<footnote><para>Setting a default using -<parameter>-I</parameter> currently clashes with using Nix channels, -since <literal>nix-channel --update</literal> calls <literal>nix-env --I</literal> to set the default to the Nix expressions it downloaded -from the channel, replacing whatever default you had -set.</para></footnote></para> - </section> |