zebreus/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 1 Activity

Revert "Don't anticipate hash algo without hash in derivation for now"

Browse source 
This reverts commit 3804e3df9b.
This commit is contained in:
Carlo Nucera 2020-07-17 11:33:27 -04:00
parent 487c5751c6
commit 1feb8981df
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/libstore/derivations.cc
View file

@ -387,13 +387,34 @@ bool isDerivation(const string & fileName)
DerivationType BasicDerivation::type() const
{
if (outputs.size() == 1 &&
outputs.begin()->first == "out" &&
std::holds_alternative<DerivationOutputFixed>(outputs.begin()->second.output))
{
std::set<std::string_view> inputAddressedOutputs, fixedCAOutputs;
for (auto & i : outputs) {
std::visit(overloaded {
[&](DerivationOutputInputAddressed _) {
inputAddressedOutputs.insert(i.first);
},
[&](DerivationOutputFixed _) {
fixedCAOutputs.insert(i.first);
},
[&](DerivationOutputFloating _) {
throw Error("Floating CA output derivations are not yet implemented");
},
}, i.second.output);
}
if (inputAddressedOutputs.empty() && fixedCAOutputs.empty()) {
throw Error("Must have at least one output");
} else if (! inputAddressedOutputs.empty() && fixedCAOutputs.empty()) {
return DerivationType::Regular;
} else if (inputAddressedOutputs.empty() && ! fixedCAOutputs.empty()) {
if (fixedCAOutputs.size() > 1)
// FIXME: Experimental feature?
throw Error("Only one fixed output is allowed for now");
if (*fixedCAOutputs.begin() != "out")
throw Error("Single fixed output must be named \"out\"");
return DerivationType::CAFixed;
} else {
return DerivationType::Regular;
throw Error("Can't mix derivation output types");
}
}