wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-05 16:31:47 +02:00
Code Activity

Mis-read Eelko's request to not make this an option: now, let's not make

Browse source 
it an option. :)
This commit is contained in:
Christian Theune 2015-05-20 17:29:52 +02:00
parent ea39c98d41
commit 12a888894b
6 changed files with 16 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/nix-env/nix-env.cc
View file

@ -58,7 +58,6 @@ struct Globals
bool removeAll;
string forceName;
bool prebuiltOnly;
bool lazyGeneration;
};
@ -511,7 +510,7 @@ static void installDerivations(Globals & globals,
if (globals.dryRun) return;
if (createUserEnv(*globals.state, allElems,
profile, settings.envKeepDerivations, lockToken, globals.lazyGeneration)) break;
profile, settings.envKeepDerivations, lockToken)) break;
}
}
@ -525,8 +524,6 @@ static void opInstall(Globals & globals, Strings opFlags, Strings opArgs)
globals.preserveInstalled = true;
else if (arg == "--remove-all" || arg == "-r")
globals.removeAll = true;
else if (arg == "--lazy-generation")
globals.lazyGeneration = true;
else throw UsageError(format("unknown flag ‘%1%’") % arg);
}
@ -620,7 +617,7 @@ static void upgradeDerivations(Globals & globals,
if (globals.dryRun) return;
if (createUserEnv(*globals.state, newElems,
globals.profile, settings.envKeepDerivations, lockToken, globals.lazyGeneration)) break;
globals.profile, settings.envKeepDerivations, lockToken)) break;
}
}
@ -684,7 +681,7 @@ static void opSetFlag(Globals & globals, Strings opFlags, Strings opArgs)
/* Write the new user environment. */
if (createUserEnv(*globals.state, installedElems,
globals.profile, settings.envKeepDerivations, lockToken, globals.lazyGeneration)) break;
globals.profile, settings.envKeepDerivations, lockToken)) break;
}
}
@ -721,8 +718,7 @@ static void opSet(Globals & globals, Strings opFlags, Strings opArgs)
}
debug(format("switching to new user environment"));
Path generation = createGeneration(globals.profile, drv.queryOutPath(),
globals.lazyGeneration);
Path generation = createGeneration(globals.profile, drv.queryOutPath());
switchLink(globals.profile, generation);
}
@ -755,7 +751,7 @@ static void uninstallDerivations(Globals & globals, Strings & selectors,
if (globals.dryRun) return;
if (createUserEnv(*globals.state, newElems,
profile, settings.envKeepDerivations, lockToken, globals.lazyGeneration)) break;
profile, settings.envKeepDerivations, lockToken)) break;
}
}
@ -1359,7 +1355,6 @@ int main(int argc, char * * argv)
globals.preserveInstalled = false;
globals.removeAll = false;
globals.prebuiltOnly = false;
globals.lazyGeneration = false;
parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) {
Operation oldOp = op;