lix-project/lix-releng-staging
0
0
Fork 0
Code Packages 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
{
ExtraInfo info;
ExtraPathInfo info;
std::shared_ptr<Installable> installable;
};

6
src/libcmd/installables.hh
View file

@ -52,7 +52,7 @@ enum class OperateOn {
Derivation
};
struct ExtraInfo
struct ExtraPathInfo
{
std::optional<NixInt> priority;
std::optional<FlakeRef> originalRef;
@ -67,13 +67,13 @@ struct ExtraInfo
struct DerivedPathWithInfo
{
DerivedPath path;
ExtraInfo info;
ExtraPathInfo info;
};
struct BuiltPathWithResult
{
BuiltPath path;
ExtraInfo info;
ExtraPathInfo info;
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(
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) {
auto & r = res[installable.get()];
/* Note that there could be conflicting info