Merge pull request #6001 from NixOS/fix-nix-path

Don’t require `NIX_PATH` entries to be valid paths

src/libexpr/primops.cc

@@ -92,8 +92,6 @@ StringMap EvalState::realiseContext(const PathSet & context)
 }
 
 struct RealisePathFlags {
-    // Whether to check whether the path is a valid absolute path
-    bool requireAbsolutePath = true;
     // Whether to check that the path is allowed in pure eval mode
     bool checkForPureEval = true;
 };
@@ -105,9 +103,7 @@ static Path realisePath(EvalState & state, const Pos & pos, Value & v, const Rea
     auto path = [&]()
     {
         try {
-            return flags.requireAbsolutePath
+            return state.coerceToPath(pos, v, context);
-                ? state.coerceToPath(pos, v, context)
-                : state.coerceToString(pos, v, context, false, false);
         } catch (Error & e) {
             e.addTrace(pos, "while realising the context of a path");
             throw;
@@ -1489,7 +1485,19 @@ static void prim_findFile(EvalState & state, const Pos & pos, Value * * args, Va
             pos
         );
 
-        auto path = realisePath(state, pos, *i->value, { .requireAbsolutePath = false });
+        PathSet context;
+        string path = state.coerceToString(pos, *i->value, context, false, false);
+
+        try {
+            auto rewrites = state.realiseContext(context);
+            path = rewriteStrings(path, rewrites);
+        } catch (InvalidPathError & e) {
+            throw EvalError({
+                .msg = hintfmt("cannot find '%1%', since path '%2%' is not valid", path, e.path),
+                .errPos = pos
+            });
+        }
+
 
         searchPath.emplace_back(prefix, path);
     }

tests/local.mk

@@ -63,6 +63,7 @@ nix_tests = \
   eval-store.sh \
   readfile-context.sh \
   store-ping.sh \
+  nix_path.sh \
   why-depends.sh
   # parallel.sh
 

tests/nix_path.sh

@@ -0,0 +1,11 @@
+# Regression for https://github.com/NixOS/nix/issues/5998 and https://github.com/NixOS/nix/issues/5980
+
+source common.sh
+
+export NIX_PATH=non-existent=/non-existent/but-unused-anyways:by-absolute-path=$PWD:by-relative-path=.
+
+nix-instantiate --eval -E '<by-absolute-path/simple.nix>' --restrict-eval
+nix-instantiate --eval -E '<by-relative-path/simple.nix>' --restrict-eval
+
+# Should ideally also test this, but there’s no pure way to do it, so just trust me that it works
+# nix-instantiate --eval -E '<nixpkgs>' -I nixpkgs=channel:nixos-unstable --restrict-eval