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

Merge pull request #117 from nix-community/ci

Browse source 
Also accept relative gc root directories
This commit is contained in:
Jörg Thalheim 2022-09-20 20:23:31 +02:00 committed by GitHub
parent 884eb9c7a0 47a74fed83
commit f812e26737
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
#include <map> #include <map>
#include <iostream> #include <iostream>
#include <thread> #include <thread>
#include <filesystem>
#include <nix/config.h> #include <nix/config.h>
#include <nix/shared.hh> #include <nix/shared.hh>
@ -217,11 +218,11 @@ struct Drv {
if (myArgs.meta) { if (myArgs.meta) {
nlohmann::json meta_; nlohmann::json meta_;
for (auto &name : drvInfo.queryMetaNames()) { for (auto &metaName : drvInfo.queryMetaNames()) {
PathSet context; PathSet context;
std::stringstream ss; std::stringstream ss;
auto metaValue = drvInfo.queryMeta(name); auto metaValue = drvInfo.queryMeta(metaName);
// Skip non-serialisable types // Skip non-serialisable types
// TODO: Fix serialisation of derivations to store paths // TODO: Fix serialisation of derivations to store paths
if (metaValue == 0) { if (metaValue == 0) {
@ -230,7 +231,7 @@ struct Drv {
printValueAsJSON(state, true, *metaValue, noPos, ss, context); printValueAsJSON(state, true, *metaValue, noPos, ss, context);
meta_[name] = nlohmann::json::parse(ss.str()); meta_[metaName] = nlohmann::json::parse(ss.str());
} }
meta = meta_; meta = meta_;
} }
@ -535,8 +536,11 @@ int main(int argc, char **argv) {
if (myArgs.releaseExpr == "") if (myArgs.releaseExpr == "")
throw UsageError("no expression specified"); throw UsageError("no expression specified");
if (myArgs.gcRootsDir == "") if (myArgs.gcRootsDir == "") {
printMsg(lvlError, "warning: `--gc-roots-dir' not specified"); printMsg(lvlError, "warning: `--gc-roots-dir' not specified");
} else {
myArgs.gcRootsDir = std::filesystem::absolute(myArgs.gcRootsDir);
}
if (myArgs.showTrace) { if (myArgs.showTrace) {
loggerSettings.showTrace.assign(true); loggerSettings.showTrace.assign(true);