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

also expose store path in json

Browse source
This commit is contained in:
Jörg Thalheim 2021-12-31 12:00:04 +01:00
parent 14b78c41aa
commit 26948992b3
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -171,10 +171,13 @@ static void worker(
throw EvalError("derivation must have a 'system' attribute"); throw EvalError("derivation must have a 'system' attribute");
auto drvPath = drv->queryDrvPath(); auto drvPath = drv->queryDrvPath();
auto localStore = state.store.dynamic_pointer_cast<LocalFSStore>();
auto storePath = localStore->parseStorePath(drvPath);
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);
nlohmann::json meta; nlohmann::json meta;
for (auto & name : drv->queryMetaNames()) { for (auto & name : drv->queryMetaNames()) {
@ -196,9 +199,7 @@ static void worker(
/* Register the derivation as a GC root. !!! This /* Register the derivation as a GC root. !!! This
registers roots for jobs that we may have already registers roots for jobs that we may have already
done. */ done. */
auto localStore = state.store.dynamic_pointer_cast<LocalFSStore>(); if (gcRootsDir != "") {
auto storePath = localStore->parseStorePath(drvPath);
if (gcRootsDir != "" && localStore) {
Path root = gcRootsDir + "/" + std::string(baseNameOf(drvPath)); Path root = gcRootsDir + "/" + std::string(baseNameOf(drvPath));
if (!pathExists(root)) if (!pathExists(root))
localStore->addPermRoot(storePath, root); localStore->addPermRoot(storePath, root);

2
tests/test_eval.py
View file

@ -28,6 +28,8 @@ 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["drvPath"].endswith(".drv")
substituted_job = results[1] substituted_job = results[1]