delroth/nix-eval-jobs
0
0
Fork 0
forked from lix-project/nix-eval-jobs
Code Pull requests Activity

Merge pull request #16 from tomberek/outPath

Browse source 
use outPath
This commit is contained in:
Jörg Thalheim 2022-01-05 23:20:38 +00:00 committed by GitHub
parent 77aa769aef d36d77c873
commit 0570194d0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,11 +173,14 @@ static void worker(
auto drvPath = drv->queryDrvPath(); auto drvPath = drv->queryDrvPath();
auto localStore = state.store.dynamic_pointer_cast<LocalFSStore>(); auto localStore = state.store.dynamic_pointer_cast<LocalFSStore>();
auto storePath = localStore->parseStorePath(drvPath); auto storePath = localStore->parseStorePath(drvPath);
auto outputs = drv->queryOutputs(false);
reply["name"] = drv->queryName(); reply["name"] = drv->queryName();
reply["system"] = drv->querySystem(); reply["system"] = drv->querySystem();
reply["drvPath"] = drvPath; reply["drvPath"] = drvPath;
reply["storePath"] = localStore->printStorePath(storePath); for (auto out : outputs){
reply["outputs"][out.first] = out.second;
}
nlohmann::json meta; nlohmann::json meta;
for (auto & name : drv->queryMetaNames()) { for (auto & name : drv->queryMetaNames()) {

2
tests/test_eval.py
View file

@ -28,7 +28,7 @@ def common_test(extra_args: List[str]) -> None:
built_job = results[0] built_job = results[0]
assert built_job["attr"] == "builtJob" assert built_job["attr"] == "builtJob"
assert built_job["name"] == "job1" assert built_job["name"] == "job1"
assert built_job["storePath"].startswith("/nix/store") assert built_job["outputs"]["out"].startswith("/nix/store")
assert built_job["drvPath"].endswith(".drv") assert built_job["drvPath"].endswith(".drv")