Fixed issue #47

Content hashes

2 files changed, 34 insertions, 14 deletions

diff --git a/src/libexpr/primops/flake.cc b/src/libexpr/primops/flake.cc
index 1d409105f..e9896d665 100644
--- a/src/libexpr/primops/flake.cc
+++ b/src/libexpr/primops/flake.cc
@@ -50,7 +50,8 @@ LockFile::FlakeEntry readFlakeEntry(nlohmann::json json)
     if (!flakeRef.isImmutable())
         throw Error("cannot use mutable flake '%s' in pure mode", flakeRef);
 
-    LockFile::FlakeEntry entry(flakeRef);
+    Hash hash = Hash((std::string) json["contentHash"]);
+    LockFile::FlakeEntry entry(flakeRef, hash);
 
     auto nonFlakeRequires = json["nonFlakeRequires"];
 
@@ -58,7 +59,9 @@ LockFile::FlakeEntry readFlakeEntry(nlohmann::json json)
         FlakeRef flakeRef(i->value("uri", ""));
         if (!flakeRef.isImmutable())
             throw Error("requested to fetch FlakeRef '%s' purely, which is mutable", flakeRef);
-        entry.nonFlakeEntries.insert_or_assign(i.key(), flakeRef);
+        Hash hash = Hash((std::string) i->value("contentHash", ""));
+        LockFile::NonFlakeEntry newEntry(flakeRef, hash);
+        entry.nonFlakeEntries.insert_or_assign(i.key(), newEntry);
     }
 
     auto requires = json["requires"];
@@ -86,9 +89,10 @@ LockFile readLockFile(const Path & path)
 
     for (auto i = nonFlakeRequires.begin(); i != nonFlakeRequires.end(); ++i) {
         FlakeRef flakeRef(i->value("uri", ""));
+        LockFile::NonFlakeEntry entry(flakeRef, Hash((std::string) json["contentHash"]));
         if (!flakeRef.isImmutable())
             throw Error("requested to fetch FlakeRef '%s' purely, which is mutable", flakeRef);
-        lockFile.nonFlakeEntries.insert_or_assign(i.key(), flakeRef);
+        lockFile.nonFlakeEntries.insert_or_assign(i.key(), entry);
     }
 
     auto requires = json["requires"];
@@ -103,8 +107,11 @@ nlohmann::json flakeEntryToJson(const LockFile::FlakeEntry & entry)
 {
     nlohmann::json json;
     json["uri"] = entry.ref.to_string();
-    for (auto & x : entry.nonFlakeEntries)
-        json["nonFlakeRequires"][x.first]["uri"] = x.second.to_string();
+    json["contentHash"] = entry.contentHash.to_string(SRI);
+    for (auto & x : entry.nonFlakeEntries) {
+        json["nonFlakeRequires"][x.first]["uri"] = x.second.ref.to_string();
+        json["nonFlakeRequires"][x.first]["contentHash"] = x.second.contentHash.to_string(SRI);
+    }
     for (auto & x : entry.flakeEntries)
         json["requires"][x.first.to_string()] = flakeEntryToJson(x.second);
     return json;
@@ -115,8 +122,10 @@ void writeLockFile(const LockFile & lockFile, const Path & path)
     nlohmann::json json;
     json["version"] = 1;
     json["nonFlakeRequires"] = nlohmann::json::object();
-    for (auto & x : lockFile.nonFlakeEntries)
-        json["nonFlakeRequires"][x.first]["uri"] = x.second.to_string();
+    for (auto & x : lockFile.nonFlakeEntries) {
+        json["nonFlakeRequires"][x.first]["uri"] = x.second.ref.to_string();
+        json["nonFlakeRequires"][x.first]["contentHash"] = x.second.contentHash.to_string(SRI);
+    }
     json["requires"] = nlohmann::json::object();
     for (auto & x : lockFile.flakeEntries)
         json["requires"][x.first.to_string()] = flakeEntryToJson(x.second);
@@ -293,6 +302,7 @@ Flake getFlake(EvalState & state, const FlakeRef & flakeRef, bool impureIsAllowe
         throw Error("flake file '%s' escapes from '%s'", resolvedRef, sourceInfo.storePath);
 
     Flake flake(flakeRef, sourceInfo);
+    flake.hash = state.store->queryPathInfo(sourceInfo.storePath)->narHash;
 
     if (!pathExists(flakeFile))
         throw Error("source tree referenced by '%s' does not contain a '%s/flake.nix' file", resolvedRef, resolvedRef.subdir);
@@ -346,12 +356,13 @@ NonFlake getNonFlake(EvalState & state, const FlakeRef & flakeRef, FlakeAlias al
 
     NonFlake nonFlake(flakeRef, sourceInfo);
 
-    nonFlake.storePath = sourceInfo.storePath;
     state.store->assertStorePath(nonFlake.storePath);
 
     if (state.allowedPaths)
         state.allowedPaths->insert(nonFlake.storePath);
 
+    nonFlake.hash = state.store->queryPathInfo(sourceInfo.storePath)->narHash;
+
     nonFlake.alias = alias;
 
     return nonFlake;
@@ -388,13 +399,13 @@ ResolvedFlake resolveFlake(EvalState & state, const FlakeRef & topRef,
 
 LockFile::FlakeEntry dependenciesToFlakeEntry(const ResolvedFlake & resolvedFlake)
 {
-    LockFile::FlakeEntry entry(resolvedFlake.flake.resolvedRef);
+    LockFile::FlakeEntry entry(resolvedFlake.flake.resolvedRef, resolvedFlake.flake.hash);
 
     for (auto & newResFlake : resolvedFlake.flakeDeps)
         entry.flakeEntries.insert_or_assign(newResFlake.flake.originalRef, dependenciesToFlakeEntry(newResFlake));
 
     for (auto & nonFlake : resolvedFlake.nonFlakeDeps)
-        entry.nonFlakeEntries.insert_or_assign(nonFlake.alias, nonFlake.resolvedRef);
+        entry.nonFlakeEntries.insert_or_assign(nonFlake.alias, LockFile::NonFlakeEntry(nonFlake.resolvedRef, nonFlake.hash));
 
     return entry;
 }
diff --git a/src/libexpr/primops/flake.hh b/src/libexpr/primops/flake.hh
index f3bf76cc7..691f68b0a 100644
--- a/src/libexpr/primops/flake.hh
+++ b/src/libexpr/primops/flake.hh
@@ -19,16 +19,24 @@ struct FlakeRegistry
 
 struct LockFile
 {
+    struct NonFlakeEntry
+    {
+        FlakeRef ref;
+        Hash contentHash;
+        NonFlakeEntry(const FlakeRef & flakeRef, const Hash & hash) : ref(flakeRef), contentHash(hash) {};
+    };
+
     struct FlakeEntry
     {
         FlakeRef ref;
+        Hash contentHash;
         std::map<FlakeRef, FlakeEntry> flakeEntries;
-        std::map<FlakeAlias, FlakeRef> nonFlakeEntries;
-        FlakeEntry(const FlakeRef & flakeRef) : ref(flakeRef) {};
+        std::map<FlakeAlias, NonFlakeEntry> nonFlakeEntries;
+        FlakeEntry(const FlakeRef & flakeRef, const Hash & hash) : ref(flakeRef), contentHash(hash) {};
     };
 
     std::map<FlakeRef, FlakeEntry> flakeEntries;
-    std::map<FlakeId, FlakeRef> nonFlakeEntries;
+    std::map<FlakeId, NonFlakeEntry> nonFlakeEntries;
 };
 
 typedef std::vector<std::shared_ptr<FlakeRegistry>> Registries;
@@ -60,6 +68,7 @@ struct Flake
     std::string description;
     std::optional<uint64_t> revCount;
     Path storePath;
+    Hash hash; // content hash
     std::vector<FlakeRef> requires;
     std::map<FlakeAlias, FlakeRef> nonFlakeRequires;
     Value * vProvides; // FIXME: gc
@@ -76,8 +85,8 @@ struct NonFlake
     FlakeRef resolvedRef;
     std::optional<uint64_t> revCount;
     Path storePath;
+    Hash hash; // content hash
     // date
-    // content hash
     NonFlake(const FlakeRef & origRef, const SourceInfo & sourceInfo) : originalRef(origRef),
         resolvedRef(sourceInfo.resolvedRef), revCount(sourceInfo.revCount), storePath(sourceInfo.storePath) {};
 };