aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-07-12 15:56:20 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-07-12 15:56:20 +0000
commit503b4256903b2cf414a6d697d19be40db299e2c6 (patch)
tree814e675ea83c82bacd82bb7bfbff5efcee42ffe3 /src/libstore
parenta8d4707107c39d0258fef17b531ac031dd16ec88 (diff)
DerivationOutputExtensional -> DerivationOutputInputAddressed
Thanks @regnat for the great name.
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/derivations.cc6
-rw-r--r--src/libstore/derivations.hh4
2 files changed, 5 insertions, 5 deletions
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;
};