grahamc/hydra - Change YSZQ3ORRQ6ELPGEQMXO4IEVD5BT2JRXUPJ44K52DLDFTAJLHKQVAC

Fix build

Created by Eelco Dolstra on June 23, 2020

YSZQ3ORRQ6ELPGEQMXO4IEVD5BT2JRXUPJ44K52DLDFTAJLHKQVAC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/hydra-eval-jobs/Makefile.am at line 4 [6.312]
B:BD[6.390] → [6.390:436]
```
hydra_eval_jobs_LDADD = $(NIX_LIBS) -lnixrust
```
[6.390]
[6.436]
```
hydra_eval_jobs_LDADD = $(NIX_LIBS)
```

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 475 [6.530]

B:BD[4.14370] → [4.14370:14466]

                drv.outputs.insert_or_assign("out", DerivationOutput(outPath.clone(), "", ""));

[4.14370]

[4.14466]

                drv.outputs.insert_or_assign("out", DerivationOutput {
                    .path = outPath,
                    .hashAlgo = "",
                    .hash = ""
                });

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 143 [7.575]

B:BD[7.3096] → [7.3096:3170]

            throw SysError(format("executing ‘%1%’") % args.front());

[7.3096]

[7.3170]

            throw SysError("executing ‘%1%’", args.front());

Deletion in src/hydra-queue-runner/Makefile.am at line 6 [10.219]
B:BD[8.59] → [9.263:319]
```
hydra_queue_runner_LDADD = $(NIX_LIBS) -lpqxx -lnixrust
```
Resurrecting zombie bytes in src/hydra-queue-runner/Makefile.am at line 6 [10.219]
∅:∅[9.319] → [11.92:186]
B:B[10.368] → [11.92:186]
BD:B[10.368] → [11.92:186]
```
hydra_queue_runner_CXXFLAGS = $(NIX_CFLAGS) -Wall -I ../libhydra -Wno-deprecated-declarations
```
Insertion in src/hydra-queue-runner/Makefile.am at line 6 [10.219]
[8.59]
[11.92]
```
hydra_queue_runner_LDADD = $(NIX_LIBS) -lpqxx
```
Deletion in src/hydra-queue-runner/Makefile.am at line 8 [10.219]
B:BD[8.59] → [12.770:826]
BD:BD[8.59] → [12.770:826]
∅:D[12.826] → [13.92:186]
B:BD[10.368] → [13.92:186]
BD:BD[10.368] → [13.92:186]
```
hydra_queue_runner_LDADD = $(NIX_LIBS) -lpqxx -lnixrust
hydra_queue_runner_CXXFLAGS = $(NIX_CFLAGS) -Wall -I ../libhydra -Wno-deprecated-declarations
```
Solving an order conflict in src/hydra-queue-runner/Makefile.am at line 8 [10.219]
[11.186]

Replacement in src/hydra-queue-runner/build-remote.cc at line 111 [15.85]

B:BD[14.214] → [9.659:719]

        if (!present.count(*i)) missing.insert(i->clone());

[14.214]

[16.398]

        if (!present.count(*i)) missing.insert(*i);

Replacement in src/hydra-queue-runner/build-remote.cc at line 113 [15.85]

∅:D[16.614] → [17.0:78]

B:BD[15.2296] → [17.0:78]

    printMsg(lvlDebug, format("sending %1% missing paths") % missing.size());

[16.399]

[14.285]

    printMsg(lvlDebug, "sending %d missing paths", missing.size());

Replacement in src/hydra-queue-runner/build-remote.cc at line 142 [15.85]

B:BD[18.403] → [18.403:491]

    if (!logFD) throw SysError(format("creating log file ‘%1%’") % result.logFile);

[18.403]

[15.3246]

    if (!logFD) throw SysError("creating log file ‘%s’", result.logFile);

Replacement in src/hydra-queue-runner/build-remote.cc at line 190 [15.85]

B:BD[19.570] → [19.570:689]

                throw Error(format("protocol mismatch with ‘nix-store --serve’ on ‘%1%’") % machine->sshName);

[19.570]

[19.689]

                throw Error("protocol mismatch with ‘nix-store --serve’ on ‘%1%’", machine->sshName);

Replacement in src/hydra-queue-runner/build-remote.cc at line 193 [15.85]

B:BD[19.792] → [19.792:917]

                throw Error(format("unsupported ‘nix-store --serve’ protocol version on ‘%1%’") % machine->sshName);

[19.792]

[20.39]

                throw Error("unsupported ‘nix-store --serve’ protocol version on ‘%1%’", machine->sshName);

Replacement in src/hydra-queue-runner/build-remote.cc at line 206 [15.85]

B:BD[19.1138] → [19.1138:1230]

            throw Error(format("cannot connect to ‘%1%’: %2%") % machine->sshName % s);

[19.1138]

[19.1230]

            throw Error("cannot connect to ‘%1%’: %2%", machine->sshName, s);

Replacement in src/hydra-queue-runner/build-remote.cc at line 225 [15.85]
B:BD[19.1731] → [12.1348:1398]
```
            inputs.insert(step->drvPath.clone());
```
[19.1731]
[19.1773]
```
            inputs.insert(step->drvPath);
```
Replacement in src/hydra-queue-runner/build-remote.cc at line 228 [15.85]
B:BD[9.942] → [9.942:984]
```
                inputs.insert(p.clone());
```
[9.942]
[21.797]
```
                inputs.insert(p);
```

Replacement in src/hydra-queue-runner/build-remote.cc at line 235 [15.85]

B:BD[19.2132] → [9.1138:1260]

                inputs.insert(i->second.path.clone());
                basicDrv.inputSrcs.insert(i->second.path.clone());

[19.2132]

[19.2238]

                inputs.insert(i->second.path);
                basicDrv.inputSrcs.insert(i->second.path);

Replacement in src/hydra-queue-runner/build-remote.cc at line 285 [15.85]

B:BD[12.2237] → [12.2237:2309]

            writeStorePaths(*localStore, to, singleton(step->drvPath));

[12.2237]

[12.2309]

            writeStorePaths(*localStore, to, {step->drvPath});

Replacement in src/hydra-queue-runner/build-remote.cc at line 309 [15.85]

B:BD[19.4028] → [19.4028:4136]

                result.errorMsg = (format("%1% on ‘%2%’") % readString(from) % machine->sshName).str();

[19.4028]

[19.4136]

                result.errorMsg = fmt("%s on ‘%s’", readString(from), machine->sshName);

Replacement in src/hydra-queue-runner/build-remote.cc at line 475 [15.85]

∅:D[22.129] → [19.9980:10089]

B:BD[19.9980] → [19.9980:10089]

            printMsg(lvlInfo, format("will disable machine ‘%1%’ for %2%s") % machine->sshName % delta);

[22.129]

[19.10089]

            printMsg(lvlInfo, "will disable machine ‘%1%’ for %2%s", machine->sshName, delta);

Deletion in src/hydra-queue-runner/build-result.cc at line 17 [10.441]
B:BD[10.666] → [9.2743:2807]
```
    auto outputs = drv.outputPaths();
    StorePathSet closure;
```

Replacement in src/hydra-queue-runner/build-result.cc at line 20 [10.441]

B:BD[10.824] → [9.2808:2869]

B:BD[10.824] → [12.3315:3376]

        store->computeFSClosure(singleton(output), closure);
        store->computeFSClosure(singleton(output), closure);

[10.824]

[10.875]

        store->computeFSClosure(output, closure);

Deletion in src/hydra-queue-runner/build-result.cc at line 25 [10.441]
B:BD[23.42] → [12.3377:3437]
```
        if (outputs.count(path)) res.size += info->narSize;
```
Solving an order conflict in src/hydra-queue-runner/build-result.cc at line 25 [10.441]
[9.2930]
[10.1073]

Deletion in src/hydra-queue-runner/build-result.cc at line 40 [10.441]

B:BD[10.1182] → [9.2931:3045]

        auto outputS = store->printStorePath(output);
        Path failedFile = outputS + "/nix-support/failed";

Deletion in src/hydra-queue-runner/build-result.cc at line 46 [10.441]
B:BD[24.114] → [9.3046:3121]
```
        Path productsFile = outputS + "/nix-support/hydra-build-products";
```

Deletion in src/hydra-queue-runner/build-result.cc at line 75 [10.441]

B:BD[10.2629] → [9.3122:3228]

            product.name = product.path == store->printStorePath(output) ? "" : baseNameOf(product.path);

Deletion in src/hydra-queue-runner/build-result.cc at line 94 [10.441]
B:BD[10.3446] → [9.3229:3299]
```
            product.path = store->printStorePath(output.second.path);
```
Deletion in src/hydra-queue-runner/build-result.cc at line 97 [10.441]
B:BD[10.3606] → [9.3300:3354]
```
            product.name = output.second.path.name();
```
Deletion in src/hydra-queue-runner/build-result.cc at line 101 [10.441]
B:BD[25.1292] → [9.3355:3428]
```
                throw Error("getting status of ‘%s’", product.path);
```
Deletion in src/hydra-queue-runner/build-result.cc at line 109 [10.441]
B:BD[10.4043] → [9.3429:3513]
```
        auto p = store->printStorePath(output) + "/nix-support/hydra-release-name";
```
Deletion in src/hydra-queue-runner/build-result.cc at line 119 [10.441]
B:BD[26.664] → [9.3514:3603]
```
        auto metricsFile = store->printStorePath(output) + "/nix-support/hydra-metrics";
```
Replacement in src/hydra-queue-runner/builder.cc at line 143 [28.133]
B:BD[27.611] → [9.4194:4241]
```
        buildDrvPath = build->drvPath.clone();
```
[27.611]
[27.650]
```
        buildDrvPath = build->drvPath;
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 190 [10.4840]

B:BD[29.1061] → [29.1061:1153]

                    throw SysError(format("getting stats about ‘%1%’") % machinesFile);

[29.1061]

[29.1153]

                    throw SysError("getting stats about ‘%s’", machinesFile);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 222 [10.4840]

B:BD[30.3492] → [30.3492:3575]

            printMsg(lvlError, format("reloading machines file: %1%") % e.what());

[30.3492]

[2.0]

            printMsg(lvlError, "reloading machines file: %s", e.what());

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 807 [10.4840]

B:BD[31.948] → [31.948:1064]

                    printMsg(lvlError, format("cleaning orphaned step %d of build %d") % step.second % step.first);

[31.948]

[3.7067]

                    printMsg(lvlError, "cleaning orphaned step %d of build %d", step.second, step.first);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 816 [10.4840]

B:BD[31.1436] → [31.1436:1514]

                printMsg(lvlError, format("cleanup thread: %1%") % e.what());

[31.1436]

[31.1514]

                printMsg(lvlError, "cleanup thread: %s", e.what());

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 832 [10.4840]

B:BD[32.494] → [32.494:581]

                printMsg(lvlError, format("connection flush thread: %1%") % e.what());

[32.494]

[31.1641]

                printMsg(lvlError, "connection flush thread: %s", e.what());

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 848 [10.4840]

B:BD[33.727] → [33.727:798]

            printMsg(lvlError, format("main thread: %1%") % e.what());

[33.727]

[33.798]

            printMsg(lvlError, "main thread: %s", e.what());

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 120 [28.20067]

B:BD[34.474] → [12.7285:7366]

            newBuildsByPath.emplace(std::make_pair(build->drvPath.clone(), id));

[34.474]

[28.22852]

            newBuildsByPath.emplace(std::make_pair(build->drvPath, id));

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 405 [28.20067]

B:BD[28.30643] → [35.125:185]

            step = std::make_shared<Step>(drvPath.clone());

[28.30643]

[28.30725]

            step = std::make_shared<Step>(drvPath);

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 419 [28.20067]
B:BD[28.31006] → [12.8687:8744]
```
        steps_->insert_or_assign(drvPath.clone(), step);
```
[28.31006]
[28.31041]
```
        steps_->insert_or_assign(drvPath, step);
```

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 431 [28.20067]

B:BD[9.8448] → [9.8448:8535]

    step->parsedDrv = std::make_unique<ParsedDerivation>(drvPath.clone(), *step->drv);

[9.8448]

[36.0]

    step->parsedDrv = std::make_unique<ParsedDerivation>(drvPath, *step->drv);

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 462 [28.20067]

B:BD[9.8907] → [9.8907:9025]

                DerivationOutput(i.second.path.clone(), std::string(i.second.hashAlgo), std::string(i.second.hash)));

[9.8907]

[37.573]

                DerivationOutput { i.second.path, i.second.hashAlgo, i.second.hash });

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 475 [28.20067]

B:BD[37.962] → [12.9533:9623]

                localStore->querySubstitutablePathInfos(singleton(i.second.path), infos);

[37.962]

[37.1043]

                localStore->querySubstitutablePathInfos({i.second.path}, infos);

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 499 [28.20067]

B:BD[37.1700] → [9.9565:9659]

                    copyClosure(ref<Store>(localStore), destStore, singleton(i.second.path));

[37.1700]

[38.2442]

                    copyClosure(ref<Store>(localStore), destStore, {i.second.path});

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 524 [28.20067]
B:BD[28.32140] → [9.9917:9963]
```
        finishedDrvs.insert(drvPath.clone());
```
[28.32140]
[28.32178]
```
        finishedDrvs.insert(drvPath);
```
Replacement in src/hydra-queue-runner/state.hh at line 211 [39.1128]
B:BD[35.338] → [5.7196:7196]
∅:D[5.7196] → [40.263:329]
B:BD[39.3166] → [40.263:329]
```
    Step(nix::StorePath && drvPath) : drvPath(std::move(drvPath))
```
[35.338]
[40.329]
```
    Step(const nix::StorePath & drvPath) : drvPath(drvPath)
```
Deletion in src/hydra-queue-runner/token-server.hh at line 10 [16.1640]
B:BD[16.1694] → [9.10856:10884]
```
MakeError(NoTokens, Error);
```

Replacement in src/hydra-queue-runner/token-server.hh at line 42 [16.1640]

B:BD[41.2477] → [42.0:112]

                throw NoTokens(format("requesting more tokens (%d) than exist (%d)") % tokens % ts->maxTokens);

[41.2477]

[43.781]

                throw NoTokens("requesting more tokens (%d) than exist (%d)", tokens, ts->maxTokens);

Fix build

Dependencies

In channels

Change contents

Replacement in src/hydra-eval-jobs/Makefile.am at line 4 [6.312]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 475 [6.530]

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 143 [7.575]

Deletion in src/hydra-queue-runner/Makefile.am at line 6 [10.219]

Resurrecting zombie bytes in src/hydra-queue-runner/Makefile.am at line 6 [10.219]

Insertion in src/hydra-queue-runner/Makefile.am at line 6 [10.219]

Deletion in src/hydra-queue-runner/Makefile.am at line 8 [10.219]

Solving an order conflict in src/hydra-queue-runner/Makefile.am at line 8 [10.219]

Replacement in src/hydra-queue-runner/build-remote.cc at line 111 [15.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 113 [15.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 142 [15.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 190 [15.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 193 [15.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 206 [15.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 225 [15.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 228 [15.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 235 [15.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 285 [15.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 309 [15.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 475 [15.85]

Deletion in src/hydra-queue-runner/build-result.cc at line 17 [10.441]

Replacement in src/hydra-queue-runner/build-result.cc at line 20 [10.441]

Deletion in src/hydra-queue-runner/build-result.cc at line 25 [10.441]

Solving an order conflict in src/hydra-queue-runner/build-result.cc at line 25 [10.441]

Deletion in src/hydra-queue-runner/build-result.cc at line 40 [10.441]

Deletion in src/hydra-queue-runner/build-result.cc at line 46 [10.441]

Deletion in src/hydra-queue-runner/build-result.cc at line 75 [10.441]

Deletion in src/hydra-queue-runner/build-result.cc at line 94 [10.441]

Deletion in src/hydra-queue-runner/build-result.cc at line 97 [10.441]

Deletion in src/hydra-queue-runner/build-result.cc at line 101 [10.441]

Deletion in src/hydra-queue-runner/build-result.cc at line 109 [10.441]

Deletion in src/hydra-queue-runner/build-result.cc at line 119 [10.441]

Replacement in src/hydra-queue-runner/builder.cc at line 143 [28.133]