diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-09-17 08:10:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 08:10:47 +0200 |
| commit | 37cc50f2c88b50086a1a8ed20631d1427d445b7e (patch) | |
| tree | d3f0e5184a981eccf4ca9b4cfab291cc26d7d39a | |
| parent | 1ec4efa6c82fb6d90887c21aa7c7c6f3c644dd65 (diff) | |
| parent | cbe9ddfd1ad189f3b4c0b43fabe0444437b1fdd7 (diff) | |
Merge pull request #5263 from greedy/fix-5261
Include subpath in flake fingerprint
| -rw-r--r-- | src/libexpr/flake/flake.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index c1a099613..6893f157e 100644 --- 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)); |