lix-project/lix
20
58
Fork 31
Code Issues 355 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge "libcmd: munge evalSettings in the right place" into main

Browse source
This commit is contained in:
jade 2024-12-06 01:25:12 +00:00 committed by Gerrit Code Review
parent 9dd58224ea fb76a4d335
commit 2a9e560570
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lix/libcmd/command.hh
View file

@ -77,7 +77,7 @@ struct EvalCommand : virtual StoreCommand, MixEvalArgs
ref<Store> getEvalStore(); ref<Store> getEvalStore();
ref<eval_cache::CachingEvaluator> getEvaluator(); virtual ref<eval_cache::CachingEvaluator> getEvaluator();
private: private:
std::shared_ptr<Store> evalStore; std::shared_ptr<Store> evalStore;
@ -114,6 +114,8 @@ struct SourceExprCommand : virtual Args, MixFlakeOptions
SourceExprCommand(); SourceExprCommand();
ref<eval_cache::CachingEvaluator> getEvaluator() override;
Installables parseInstallables( Installables parseInstallables(
EvalState & state, ref<Store> store, std::vector<std::string> ss); EvalState & state, ref<Store> store, std::vector<std::string> ss);

18
lix/libcmd/installables.cc
View file

@ -212,9 +212,7 @@ void SourceExprCommand::completeInstallable(EvalState & state, AddCompletions &
if (file) { if (file) {
completions.setType(AddCompletions::Type::Attrs); completions.setType(AddCompletions::Type::Attrs);
evalSettings.pureEval.override(false);
auto evaluator = getEvaluator(); auto evaluator = getEvaluator();
evaluator->paths.allowedPaths.reset();
Expr & e = evaluator->parseExprFromFile( Expr & e = evaluator->parseExprFromFile(
resolveExprPath(evaluator->paths.checkSourcePath(lookupFileArg(*evaluator, *file))) resolveExprPath(evaluator->paths.checkSourcePath(lookupFileArg(*evaluator, *file)))
@ -427,6 +425,16 @@ ref<eval_cache::EvalCache> openEvalCache(
} }
} }
ref<eval_cache::CachingEvaluator> SourceExprCommand::getEvaluator()
{
// FIXME: backward compatibility hack
if (file) {
evalSettings.pureEval.override(false);
}
return EvalCommand::getEvaluator();
}
Installables SourceExprCommand::parseInstallables( Installables SourceExprCommand::parseInstallables(
EvalState & state, ref<Store> store, std::vector<std::string> ss) EvalState & state, ref<Store> store, std::vector<std::string> ss)
{ {
@ -436,12 +444,6 @@ Installables SourceExprCommand::parseInstallables(
if (file && expr) if (file && expr)
throw UsageError("'--file' and '--expr' are exclusive"); throw UsageError("'--file' and '--expr' are exclusive");
// FIXME: backward compatibility hack
if (file) {
evalSettings.pureEval.override(false);
getEvaluator()->paths.allowedPaths.reset();
}
auto evaluator = getEvaluator(); auto evaluator = getEvaluator();
auto vFile = evaluator->mem.allocValue(); auto vFile = evaluator->mem.allocValue();

3
tests/functional/impure-eval.sh
View file

@ -33,3 +33,6 @@ simpleTest 'builtins.currentSystem' 'bar' --eval-system 'bar'
## `eval-system` overrides `system` ## `eval-system` overrides `system`
simpleTest 'builtins.currentSystem' 'bar' --system 'foo' --eval-system 'bar' simpleTest 'builtins.currentSystem' 'bar' --system 'foo' --eval-system 'bar'
simpleTest 'builtins.currentSystem' 'baz' --system 'foo' --eval-system 'baz' simpleTest 'builtins.currentSystem' 'baz' --system 'foo' --eval-system 'baz'
## `-f` honors nix-path
[ "$(nix eval --option nix-path "foo=$PWD" -f '<foo/eval.nix>' attr.foo)" = '"bar"' ]