aboutsummaryrefslogtreecommitdiff
path: root/src/nix/profile.cc
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/nix/profile.cc
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/nix/profile.cc')
-rw-r--r--src/nix/profile.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
index 346c4e117..32364e720 100644
--- a/src/nix/profile.cc
+++ b/src/nix/profile.cc
@@ -22,7 +22,7 @@ struct ProfileElementSource
// FIXME: record original attrpath.
FlakeRef resolvedRef;
std::string attrPath;
- OutputsSpec outputs;
+ ExtendedOutputsSpec outputs;
bool operator < (const ProfileElementSource & other) const
{
@@ -126,7 +126,7 @@ struct ProfileManifest
parseFlakeRef(e[sOriginalUrl]),
parseFlakeRef(e[sUrl]),
e["attrPath"],
- e["outputs"].get<OutputsSpec>()
+ e["outputs"].get<ExtendedOutputsSpec>()
};
}
elements.emplace_back(std::move(element));
@@ -308,12 +308,12 @@ struct CmdProfileInstall : InstallablesCommand, MixDefaultProfile
auto & [res, info] = builtPaths[installable.get()];
- if (info.originalRef && info.resolvedRef && info.attrPath && info.outputsSpec) {
+ if (info.originalRef && info.resolvedRef && info.attrPath && info.extendedOutputsSpec) {
element.source = ProfileElementSource {
.originalRef = *info.originalRef,
.resolvedRef = *info.resolvedRef,
.attrPath = *info.attrPath,
- .outputs = *info.outputsSpec,
+ .outputs = *info.extendedOutputsSpec,
};
}
@@ -497,7 +497,7 @@ struct CmdProfileUpgrade : virtual SourceExprCommand, MixDefaultProfile, MixProf
.originalRef = installable->flakeRef,
.resolvedRef = *info.resolvedRef,
.attrPath = *info.attrPath,
- .outputs = installable->outputsSpec,
+ .outputs = installable->extendedOutputsSpec,
};
installables.push_back(installable);