about summary refs log tree commit diff
path: root/doc/manual
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-03-09T12·36+0100
committerEelco Dolstra <edolstra@gmail.com>2017-03-09T12·36+0100
commit86227390c59cd0f55d0bea77b86338e017c2498a (patch)
tree7628d122bfbc753a93a94dded10271443b46f96d /doc/manual
parent6a308c7da4a36146eb019c764b0f6dd2a4f57c3f (diff)
parent5f831c10574ae7ec44d0d357a6a371ac55d00593 (diff)
Merge branch 'allow-import-from-derivation' of https://github.com/shlevy/nix
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/command-ref/conf-file.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
index 96f8a4b608a4..b1b604100f98 100644
--- a/doc/manual/command-ref/conf-file.xml
+++ b/doc/manual/command-ref/conf-file.xml
@@ -644,6 +644,16 @@ password <replaceable>my-password</replaceable>
   </varlistentry>
 
 
+  <varlistentry xml:id="conf-allow-import-from-derivation"><term><literal>allow-import-from-derivation</literal></term>
+
+    <listitem><para>By default, nix allows you to <function>import</function> from a derivation,
+    allowing building at evaluation time. With this option set to false, nix will throw an error
+    when evaluating an expression that uses this feature, allowing users to ensure their evaluation
+    will not require any builds to take place.</para></listitem>
+
+  </varlistentry>
+
+
 </variablelist>
 
 </para>