about summary refs log tree commit diff
path: root/doc/manual/expressions/builtins.xml
diff options
context:
space:
mode:
authorErsin Akinci <me@ersinakinci.com>2019-10-21T20·12-0700
committerEelco Dolstra <edolstra@gmail.com>2020-01-04T13·09+0100
commit1ea63a5931981070500a26ccc241375699f1e41b (patch)
tree4c9be9247270a502187194da09787273338be361 /doc/manual/expressions/builtins.xml
parente1fb586138f220ed1eba2e8a5c9c1d5f17847267 (diff)
Revert "Document import <path> syntax"
This reverts commit d8730fb86facadbef22d3df7f8a743a56e7ed53c.

(cherry picked from commit 9be7787ec04d604a4e65a22a6b9ae56567aaf618)
Diffstat (limited to 'doc/manual/expressions/builtins.xml')
-rw-r--r--doc/manual/expressions/builtins.xml10
1 files changed, 1 insertions, 9 deletions
diff --git a/doc/manual/expressions/builtins.xml b/doc/manual/expressions/builtins.xml
index 21da8b87b284..465fa1e0b001 100644
--- a/doc/manual/expressions/builtins.xml
+++ b/doc/manual/expressions/builtins.xml
@@ -733,21 +733,13 @@ builtins.genList (x: x * x) 5
   <varlistentry xml:id='builtin-import'>
     <term><function>import</function>
     <replaceable>path</replaceable></term>
-    <term><function>import</function>
-    <replaceable>&lt;path&gt;</replaceable></term>
     <term><function>builtins.import</function>
     <replaceable>path</replaceable></term>
-    <term><function>builtins.import</function>
-    <replaceable>&lt;path&gt;</replaceable></term>
 
     <listitem><para>Load, parse and return the Nix expression in the
     file <replaceable>path</replaceable>.  If <replaceable>path
     </replaceable> is a directory, the file <filename>default.nix
-    </filename> in that directory is loaded.  If the <replaceable>
-    &lt;path&gt;</replaceable> syntax is used, the path will be resolved
-    relative to those listed in the <envar>NIX_PATH</envar> environment
-    variable (see the section on <envar linkend="env-NIX_PATH">NIX_PATH</envar>
-    for details on how the resolution works). Evaluation aborts if the
+    </filename> in that directory is loaded.  Evaluation aborts if the
     file doesn’t exist or contains an incorrect Nix expression.
     <function>import</function> implements Nix’s module system: you
     can put any Nix expression (such as a set or a function) in a