aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/libexpr/primops.cc4
-rw-r--r--src/libstore/derivations.cc6
-rw-r--r--src/libstore/derivations.hh4
-rw-r--r--src/nix/develop.cc2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 9b613eef9..bd7ec628c 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -798,7 +798,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
if (!jsonObject) drv.env[i] = "";
drv.outputs.insert_or_assign(i,
DerivationOutput {
- .output = DerivationOutputIntensional {
+ .output = DerivationOutputExtensional {
.path = StorePath::dummy,
},
});
@@ -811,7 +811,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 = DerivationOutputIntensional {
+ .output = DerivationOutputExtensional {
.path = std::move(outPath),
},
});
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index ffeafea87..86f55342d 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, string drvName) const
{
return std::visit(overloaded {
- [](DerivationOutputIntensional doi) {
+ [](DerivationOutputExtensional doi) {
return doi.path;
},
[&](DerivationOutputFixed dof) {
@@ -142,7 +142,7 @@ static DerivationOutput parseDerivationOutput(const Store & store, istringstream
};
} else
return DerivationOutput {
- .output = DerivationOutputIntensional {
+ .output = DerivationOutputExtensional {
.path = std::move(path),
}
};
@@ -450,7 +450,7 @@ static DerivationOutput readDerivationOutput(Source & in, const Store & store)
};
} else
return DerivationOutput {
- .output = DerivationOutputIntensional {
+ .output = DerivationOutputExtensional {
.path = std::move(path),
}
};
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index d8cee0f34..2515188ec 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -13,7 +13,7 @@ namespace nix {
/* Abstract syntax of derivations. */
-struct DerivationOutputIntensional
+struct DerivationOutputExtensional
{
StorePath path;
};
@@ -25,7 +25,7 @@ struct DerivationOutputFixed
struct DerivationOutput
{
- std::variant<DerivationOutputIntensional, DerivationOutputFixed> output;
+ std::variant<DerivationOutputExtensional, DerivationOutputFixed> output;
StorePath path(const Store & store, string drvName) const;
};
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index 929fae5c4..e03d2e057 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 = DerivationOutputIntensional {
+ drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputExtensional {
.path = shellOutPath
} });
drv.env["out"] = store->printStorePath(shellOutPath);