grahamc/hydra2 - Change ZPHREC7X2TVM4OQJGTPA3Y3WOOJGTV3RXSPRI2ZFTZKIPIRRCUYQC

hydra-eval-jobset: Support flakes

Created by Eelco Dolstra on May 10, 2019

ZPHREC7X2TVM4OQJGTPA3Y3WOOJGTV3RXSPRI2ZFTZKIPIRRCUYQC

Dependencies

In channels

main

Change contents

Replacement in src/script/hydra-eval-jobset at line 355 [4.1319]

B:BD[3.11074] → [3.11074:11144]

    my ($inputInfo, $exprType, $nixExprInputName, $nixExprPath) = @_;

[3.11074]

[4.1424]

    my ($inputInfo, $exprType, $nixExprInputName, $nixExprPath, $flakeRef) = @_;
    my @cmd;

Replacement in src/script/hydra-eval-jobset at line 359 [4.1319]

B:BD[4.1425] → [3.11145:11277]

    my $nixExprInput = $inputInfo->{$nixExprInputName}->[0]
        or die "cannot find the input containing the job expression\n";

[4.1425]

[3.11508]

    if (defined $flakeRef) {
        @cmd = ("hydra-eval-jobs",
                "--flake", $flakeRef,
                "--gc-roots-dir", getGCRootsDir,
                "--max-jobs", 1);
    } else {
        my $nixExprInput = $inputInfo->{$nixExprInputName}->[0]
            or die "cannot find the input containing the job expression\n";

Replacement in src/script/hydra-eval-jobset at line 368 [4.1319]

B:BD[3.11509] → [3.11509:11599]

    my $evaluator = ($exprType eq "guile") ? "hydra-eval-guile-jobs" : "hydra-eval-jobs";

[3.11509]

[3.11599]

        my $evaluator = ($exprType eq "guile") ? "hydra-eval-guile-jobs" : "hydra-eval-jobs";

Replacement in src/script/hydra-eval-jobset at line 370 [4.1319]

B:BD[3.11600] → [2.100:319]

    my @cmd = ($evaluator,
               "<" . $nixExprInputName . "/" . $nixExprPath . ">",
               "--gc-roots-dir", getGCRootsDir,
               "-j", 1,
               inputsToArgs($inputInfo, $exprType));

[3.11600]

[3.11725]

        @cmd = ($evaluator,
                "<" . $nixExprInputName . "/" . $nixExprPath . ">",
                "--gc-roots-dir", getGCRootsDir,
                "--max-jobs", 1,
                inputsToArgs($inputInfo, $exprType));
    }

Replacement in src/script/hydra-eval-jobset at line 388 [4.1319]

B:BD[3.12055] → [3.12055:12146]

    die "$evaluator returned " . ($res & 127 ? "signal $res" : "exit code " . ($res >> 8))

[3.12055]

[3.12146]

    die "hydra-eval-jobs returned " . ($res & 127 ? "signal $res" : "exit code " . ($res >> 8))

Replacement in src/script/hydra-eval-jobset at line 394 [4.1319]
B:BD[3.12266] → [3.12266:12318]
```
    return (decode_json($jobsJSON), $nixExprInput);
```
[3.12266]
[3.12318]
```
    return decode_json($jobsJSON);
```

Replacement in src/script/hydra-eval-jobset at line 412 [4.1319]

B:BD[3.12772] → [3.12772:12887]

    my ($db, $jobset, $inputInfo, $nixExprInput, $buildInfo, $buildMap, $prevEval, $jobOutPathMap, $plugins) = @_;

[3.12772]

[3.12887]

    my ($db, $jobset, $inputInfo, $buildInfo, $buildMap, $prevEval, $jobOutPathMap, $plugins) = @_;

Replacement in src/script/hydra-eval-jobset at line 640 [4.1319]

∅:D[5.217] → [6.2570:2680]

∅:D[7.534] → [6.2570:2680]

B:BD[8.5549] → [6.2570:2680]

    my ($jobs, $nixExprInput) = evalJobs($inputInfo, $exprType, $jobset->nixexprinput, $jobset->nixexprpath);

[5.217]

[5.218]

    my $jobs = evalJobs($inputInfo, $exprType, $jobset->nixexprinput, $jobset->nixexprpath, $jobset->flake);

Replacement in src/script/hydra-eval-jobset at line 685 [4.1319]

∅:D[9.471] → [10.4506:4626]

B:BD[11.2411] → [10.4506:4626]

            checkBuild($db, $jobset, $inputInfo, $nixExprInput, $job, \%buildMap, $prevEval, $jobOutPathMap, $plugins);

[9.471]

[8.5911]

            checkBuild($db, $jobset, $inputInfo, $job, \%buildMap, $prevEval, $jobOutPathMap, $plugins);