Merge pull request #9601 from edolstra/lazy-trees-backports

Lazy trees backports

src/libexpr/eval.hh

@@ -335,11 +335,6 @@ private:
 
     std::map<std::string, std::optional<std::string>> searchPathResolved;
 
-    /**
-     * Cache used by checkSourcePath().
-     */
-    std::unordered_map<Path, SourcePath> resolvedPaths;
-
     /**
      * Cache used by prim_match().
      */

src/libfetchers/input-accessor.hh

@@ -130,7 +130,7 @@ struct SourcePath
     { return accessor->getPhysicalPath(path); }
 
     std::string to_string() const
-    { return path.abs(); }
+    { return accessor->showPath(path); }
 
     /**
      * Append a `CanonPath` to this path.

tests/unit/libexpr-support/tests/libexpr.hh

@@ -8,6 +8,7 @@
 #include "nixexpr.hh"
 #include "eval.hh"
 #include "eval-inline.hh"
+#include "eval-settings.hh"
 #include "store-api.hh"
 
 #include "tests/libstore.hh"
@@ -18,6 +19,7 @@ namespace nix {
             static void SetUpTestSuite() {
                 LibStoreTest::SetUpTestSuite();
                 initGC();
+                evalSettings.nixPath = {};
             }
 
         protected: