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

Resolve merge conflict

Browse source
This commit is contained in:
Eelco Dolstra 2025-02-12 16:54:48 +01:00 • committed by GitHub
parent dffcc184d7
commit 0ff190107f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libflake/flake/flake.cc
View file

@ -557,15 +557,9 @@ LockedFlake lockFlake(
auto getInputFlake = [&](const FlakeRef & ref)
{
if (auto resolvedPath = resolveRelativePath()) {
<<<<<<< HEAD
return readFlake(state, *input.ref, *input.ref, *input.ref, *resolvedPath, inputPath);
return readFlake(state, ref, ref, ref, *resolvedPath, inputPath);
} else {
return getFlake(state, *input.ref, useRegistries, flakeCache, inputPath);
=======
return readFlake(state, ref, ref, ref, *resolvedPath, inputAttrPath);
} else {
return getFlake(state, ref, useRegistries, flakeCache, inputAttrPath);
>>>>>>> 5c552b62f (lockFlake(): When refetching a locked flake, use the locked ref)
return getFlake(state, ref, useRegistries, flakeCache, inputPath);
}
};