max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-29 17:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Lazy trees backports
This commit is contained in:
Eelco Dolstra 2023-12-13 13:56:28 +01:00 committed by GitHub
commit 1f93fa2ed2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/eval.hh
View file

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

2
src/libfetchers/input-accessor.hh
View file

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

2
tests/unit/libexpr-support/tests/libexpr.hh
View file

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