Skip to content

Commit

Permalink
Use StoreConfig::getDefaultSystemFeatures for default machine config
Browse files Browse the repository at this point in the history
We have to oddly make a `StoreConfig` subclass to get it, but
NixOS/nix#9848 will fix that.

The purpose of this is to ensure that, absent an explicit config,
`localhost` includes `ca-derivations` and `recursive-nix` if those
experimental features are enabled.

Very much the complement of NixOS#1342, the previous PR.
  • Loading branch information
Ericson2314 committed Jan 25, 2024
1 parent f6a2b75 commit b1fa6b3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/hydra-queue-runner/hydra-queue-runner.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "state.hh"
#include "hydra-build-result.hh"
#include "store-api.hh"
#include "local-store.hh"
#include "remote-store.hh"

#include "globals.hh"
Expand Down Expand Up @@ -226,7 +227,7 @@ void State::monitorMachinesFile()
parseMachines("localhost " +
(settings.thisSystem == "x86_64-linux" ? "x86_64-linux,i686-linux" : settings.thisSystem.get())
+ " - " + std::to_string(settings.maxBuildJobs) + " 1 "
+ concatStringsSep(",", settings.systemFeatures.get()));
+ concatStringsSep(",", (LocalStoreConfig { {} }).getDefaultSystemFeatures()));
machinesReadyLock.unlock();
return;
}
Expand Down

0 comments on commit b1fa6b3

Please sign in to comment.