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

Merge pull request #142 from nrdxp/fix-flake-functor

Browse source 
fix: use `InstallableFlake` type & methods
This commit is contained in:
Jörg Thalheim 2022-11-09 18:20:18 +01:00 committed by GitHub
parent 3df51e40ed c8b52f5836
commit f78ff88271
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@
#include <nix/local-fs-store.hh> #include <nix/local-fs-store.hh>
#include <nix/logging.hh> #include <nix/logging.hh>
#include <nix/error.hh> #include <nix/error.hh>
#include <nix/installables.hh>
#include <nix/value-to-json.hh> #include <nix/value-to-json.hh>
@ -148,44 +149,10 @@ static Value *releaseExprTopLevelValue(EvalState &state, Bindings &autoArgs) {
return vRoot; return vRoot;
} }
static Value *flakeTopLevelValue(EvalState &state, Bindings &autoArgs) { Value *topLevelValue(EvalState &state, Bindings &autoArgs,
using namespace flake; std::optional<InstallableFlake> flake) {
return flake.has_value() ? flake.value().toValue(state).first
auto [flakeRef, fragment] = : releaseExprTopLevelValue(state, autoArgs);
parseFlakeRefWithFragment(myArgs.releaseExpr, absPath("."));
auto vFlake = state.allocValue();
auto lockedFlake = lockFlake(state, flakeRef,
LockFlags{
.updateLockFile = false,
.useRegistries = false,
.allowMutable = false,
});
callFlake(state, lockedFlake, *vFlake);
auto vOutputs = vFlake->attrs->get(state.symbols.create("outputs"))->value;
state.forceValue(*vOutputs, noPos);
auto vTop = *vOutputs;
if (fragment.length() > 0) {
Bindings &bindings(*state.allocBindings(0));
auto [nTop, pos] = findAlongAttrPath(state, fragment, bindings, vTop);
if (!nTop)
throw Error("error: attribute '%s' missing", nTop);
vTop = *nTop;
}
auto vRoot = state.allocValue();
state.autoCallFunction(autoArgs, vTop, *vRoot);
return vRoot;
}
Value *topLevelValue(EvalState &state, Bindings &autoArgs) {
return myArgs.flake ? flakeTopLevelValue(state, autoArgs)
: releaseExprTopLevelValue(state, autoArgs);
} }
bool queryIsCached(Store &store, std::map<std::string, std::string> &outputs) { bool queryIsCached(Store &store, std::map<std::string, std::string> &outputs) {
@ -279,7 +246,24 @@ std::string attrPathJoin(json input) {
static void worker(EvalState &state, Bindings &autoArgs, AutoCloseFD &to, static void worker(EvalState &state, Bindings &autoArgs, AutoCloseFD &to,
AutoCloseFD &from) { AutoCloseFD &from) {
auto vRoot = topLevelValue(state, autoArgs);
std::optional<InstallableFlake> flake;
if (myArgs.flake) {
auto [flakeRef, fragment, outputSpec] =
parseFlakeRefWithFragmentAndOutputsSpec(myArgs.releaseExpr,
absPath("."));
flake.emplace(InstallableFlake({}, ref<EvalState>(&state),
std::move(flakeRef), fragment,
outputSpec, {}, {},
flake::LockFlags{
.updateLockFile = false,
.useRegistries = false,
.allowMutable = false,
}));
};
auto vRoot = topLevelValue(state, autoArgs, flake);
while (true) { while (true) {
/* Wait for the collector to send us a job name. */ /* Wait for the collector to send us a job name. */