wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 06:01:48 +02:00
Code Activity

Merge pull request #5713 from tweag/balsoft/another-follows-bugfix

Browse source 
Flakes: computeLocks: pass correct LockParent when reusing oldLock
This commit is contained in:
Eelco Dolstra 2021-12-02 13:17:50 +01:00 • committed by GitHub
commit 2ff71b0213
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/flake/flake.cc
View file

@ -480,11 +480,16 @@ LockedFlake lockFlake(
}
}
LockParent newParent {
.path = inputPath,
.absolute = false
};
computeLocks(
mustRefetch
? getFlake(state, oldLock->lockedRef, false, flakeCache).inputs
: fakeInputs,
childNode, inputPath, oldLock, parent, parentPath);
childNode, inputPath, oldLock, newParent, parentPath);
} else {
/* We need to create a new lock file entry. So fetch