nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-27 04:30:59 +01:00
Code Activity

Revert flake-schemas for now

Browse source
This commit is contained in:
Eelco Dolstra 2024-10-29 15:18:48 +01:00
parent 6ff6baaa35
commit ffcc42faf4
25 changed files with 827 additions and 730 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/eval-cache.cc
View file

@ -368,12 +368,6 @@ Value * EvalCache::getRootValue()
{
if (!value) {
debug("getting root value");
/* For testing whether the evaluation cache is
complete. */
if (getEnv("NIX_ALLOW_EVAL").value_or("1") == "0")
throw Error("not everything is cached, but evaluation is not allowed");
value = allocRootValue(rootLoader());
}
return *value;

7
src/libexpr/eval-cache.hh
View file

@ -34,11 +34,7 @@ class EvalCache : public std::enable_shared_from_this<EvalCache>
friend struct CachedEvalError;
std::shared_ptr<AttrDb> db;
public:
EvalState & state;
private:
typedef std::function<Value *()> RootLoader;
RootLoader rootLoader;
RootValue value;
@ -93,10 +89,7 @@ class AttrCursor : public std::enable_shared_from_this<AttrCursor>
friend class EvalCache;
friend struct CachedEvalError;
public:
ref<EvalCache> root;
private:
typedef std::optional<std::pair<std::shared_ptr<AttrCursor>, Symbol>> Parent;
Parent parent;
RootValue _value;