ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

hydra-eval-jobs: fix build against nix 2.24

Browse Source
This commit is contained in:
Jörg Thalheim 2024-09-20 08:49:46 +02:00
parent ae787e5799
commit 0231453cc5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hydra-eval-jobs/Makefile.am
View File

@ -1,5 +1,5 @@
bin_PROGRAMS = hydra-eval-jobs bin_PROGRAMS = hydra-eval-jobs
hydra_eval_jobs_SOURCES = hydra-eval-jobs.cc hydra_eval_jobs_SOURCES = hydra-eval-jobs.cc
hydra_eval_jobs_LDADD = $(NIX_LIBS) -lnixcmd hydra_eval_jobs_LDADD = $(NIX_LIBS) -lnixcmd -lnixflake
hydra_eval_jobs_CXXFLAGS = $(NIX_CFLAGS) -I ../libhydra hydra_eval_jobs_CXXFLAGS = $(NIX_CFLAGS) -I ../libhydra

14
src/hydra-eval-jobs/hydra-eval-jobs.cc
View File

@ -6,6 +6,7 @@
#include "shared.hh" #include "shared.hh"
#include "store-api.hh" #include "store-api.hh"
#include "eval.hh" #include "eval.hh"
#include "eval-gc.hh"
#include "eval-inline.hh" #include "eval-inline.hh"
#include "eval-settings.hh" #include "eval-settings.hh"
#include "signals.hh" #include "signals.hh"
@ -125,11 +126,14 @@ static void worker(
if (myArgs.flake) { if (myArgs.flake) {
using namespace flake; using namespace flake;
auto flakeRef = parseFlakeRef(myArgs.releaseExpr); auto [flakeRef, fragment, outputSpec] = parseFlakeRefWithFragmentAndExtendedOutputsSpec(fetchSettings, myArgs.releaseExpr, absPath("."));
auto vFlake = state.allocValue(); auto vFlake = state.allocValue();
auto lockedFlake = lockFlake(state, flakeRef, auto lockedFlake = lockFlake(
flakeSettings,
state,
flakeRef,
LockFlags { LockFlags {
.updateLockFile = false, .updateLockFile = false,
.useRegistries = false, .useRegistries = false,
@ -368,7 +372,11 @@ int main(int argc, char * * argv)
]() ]()
{ {
try { try {
EvalState state(myArgs.lookupPath, openStore()); auto evalStore = myArgs.evalStoreUrl
? openStore(*myArgs.evalStoreUrl)
: openStore();
EvalState state(myArgs.lookupPath,
evalStore, fetchSettings, evalSettings);
Bindings & autoArgs = *myArgs.getAutoArgs(state); Bindings & autoArgs = *myArgs.getAutoArgs(state);
worker(state, autoArgs, *to, *from); worker(state, autoArgs, *to, *from);
} catch (Error & e) { } catch (Error & e) {