lix-project/hydra
1
0
Fork 1
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1347 from NixOS/simplify-req-features

Browse source 
Simplify `StoreConfig::getDefaultSystemFeatures` call
This commit is contained in:
John Ericson 2024-01-25 16:17:25 -05:00 committed by GitHub
parent 7a6c401d42 c64eed7d07
commit 8a02bb7c36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -42,11 +42,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1705666051, "lastModified": 1706208340,
"narHash": "sha256-C3eht7uA7gZp9O5XpA9Mkqdi1WoTQaFH4FMGmM4DrFM=", "narHash": "sha256-wNyHUEIiKKVs6UXrUzhP7RSJQv0A8jckgcuylzftl8k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "03e96b9dc011a16a0f6db9c7cb021ff93f8dcf88", "rev": "2c4bb93ba5a97e7078896ebc36385ce172960e4e",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -15,7 +15,6 @@
#include "state.hh" #include "state.hh"
#include "hydra-build-result.hh" #include "hydra-build-result.hh"
#include "store-api.hh" #include "store-api.hh"
#include "local-store.hh"
#include "remote-store.hh" #include "remote-store.hh"
#include "globals.hh" #include "globals.hh"
@ -227,7 +226,7 @@ void State::monitorMachinesFile()
parseMachines("localhost " + parseMachines("localhost " +
(settings.thisSystem == "x86_64-linux" ? "x86_64-linux,i686-linux" : settings.thisSystem.get()) (settings.thisSystem == "x86_64-linux" ? "x86_64-linux,i686-linux" : settings.thisSystem.get())
+ " - " + std::to_string(settings.maxBuildJobs) + " 1 " + " - " + std::to_string(settings.maxBuildJobs) + " 1 "
+ concatStringsSep(",", (LocalStoreConfig { {} }).getDefaultSystemFeatures())); + concatStringsSep(",", StoreConfig::getDefaultSystemFeatures()));
machinesReadyLock.unlock(); machinesReadyLock.unlock();
return; return;
} }