lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #7755 from obsidiansystems/mix-read-only-mode

Browse source 
Make `--read-only` a separate mixin
This commit is contained in:
Théophane Hufschmitt 2023-02-21 16:13:48 +01:00 committed by GitHub
parent 532c70f531 0258ac9c2a
commit c7885ab6f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libcmd/command.hh
View file

@ -94,9 +94,8 @@ struct SourceExprCommand : virtual Args, MixFlakeOptions
{ {
std::optional<Path> file; std::optional<Path> file;
std::optional<std::string> expr; std::optional<std::string> expr;
bool readOnlyMode = false;
SourceExprCommand(bool supportReadOnlyMode = false); SourceExprCommand();
std::vector<std::shared_ptr<Installable>> parseInstallables( std::vector<std::shared_ptr<Installable>> parseInstallables(
ref<Store> store, std::vector<std::string> ss); ref<Store> store, std::vector<std::string> ss);
@ -111,6 +110,11 @@ struct SourceExprCommand : virtual Args, MixFlakeOptions
void completeInstallable(std::string_view prefix); void completeInstallable(std::string_view prefix);
}; };
struct MixReadOnlyOption : virtual Args
{
MixReadOnlyOption();
};
/* A command that operates on a list of "installables", which can be /* A command that operates on a list of "installables", which can be
store paths, attribute paths, Nix expressions, etc. */ store paths, attribute paths, Nix expressions, etc. */
struct InstallablesCommand : virtual Args, SourceExprCommand struct InstallablesCommand : virtual Args, SourceExprCommand
@ -136,7 +140,7 @@ struct InstallableCommand : virtual Args, SourceExprCommand
{ {
std::shared_ptr<Installable> installable; std::shared_ptr<Installable> installable;
InstallableCommand(bool supportReadOnlyMode = false); InstallableCommand();
void prepare() override; void prepare() override;

31
src/libcmd/installables.cc
View file

@ -147,7 +147,7 @@ void MixFlakeOptions::completionHook()
completeFlakeInput(*prefix); completeFlakeInput(*prefix);
} }
SourceExprCommand::SourceExprCommand(bool supportReadOnlyMode) SourceExprCommand::SourceExprCommand()
{ {
addFlag({ addFlag({
.longName = "file", .longName = "file",
@ -169,17 +169,18 @@ SourceExprCommand::SourceExprCommand(bool supportReadOnlyMode)
.labels = {"expr"}, .labels = {"expr"},
.handler = {&expr} .handler = {&expr}
}); });
}
if (supportReadOnlyMode) { MixReadOnlyOption::MixReadOnlyOption()
addFlag({ {
.longName = "read-only", addFlag({
.description = .longName = "read-only",
"Do not instantiate each evaluated derivation. " .description =
"This improves performance, but can cause errors when accessing " "Do not instantiate each evaluated derivation. "
"store paths of derivations during evaluation.", "This improves performance, but can cause errors when accessing "
.handler = {&readOnlyMode, true}, "store paths of derivations during evaluation.",
}); .handler = {&settings.readOnlyMode, true},
} });
} }
Strings SourceExprCommand::getDefaultFlakeAttrPaths() Strings SourceExprCommand::getDefaultFlakeAttrPaths()
@ -426,10 +427,6 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
{ {
std::vector<std::shared_ptr<Installable>> result; std::vector<std::shared_ptr<Installable>> result;
if (readOnlyMode) {
settings.readOnlyMode = true;
}
if (file || expr) { if (file || expr) {
if (file && expr) if (file && expr)
throw UsageError("'--file' and '--expr' are exclusive"); throw UsageError("'--file' and '--expr' are exclusive");
@ -724,8 +721,8 @@ std::vector<std::string> InstallablesCommand::getFlakesForCompletion()
return _installables; return _installables;
} }
InstallableCommand::InstallableCommand(bool supportReadOnlyMode) InstallableCommand::InstallableCommand()
: SourceExprCommand(supportReadOnlyMode) : SourceExprCommand()
{ {
expectArgs({ expectArgs({
.label = "installable", .label = "installable",

4
src/nix/eval.cc
View file

@ -11,13 +11,13 @@
using namespace nix; using namespace nix;
struct CmdEval : MixJSON, InstallableCommand struct CmdEval : MixJSON, InstallableCommand, MixReadOnlyOption
{ {
bool raw = false; bool raw = false;
std::optional<std::string> apply; std::optional<std::string> apply;
std::optional<Path> writeTo; std::optional<Path> writeTo;
CmdEval() : InstallableCommand(true /* supportReadOnlyMode */) CmdEval() : InstallableCommand()
{ {
addFlag({ addFlag({
.longName = "raw", .longName = "raw",