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

Merge pull request #203 from nix-community/update_flake_lock_action

Browse source 
flake.lock: Update
This commit is contained in:
mergify[bot] 2023-06-10 11:57:13 +00:00 committed by GitHub
parent a0e0808280 9e8320dbd6
commit fae1660d4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680392223, "lastModified": 1685662779,
"narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1681347147, "lastModified": 1686186815,
"narHash": "sha256-B+hTioRc3Jdf4SJyeCiO0fW5ShIznJk2OTiW2vOV+mc=", "narHash": "sha256-h6OTafX2eLgFQpu5yJf65JHDKrEVoMLLtTn8ksu1+qE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1a9d9175ecc48ecd033062fa09b1834d13ae9c69", "rev": "5715d6b452b97d12c6f9077321d202a0cb50b8fc",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
src/meson.build
View file

@ -13,4 +13,4 @@ executable('nix-eval-jobs', src,
threads_dep threads_dep
], ],
install: true, install: true,
cpp_args: ['-std=c++17', '-fvisibility=hidden']) cpp_args: ['-std=c++2a', '-fvisibility=hidden'])

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

@ -84,11 +84,11 @@ struct MyArgs : MixEvalArgs, MixCommonArgs {
.labels = {"path"}, .labels = {"path"},
.handler = {&gcRootsDir}}); .handler = {&gcRootsDir}});
addFlag( addFlag({.longName = "workers",
{.longName = "workers", .description = "number of evaluate workers",
.description = "number of evaluate workers", .labels = {"workers"},
.labels = {"workers"}, .handler = {
.handler = {[=](std::string s) { nrWorkers = std::stoi(s); }}}); [=, this](std::string s) { nrWorkers = std::stoi(s); }}});
addFlag( addFlag(
{.longName = "max-memory-size", {.longName = "max-memory-size",
@ -96,7 +96,7 @@ struct MyArgs : MixEvalArgs, MixCommonArgs {
"maximum evaluation memory size (4GiB per worker by default)", "maximum evaluation memory size (4GiB per worker by default)",
.labels = {"size"}, .labels = {"size"},
.handler = { .handler = {
[=](std::string s) { maxMemorySize = std::stoi(s); }}}); [=, this](std::string s) { maxMemorySize = std::stoi(s); }}});
addFlag({.longName = "flake", addFlag({.longName = "flake",
.description = "build a flake", .description = "build a flake",
@ -140,7 +140,8 @@ static Value *releaseExprTopLevelValue(EvalState &state, Bindings &autoArgs) {
Value vTop; Value vTop;
if (myArgs.fromArgs) { if (myArgs.fromArgs) {
Expr *e = state.parseExprFromString(myArgs.releaseExpr, absPath(".")); Expr *e = state.parseExprFromString(
myArgs.releaseExpr, state.rootPath(CanonPath::fromCwd()));
state.eval(e, vTop); state.eval(e, vTop);
} else { } else {
state.evalFile(lookupFileArg(state, myArgs.releaseExpr), vTop); state.evalFile(lookupFileArg(state, myArgs.releaseExpr), vTop);
@ -202,7 +203,7 @@ struct Drv {
if (myArgs.meta) { if (myArgs.meta) {
nlohmann::json meta_; nlohmann::json meta_;
for (auto &metaName : drvInfo.queryMetaNames()) { for (auto &metaName : drvInfo.queryMetaNames()) {
PathSet context; NixStringContext context;
std::stringstream ss; std::stringstream ss;
auto metaValue = drvInfo.queryMeta(metaName); auto metaValue = drvInfo.queryMeta(metaName);