Merge pull request #5263 from greedy/fix-5261

Include subpath in flake fingerprint
2021-09-17 08:10:47 +02:00 · 2021-09-17 08:10:47 +02:00 · 37cc50f2c8
parent 1ec4efa6c8 cbe9ddfd1a
commit 37cc50f2c8
1 changed files with 2 additions and 1 deletions
--- a/src/libexpr/flake/flake.cc
+++ b/src/libexpr/flake/flake.cc
@ -710,8 +710,9 @@ Fingerprint LockedFlake::getFingerprint() const
    // and we haven't changed it, then it's sufficient to use
    // flake.sourceInfo.storePath for the fingerprint.
    return hashString(htSHA256,
-        fmt("%s;%d;%d;%s",
+        fmt("%s;%s;%d;%d;%s",
            flake.sourceInfo->storePath.to_string(),
+            flake.lockedRef.subdir,
            flake.lockedRef.input.getRevCount().value_or(0),
            flake.lockedRef.input.getLastModified().value_or(0),
            lockFile));