lix-project/nix-eval-jobs
2
1
Fork 3
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #129 from nix-community/force-recurse

Browse source 
Add parameter to force recursion (don't honour recurseIntoAttrs)
This commit is contained in:
adisbladis 2022-10-18 14:48:47 +13:00 committed by GitHub
parent 016dae9811 b9836f2e06
commit 45aeab7a47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nix-eval-jobs.cc
View file

@ -45,6 +45,7 @@ struct MyArgs : MixEvalArgs, MixCommonArgs {
bool meta = false; bool meta = false;
bool showTrace = false; bool showTrace = false;
bool impure = false; bool impure = false;
bool forceRecurse = false;
bool checkCacheStatus = false; bool checkCacheStatus = false;
size_t nrWorkers = 1; size_t nrWorkers = 1;
size_t maxMemorySize = 4096; size_t maxMemorySize = 4096;
@ -70,6 +71,11 @@ struct MyArgs : MixEvalArgs, MixCommonArgs {
.description = "allow impure expressions", .description = "allow impure expressions",
.handler = {&impure, true}}); .handler = {&impure, true}});
addFlag(
{.longName = "force-recurse",
.description = "force recursion (don't respect recurseIntoAttrs)",
.handler = {&forceRecurse, true}});
addFlag({.longName = "gc-roots-dir", addFlag({.longName = "gc-roots-dir",
.description = "garbage collector roots directory", .description = "garbage collector roots directory",
.labels = {"path"}, .labels = {"path"},
@ -321,6 +327,7 @@ static void worker(EvalState &state, Bindings &autoArgs, AutoCloseFD &to,
} else { } else {
auto attrs = nlohmann::json::array(); auto attrs = nlohmann::json::array();
bool recurse = bool recurse =
myArgs.forceRecurse ||
path.size() == 0; // Dont require `recurseForDerivations path.size() == 0; // Dont require `recurseForDerivations
// = true;` for top-level attrset // = true;` for top-level attrset