aboutsummaryrefslogtreecommitdiff
path: root/src/libcmd/installables.hh
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2023-01-11 02:00:44 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2023-01-11 18:55:29 -0500
commita7c0cff07f3e1af60bdbcd5bf7e13f8ae768da90 (patch)
tree3c4d82ec51acbf3d9ba3923f10e5526aa7f491ee /src/libcmd/installables.hh
parenta8f45b5e5a42daa9bdee640255464d4dbb431352 (diff)
Rename `OutputPath` -> `ExtendedOutputPath`
Do this prior to making a new more limitted `OutputPath` we will use in more places.
Diffstat (limited to 'src/libcmd/installables.hh')
-rw-r--r--src/libcmd/installables.hh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcmd/installables.hh b/src/libcmd/installables.hh
index 9b92cc4be..3d12639b0 100644
--- a/src/libcmd/installables.hh
+++ b/src/libcmd/installables.hh
@@ -59,7 +59,7 @@ struct ExtraPathInfo
std::optional<FlakeRef> resolvedRef;
std::optional<std::string> attrPath;
// FIXME: merge with DerivedPath's 'outputs' field?
- std::optional<OutputsSpec> outputsSpec;
+ std::optional<ExtendedOutputsSpec> extendedOutputsSpec;
};
/* A derived path with any additional info that commands might
@@ -169,7 +169,7 @@ struct InstallableFlake : InstallableValue
FlakeRef flakeRef;
Strings attrPaths;
Strings prefixes;
- OutputsSpec outputsSpec;
+ ExtendedOutputsSpec extendedOutputsSpec;
const flake::LockFlags & lockFlags;
mutable std::shared_ptr<flake::LockedFlake> _lockedFlake;
@@ -178,7 +178,7 @@ struct InstallableFlake : InstallableValue
ref<EvalState> state,
FlakeRef && flakeRef,
std::string_view fragment,
- OutputsSpec outputsSpec,
+ ExtendedOutputsSpec extendedOutputsSpec,
Strings attrPaths,
Strings prefixes,
const flake::LockFlags & lockFlags);