From 0792152627a94dbb2fbbbd8f0f05ff36a480dabf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Jan 2025 13:54:19 +0100 Subject: [PATCH] Rename Override -> OverrideTarget --- src/libflake/flake/flake.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libflake/flake/flake.cc b/src/libflake/flake/flake.cc index e9fa28f06..4f0b922ab 100644 --- a/src/libflake/flake/flake.cc +++ b/src/libflake/flake/flake.cc @@ -408,14 +408,14 @@ LockedFlake lockFlake( debug("old lock file: %s", oldLockFile); - struct Override + struct OverrideTarget { FlakeInput input; SourcePath sourcePath; std::optional parentInputPath; // FIXME: rename to inputPathPrefix? }; - std::map overrides; + std::map overrides; std::set explicitCliOverrides; std::set overridesUsed, updatesUsed; std::map, SourcePath> nodePaths; @@ -423,7 +423,7 @@ LockedFlake lockFlake( for (auto & i : lockFlags.inputOverrides) { overrides.emplace( i.first, - Override { + OverrideTarget { .input = FlakeInput { .ref = i.second }, /* Note: any relative overrides (e.g. `--override-input B/C "path:./foo/bar"`) @@ -474,7 +474,7 @@ LockedFlake lockFlake( inputPath.push_back(id); inputPath.push_back(idOverride); overrides.emplace(inputPath, - Override { + OverrideTarget { .input = inputOverride, .sourcePath = sourcePath, .parentInputPath = inputPathPrefix