1 files changed, 38 insertions, 4 deletions

diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index 61ee4a73b..50c6f784e 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -20,6 +20,10 @@ class Store;
 class EvalState;
 enum RepairFlag : bool;
 
+namespace flake {
+struct FlakeRegistry;
+}
+
 
 typedef void (* PrimOpFun) (EvalState & state, const Pos & pos, Value * * args, Value & v);
 
@@ -64,6 +68,8 @@ typedef std::list<SearchPathElem> SearchPath;
 /* Initialise the Boehm GC, if applicable. */
 void initGC();
 
+typedef std::vector<std::pair<std::string, std::string>> RegistryOverrides;
+
 
 class EvalState
 {
@@ -74,7 +80,8 @@ public:
         sSystem, sOverrides, sOutputs, sOutputName, sIgnoreNulls,
         sFile, sLine, sColumn, sFunctor, sToString,
         sRight, sWrong, sStructuredAttrs, sBuilder, sArgs,
-        sOutputHash, sOutputHashAlgo, sOutputHashMode;
+        sOutputHash, sOutputHashAlgo, sOutputHashMode,
+        sDescription, sSelf;
     Symbol sDerivationNix;
 
     /* If set, force copying files to the Nix store even if they
@@ -89,6 +96,9 @@ public:
 
     const ref<Store> store;
 
+    RegistryOverrides registryOverrides;
+
+
 private:
     SrcToStore srcToStore;
 
@@ -148,8 +158,9 @@ public:
     Expr * parseStdin();
 
     /* Evaluate an expression read from the given file to normal
-       form. */
-    void evalFile(const Path & path, Value & v);
+       form. Optionally enforce that the top-level expression is
+       trivial (i.e. doesn't require arbitrary computation). */
+    void evalFile(const Path & path, Value & v, bool mustBeTrivial = false);
 
     void resetFileCache();
 
@@ -214,6 +225,8 @@ public:
        path.  Nothing is copied to the store. */
     Path coerceToPath(const Pos & pos, Value & v, PathSet & context);
 
+    void addRegistryOverrides(RegistryOverrides overrides) { registryOverrides = overrides; }
+
 public:
 
     /* The base environment, containing the builtin functions and
@@ -269,6 +282,7 @@ public:
     Env & allocEnv(size_t size);
 
     Value * allocAttr(Value & vAttrs, const Symbol & name);
+    Value * allocAttr(Value & vAttrs, const std::string & name);
 
     Bindings * allocBindings(size_t capacity);
 
@@ -315,10 +329,21 @@ private:
     friend struct ExprOpConcatLists;
     friend struct ExprSelect;
     friend void prim_getAttr(EvalState & state, const Pos & pos, Value * * args, Value & v);
+
+public:
+
+    const std::vector<std::shared_ptr<flake::FlakeRegistry>> getFlakeRegistries();
+
+    std::shared_ptr<flake::FlakeRegistry> getGlobalFlakeRegistry();
+
+private:
+    std::shared_ptr<flake::FlakeRegistry> _globalFlakeRegistry;
+    std::once_flag _globalFlakeRegistryInit;
 };
 
 
 /* Return a string representing the type of the value `v'. */
+string showType(ValueType type);
 string showType(const Value & v);
 
 /* Decode a context string ‘!<name>!<path>’ into a pair <path,
@@ -356,7 +381,16 @@ struct EvalSettings : Config
         "Prefixes of URIs that builtin functions such as fetchurl and fetchGit are allowed to fetch."};
 
     Setting<bool> traceFunctionCalls{this, false, "trace-function-calls",
-        "Emit log messages for each function entry and exit at the 'vomit' log level (-vvvv)"};
+        "Emit log messages for each function entry and exit at the 'vomit' log level (-vvvv)."};
+
+    Setting<std::string> flakeRegistry{this, "https://raw.githubusercontent.com/NixOS/flake-registry/master/flake-registry.json", "flake-registry",
+        "Path or URI of the global flake registry."};
+
+    Setting<bool> allowDirty{this, true, "allow-dirty",
+        "Whether to allow dirty Git/Mercurial trees."};
+
+    Setting<bool> warnDirty{this, true, "warn-dirty",
+        "Whether to warn about dirty Git/Mercurial trees."};
 };
 
 extern EvalSettings evalSettings;