From b80e4b57dae78490ed644a2e2a840dae39d1da4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 10 Jan 2023 14:52:49 +0100
Subject: [PATCH] ExtraInfo -> ExtraPathInfo

---
 src/libcmd/installables.cc | 2 +-
 src/libcmd/installables.hh | 6 +++---
 src/nix/profile.cc         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc
index f5a436fbe..280212379 100644
--- a/src/libcmd/installables.cc
+++ b/src/libcmd/installables.cc
@@ -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;
     };
 
diff --git a/src/libcmd/installables.hh b/src/libcmd/installables.hh
index 95ab4a40e..250cf7e83 100644
--- a/src/libcmd/installables.hh
+++ b/src/libcmd/installables.hh
@@ -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;
 };
 
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
index db702db1b..3da47568c 100644
--- a/src/nix/profile.cc
+++ b/src/nix/profile.cc
@@ -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