Skip to content

Commit

Permalink
Use nix::ParsedDerivation::getRequiredSystemFeatures()
Browse files Browse the repository at this point in the history
A slight dedup, and also ensures that floating CA derivations require a
`ca-derivations` experimental feature. This fixes the scheduling issue
that @SuperSandro2000 found.
  • Loading branch information
Ericson2314 committed Jan 25, 2024
1 parent d45e14f commit 07cb5d1
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/hydra-queue-runner/queue-monitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,7 @@ Step::ptr State::createStep(ref<Store> destStore,

step->systemType = step->drv->platform;
{
auto i = step->drv->env.find("requiredSystemFeatures");
StringSet features;
if (i != step->drv->env.end())
features = step->requiredSystemFeatures = tokenizeString<std::set<std::string>>(i->second);
StringSet features = step->requiredSystemFeatures = step->parsedDrv->getRequiredSystemFeatures();
if (step->preferLocalBuild)
features.insert("local");
if (!features.empty()) {
Expand Down

0 comments on commit 07cb5d1

Please sign in to comment.