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

Fix formatting

Browse source
This commit is contained in:
Andrea Bedini 2023-07-14 14:50:35 +08:00 committed by mergify[bot]
parent 22a2008a68
commit f88571cfc9
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,12 +54,10 @@ struct MyArgs : MixEvalArgs, MixCommonArgs {
size_t maxMemorySize = 4096; size_t maxMemorySize = 4096;
// usually in MixFlakeOptions // usually in MixFlakeOptions
flake::LockFlags lockFlags = { flake::LockFlags lockFlags = {.updateLockFile = false,
.updateLockFile = false,
.writeLockFile = false, .writeLockFile = false,
.useRegistries = false, .useRegistries = false,
.allowUnlocked = false .allowUnlocked = false};
};
MyArgs() : MixCommonArgs("nix-eval-jobs") { MyArgs() : MixCommonArgs("nix-eval-jobs") {
addFlag({ addFlag({
@ -136,7 +134,8 @@ struct MyArgs : MixEvalArgs, MixCommonArgs {
// usually in MixFlakeOptions // usually in MixFlakeOptions
addFlag({ addFlag({
.longName = "override-input", .longName = "override-input",
.description = "Override a specific flake input (e.g. `dwarffs/nixpkgs`).", .description =
"Override a specific flake input (e.g. `dwarffs/nixpkgs`).",
.category = category, .category = category,
.labels = {"input-path", "flake-url"}, .labels = {"input-path", "flake-url"},
.handler = {[&](std::string inputPath, std::string flakeRef) { .handler = {[&](std::string inputPath, std::string flakeRef) {
@ -284,12 +283,11 @@ static void worker(ref<EvalState> state, Bindings &autoArgs, AutoCloseFD &to,
nix::Value *vRoot = [&]() { nix::Value *vRoot = [&]() {
if (myArgs.flake) { if (myArgs.flake) {
auto [flakeRef, fragment, outputSpec] = auto [flakeRef, fragment, outputSpec] =
parseFlakeRefWithFragmentAndExtendedOutputsSpec(myArgs.releaseExpr, parseFlakeRefWithFragmentAndExtendedOutputsSpec(
absPath(".")); myArgs.releaseExpr, absPath("."));
InstallableFlake flake{ InstallableFlake flake{
{}, state, std::move(flakeRef), fragment, {}, state, std::move(flakeRef), fragment, outputSpec,
outputSpec, {}, {}, myArgs.lockFlags {}, {}, myArgs.lockFlags};
};
return flake.toValue(*state).first; return flake.toValue(*state).first;
} else { } else {