hydra-eval-{jobs,jobset}: Pass file name as <...>
This commit is contained in:
parent
b7bc4384b7
commit
364e21919a
|
@ -175,7 +175,7 @@ int main(int argc, char * * argv)
|
|||
else if (*arg != "" && arg->at(0) == '-')
|
||||
return false;
|
||||
else
|
||||
releaseExpr = absPath(*arg);
|
||||
releaseExpr = *arg;
|
||||
return true;
|
||||
});
|
||||
|
||||
|
@ -197,7 +197,7 @@ int main(int argc, char * * argv)
|
|||
Bindings & autoArgs = *myArgs.getAutoArgs(state);
|
||||
|
||||
Value v;
|
||||
state.evalFile(releaseExpr, v);
|
||||
state.evalFile(lookupFileArg(state, releaseExpr), v);
|
||||
|
||||
JSONObject json(std::cout, true);
|
||||
findJobs(state, json, autoArgs, v, "");
|
||||
|
|
|
@ -358,11 +358,14 @@ sub evalJobs {
|
|||
or die "cannot find the input containing the job expression\n";
|
||||
die "multiple alternatives for the input containing the Nix expression are not supported.\n"
|
||||
if scalar @{$inputInfo->{$nixExprInputName}} != 1;
|
||||
my $nixExprFullPath = $nixExprInput->{storePath} . "/" . $nixExprPath;
|
||||
|
||||
my $evaluator = ($exprType eq "guile") ? "hydra-eval-guile-jobs" : "hydra-eval-jobs";
|
||||
|
||||
my @cmd = ($evaluator, $nixExprFullPath, "--gc-roots-dir", getGCRootsDir, "-j", 1, inputsToArgs($inputInfo, $exprType));
|
||||
my @cmd = ($evaluator,
|
||||
"<" . $nixExprInputName . "/" . $nixExprPath . ">",
|
||||
"--gc-roots-dir", getGCRootsDir,
|
||||
"-j", 1,
|
||||
inputsToArgs($inputInfo, $exprType));
|
||||
|
||||
if (defined $ENV{'HYDRA_DEBUG'}) {
|
||||
sub escape {
|
||||
|
|
Loading…
Reference in a new issue