mirror of
https://github.com/NixOS/nix
synced 2025-07-07 01:51:47 +02:00
Drop unused 'settings' argument
This commit is contained in:
parent
5807b5cda0
commit
f0271090b2
1 changed files with 1 additions and 3 deletions
|
@ -362,7 +362,6 @@ Flake getFlake(EvalState & state, const FlakeRef & originalRef, bool useRegistri
|
||||||
}
|
}
|
||||||
|
|
||||||
static LockFile readLockFile(
|
static LockFile readLockFile(
|
||||||
const Settings & settings,
|
|
||||||
const fetchers::Settings & fetchSettings,
|
const fetchers::Settings & fetchSettings,
|
||||||
const SourcePath & lockFilePath)
|
const SourcePath & lockFilePath)
|
||||||
{
|
{
|
||||||
|
@ -398,7 +397,6 @@ LockedFlake lockFlake(
|
||||||
}
|
}
|
||||||
|
|
||||||
auto oldLockFile = readLockFile(
|
auto oldLockFile = readLockFile(
|
||||||
settings,
|
|
||||||
state.fetchSettings,
|
state.fetchSettings,
|
||||||
lockFlags.referenceLockFilePath.value_or(
|
lockFlags.referenceLockFilePath.value_or(
|
||||||
flake.lockFilePath()));
|
flake.lockFilePath()));
|
||||||
|
@ -696,7 +694,7 @@ LockedFlake lockFlake(
|
||||||
inputFlake.inputs, childNode, inputPath,
|
inputFlake.inputs, childNode, inputPath,
|
||||||
oldLock
|
oldLock
|
||||||
? std::dynamic_pointer_cast<const Node>(oldLock)
|
? std::dynamic_pointer_cast<const Node>(oldLock)
|
||||||
: readLockFile(settings, state.fetchSettings, inputFlake.lockFilePath()).root.get_ptr(),
|
: readLockFile(state.fetchSettings, inputFlake.lockFilePath()).root.get_ptr(),
|
||||||
oldLock ? followsPrefix : inputPath,
|
oldLock ? followsPrefix : inputPath,
|
||||||
inputFlake.path,
|
inputFlake.path,
|
||||||
false);
|
false);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue