nix: Enable pure mode by default

We want to encourage a brave new world of hermetic evaluation for
source-level reproducibility, so flakes should not poke around in the
filesystem outside of their explicit dependencies.

Note that the default installation source remains impure in that it
can refer to mutable flakes, so "nix build nixpkgs.hello" still works
(and fetches the latest nixpkgs, unless it has been pinned by the
user).

A problem with pure evaluation is that builtins.currentSystem is
unavailable. For the moment, I've hard-coded "x86_64-linux" in the
nixpkgs flake. Eventually, "system" should be a flake function
argument.

1 files changed, 25 insertions, 23 deletions

diff --git a/src/libexpr/primops/flake.cc b/src/libexpr/primops/flake.cc
index 5e92b1da3..4d027558d 100644
--- a/src/libexpr/primops/flake.cc
+++ b/src/libexpr/primops/flake.cc
@@ -16,50 +16,49 @@ const FlakeRegistry & EvalState::getFlakeRegistry()
     {
         _flakeRegistry = std::make_unique<FlakeRegistry>();
 
-        if (!evalSettings.pureEval) {
-
 #if 0
-            auto registryUri = "file:///home/eelco/Dev/gists/nix-flakes/registry.json";
+        auto registryUri = "file:///home/eelco/Dev/gists/nix-flakes/registry.json";
 
-            auto registryFile = getDownloader()->download(DownloadRequest(registryUri));
+        auto registryFile = getDownloader()->download(DownloadRequest(registryUri));
 #endif
 
-            auto registryFile = readFile(settings.nixDataDir + "/nix/flake-registry.json");
+        auto registryFile = readFile(settings.nixDataDir + "/nix/flake-registry.json");
 
-            auto json = nlohmann::json::parse(registryFile);
+        auto json = nlohmann::json::parse(registryFile);
 
-            auto version = json.value("version", 0);
-            if (version != 1)
-                throw Error("flake registry '%s' has unsupported version %d", registryFile, version);
+        auto version = json.value("version", 0);
+        if (version != 1)
+            throw Error("flake registry '%s' has unsupported version %d", registryFile, version);
 
-            auto flakes = json["flakes"];
-            for (auto i = flakes.begin(); i != flakes.end(); ++i) {
-                FlakeRegistry::Entry entry{FlakeRef(i->value("uri", ""))};
-                _flakeRegistry->entries.emplace(i.key(), entry);
-            }
+        auto flakes = json["flakes"];
+        for (auto i = flakes.begin(); i != flakes.end(); ++i) {
+            FlakeRegistry::Entry entry{FlakeRef(i->value("uri", ""))};
+            _flakeRegistry->entries.emplace(i.key(), entry);
         }
     });
 
     return *_flakeRegistry;
 }
 
-static void prim_flakeRegistry(EvalState & state, const Pos & pos, Value * * args, Value & v)
+Value * EvalState::makeFlakeRegistryValue()
 {
-    auto registry = state.getFlakeRegistry();
+    auto v = allocValue();
+
+    auto registry = getFlakeRegistry();
 
-    state.mkAttrs(v, registry.entries.size());
+    mkAttrs(*v, registry.entries.size());
 
     for (auto & entry : registry.entries) {
-        auto vEntry = state.allocAttr(v, entry.first);
-        state.mkAttrs(*vEntry, 2);
-        mkString(*state.allocAttr(*vEntry, state.symbols.create("uri")), entry.second.ref.to_string());
+        auto vEntry = allocAttr(*v, entry.first);
+        mkAttrs(*vEntry, 2);
+        mkString(*allocAttr(*vEntry, symbols.create("uri")), entry.second.ref.to_string());
         vEntry->attrs->sort();
     }
 
-    v.attrs->sort();
-}
+    v->attrs->sort();
 
-static RegisterPrimOp r1("__flakeRegistry", 0, prim_flakeRegistry);
+    return v;
+}
 
 static FlakeRef lookupFlake(EvalState & state, const FlakeRef & flakeRef)
 {
@@ -129,6 +128,9 @@ static Flake getFlake(EvalState & state, const FlakeRef & flakeRef)
     auto flakePath = fetchFlake(state, flakeRef);
     state.store->assertStorePath(flakePath);
 
+    if (state.allowedPaths)
+        state.allowedPaths->insert(flakePath);
+
     Flake flake;
 
     Value vInfo;