Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 88c452d1603e
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d5f1cc3e949e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 6, 2019

  1. Use revcount/last-modified for computing the flake fingerprint 

    The store path is not enough. For example, when we build a dirty tree,
commit, and build the clean tree, a re-evaluation is necessary because
the flake may depend on the lastModified or revCount attributes.
    @edolstra
    edolstra committed Nov 6, 2019
    Copy the full SHA
    d5f1cc3 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 src/libexpr/flake/flake.cc
6 changes: 5 additions & 1 deletion src/libexpr/flake/flake.cc
View file
Original file line number Diff line number Diff line change
@@ -686,7 +686,11 @@ Fingerprint ResolvedFlake::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;%s", flake.sourceInfo.storePath, lockFile));
fmt("%s;%d;%d;%s",
flake.sourceInfo.storePath,
flake.sourceInfo.revCount.value_or(0),
flake.sourceInfo.lastModified.value_or(0),
lockFile));
}

}