From 503b4256903b2cf414a6d697d19be40db299e2c6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 12 Jul 2020 15:56:20 +0000
Subject: [PATCH] DerivationOutputExtensional -> DerivationOutputInputAddressed

Thanks @regnat for the great name.
---
 src/libexpr/primops.cc      | 4 ++--
 src/libstore/derivations.cc | 6 +++---
 src/libstore/derivations.hh | 4 ++--
 src/nix/develop.cc          | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 21bd4fb52..5a9c17814 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -806,7 +806,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
             if (!jsonObject) drv.env[i] = "";
             drv.outputs.insert_or_assign(i,
                 DerivationOutput {
-                    .output = DerivationOutputExtensional {
+                    .output = DerivationOutputInputAddressed {
                         .path = StorePath::dummy,
                     },
                 });
@@ -819,7 +819,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
             if (!jsonObject) drv.env[i] = state.store->printStorePath(outPath);
             drv.outputs.insert_or_assign(i,
                 DerivationOutput {
-                    .output = DerivationOutputExtensional {
+                    .output = DerivationOutputInputAddressed {
                         .path = std::move(outPath),
                     },
                 });
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index f41edd81d..d267468af 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -15,7 +15,7 @@ template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
 StorePath DerivationOutput::path(const Store & store, std::string_view drvName) const
 {
     return std::visit(overloaded {
-        [](DerivationOutputExtensional doi) {
+        [](DerivationOutputInputAddressed doi) {
             return doi.path;
         },
         [&](DerivationOutputFixed dof) {
@@ -142,7 +142,7 @@ static DerivationOutput parseDerivationOutput(const Store & store, istringstream
         };
     } else
         return DerivationOutput {
-            .output = DerivationOutputExtensional {
+            .output = DerivationOutputInputAddressed {
                 .path = std::move(path),
             }
         };
@@ -450,7 +450,7 @@ static DerivationOutput readDerivationOutput(Source & in, const Store & store)
         };
     } else
         return DerivationOutput {
-            .output = DerivationOutputExtensional {
+            .output = DerivationOutputInputAddressed {
                 .path = std::move(path),
             }
         };
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 6d3b54d3f..fd8828373 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -13,7 +13,7 @@ namespace nix {
 
 /* Abstract syntax of derivations. */
 
-struct DerivationOutputExtensional
+struct DerivationOutputInputAddressed
 {
     StorePath path;
 };
@@ -25,7 +25,7 @@ struct DerivationOutputFixed
 
 struct DerivationOutput
 {
-    std::variant<DerivationOutputExtensional, DerivationOutputFixed> output;
+    std::variant<DerivationOutputInputAddressed, DerivationOutputFixed> output;
     StorePath path(const Store & store, std::string_view drvName) const;
 };
 
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index e03d2e057..654f62f38 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -135,7 +135,7 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
     drv.inputSrcs.insert(std::move(getEnvShPath));
     Hash h = hashDerivationModulo(*store, drv, true);
     auto shellOutPath = store->makeOutputPath("out", h, drvName);
-    drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputExtensional {
+    drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputInputAddressed {
                 .path = shellOutPath
             } });
     drv.env["out"] = store->printStorePath(shellOutPath);