diff options
| author | John Ericson <git@JohnEricson.me> | 2022-10-28 23:22:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-28 23:22:18 +0100 |
| commit | 13f2a6f38db44385ae1c7d3d01170149de328abb (patch) | |
| tree | 9184949feb826f00b7a5bc4175dda4667055e44c /src/libexpr/flake/flake.cc | |
| parent | 12461e246b02371c6b6981b4e65985e9397474e1 (diff) | |
| parent | b7e8a3bf4cbb2448db860f65ea13ef2c64b6883b (diff) | |
Merge branch 'master' into indexed-store-path-outputs
Diffstat (limited to 'src/libexpr/flake/flake.cc')
| -rw-r--r-- | src/libexpr/flake/flake.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index cc9be1336..119c556ac 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -341,7 +341,6 @@ LockedFlake lockFlake( debug("old lock file: %s", oldLockFile); - // FIXME: check whether all overrides are used. std::map<InputPath, FlakeInput> overrides; std::set<InputPath> overridesUsed, updatesUsed; @@ -484,12 +483,12 @@ LockedFlake lockFlake( } else if (auto follows = std::get_if<1>(&i.second)) { if (! trustLock) { // It is possible that the flake has changed, - // so we must confirm all the follows that are in the lockfile are also in the flake. + // so we must confirm all the follows that are in the lock file are also in the flake. auto overridePath(inputPath); overridePath.push_back(i.first); auto o = overrides.find(overridePath); // If the override disappeared, we have to refetch the flake, - // since some of the inputs may not be present in the lockfile. + // since some of the inputs may not be present in the lock file. if (o == overrides.end()) { mustRefetch = true; // There's no point populating the rest of the fake inputs, |