lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

ExtraInfo -> ExtraPathInfo

Browse source
This commit is contained in:
Eelco Dolstra 2023-01-10 14:52:49 +01:00
parent 8e923bf4c5
commit b80e4b57da
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libcmd/installables.cc
View file

@ -898,7 +898,7 @@ std::vector<std::pair<std::shared_ptr<Installable>, BuiltPathWithResult>> Instal
struct Aux struct Aux
{ {
ExtraInfo info; ExtraPathInfo info;
std::shared_ptr<Installable> installable; std::shared_ptr<Installable> installable;
}; };

6
src/libcmd/installables.hh
View file

@ -52,7 +52,7 @@ enum class OperateOn {
Derivation Derivation
}; };
struct ExtraInfo struct ExtraPathInfo
{ {
std::optional<NixInt> priority; std::optional<NixInt> priority;
std::optional<FlakeRef> originalRef; std::optional<FlakeRef> originalRef;
@ -67,13 +67,13 @@ struct ExtraInfo
struct DerivedPathWithInfo struct DerivedPathWithInfo
{ {
DerivedPath path; DerivedPath path;
ExtraInfo info; ExtraPathInfo info;
}; };
struct BuiltPathWithResult struct BuiltPathWithResult
{ {
BuiltPath path; BuiltPath path;
ExtraInfo info; ExtraPathInfo info;
std::optional<BuildResult> result; std::optional<BuildResult> result;
}; };

4
src/nix/profile.cc
View file

@ -253,11 +253,11 @@ struct ProfileManifest
} }
}; };
static std::map<Installable *, std::pair<BuiltPaths, ExtraInfo>> static std::map<Installable *, std::pair<BuiltPaths, ExtraPathInfo>>
builtPathsPerInstallable( builtPathsPerInstallable(
const std::vector<std::pair<std::shared_ptr<Installable>, BuiltPathWithResult>> & builtPaths) const std::vector<std::pair<std::shared_ptr<Installable>, BuiltPathWithResult>> & builtPaths)
{ {
std::map<Installable *, std::pair<BuiltPaths, ExtraInfo>> res; std::map<Installable *, std::pair<BuiltPaths, ExtraPathInfo>> res;
for (auto & [installable, builtPath] : builtPaths) { for (auto & [installable, builtPath] : builtPaths) {
auto & r = res[installable.get()]; auto & r = res[installable.get()];
/* Note that there could be conflicting info /* Note that there could be conflicting info