Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
andreabedini authored and mergify[bot] committed Jul 14, 2023
1 parent 22a2008 commit f88571c
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions src/nix-eval-jobs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,10 @@ struct MyArgs : MixEvalArgs, MixCommonArgs {
size_t maxMemorySize = 4096;

// usually in MixFlakeOptions
flake::LockFlags lockFlags = {
.updateLockFile = false,
.writeLockFile = false,
.useRegistries = false,
.allowUnlocked = false
};
flake::LockFlags lockFlags = {.updateLockFile = false,
.writeLockFile = false,
.useRegistries = false,
.allowUnlocked = false};

MyArgs() : MixCommonArgs("nix-eval-jobs") {
addFlag({
Expand Down Expand Up @@ -136,7 +134,8 @@ struct MyArgs : MixEvalArgs, MixCommonArgs {
// usually in MixFlakeOptions
addFlag({
.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,
.labels = {"input-path", "flake-url"},
.handler = {[&](std::string inputPath, std::string flakeRef) {
Expand Down Expand Up @@ -284,12 +283,11 @@ static void worker(ref<EvalState> state, Bindings &autoArgs, AutoCloseFD &to,
nix::Value *vRoot = [&]() {
if (myArgs.flake) {
auto [flakeRef, fragment, outputSpec] =
parseFlakeRefWithFragmentAndExtendedOutputsSpec(myArgs.releaseExpr,
absPath("."));
InstallableFlake flake {
{}, state, std::move(flakeRef), fragment,
outputSpec, {}, {}, myArgs.lockFlags
};
parseFlakeRefWithFragmentAndExtendedOutputsSpec(
myArgs.releaseExpr, absPath("."));
InstallableFlake flake{
{}, state, std::move(flakeRef), fragment, outputSpec,
{}, {}, myArgs.lockFlags};

return flake.toValue(*state).first;
} else {
Expand Down

0 comments on commit f88571c

Please sign in to comment.