From 2c61779816db179c9d6f766e1292fc7408c8cb45 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 11 Sep 2020 20:19:58 +0200 Subject: [PATCH] fix build after nix commit 82b77a77262c414044fffc7ad8b955ad91827995 --- flake.lock | 30 ++++++++++++++++++++------ src/hydra-eval-jobs/hydra-eval-jobs.cc | 2 +- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 05f58e21..a27d3bc9 100644 --- a/flake.lock +++ b/flake.lock @@ -1,15 +1,33 @@ { "nodes": { + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1598296217, + "narHash": "sha256-ha7lyNY1d8m+osmDpPc9f/bfZ3ZC1IVIXwfyklSWg8I=", + "owner": "edolstra", + "repo": "lowdown", + "rev": "c7a4e715af1e233080842db82d15b261cb74cb28", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "no-structs-in-anonymous-unions", + "repo": "lowdown", + "type": "github" + } + }, "nix": { "inputs": { + "lowdown-src": "lowdown-src", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1598539168, - "narHash": "sha256-2i95APppDPjN7wKfgJHlg9r7vU13vOI22iK88mtuvy4=", + "lastModified": 1600084131, + "narHash": "sha256-haVF8TAEj2Uws2dJgCIvq+GAZRe6I+7U85C/7I/0YUU=", "owner": "NixOS", "repo": "nix", - "rev": "eb75282b8dc855983368c79cc4c2943c298518f7", + "rev": "a59e77d9e54e8e7bf0f3c3f40c22cd34b7a81225", "type": "github" }, "original": { @@ -34,11 +52,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1594117931, - "narHash": "sha256-x7nZvITCLJiK7miPXU6yl2zdq+MlhjHicggfvjLguFg=", + "lastModified": 1599903709, + "narHash": "sha256-tinVKY7zRdSXmVOp7BAulNtIb2iP5nvNp5UAxihKXNI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9d124e39dbeefc53c7b3e09fbfc2c26bcbd4845", + "rev": "252bfe0107587d40092057f338e9ffcf7bbd90cb", "type": "github" }, "original": { diff --git a/src/hydra-eval-jobs/hydra-eval-jobs.cc b/src/hydra-eval-jobs/hydra-eval-jobs.cc index 81012b56..4f2ae3be 100644 --- a/src/hydra-eval-jobs/hydra-eval-jobs.cc +++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc @@ -211,7 +211,7 @@ static void worker( if (gcRootsDir != "" && localStore) { Path root = gcRootsDir + "/" + std::string(baseNameOf(drvPath)); if (!pathExists(root)) - localStore->addPermRoot(localStore->parseStorePath(drvPath), root, false); + localStore->addPermRoot(localStore->parseStorePath(drvPath), root); } nlohmann::json out;