grahamc/hydra2 - Change 4DHGJ2FLM2QZTDKOYCXJQV4EDLRPOAOT7P7RGACCM5NFRRDX3AZAC

Fix build

Created by Eelco Dolstra on August 27, 2020

4DHGJ2FLM2QZTDKOYCXJQV4EDLRPOAOT7P7RGACCM5NFRRDX3AZAC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 476 [6.530]
∅:D[4.147] → [5.14466:14561]
∅:D[7.232] → [5.14466:14561]
∅:D[2.654] → [5.14466:14561]
B:BD[5.14466] → [5.14466:14561]
```
                auto newDrvPath = store->printStorePath(writeDerivation(store, drv, drvName));
```
[2.654]
[5.14561]
```
                auto newDrvPath = store->printStorePath(writeDerivation(*store, drv));
```

Deletion in src/hydra-queue-runner/build-remote.cc at line 448 [9.85]

B:BD[8.1152] → [8.1152:1278]

                ValidPathInfo info(localStore->parseStorePath(storePathS));
                assert(outputs.count(info.path));

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

B:BD[10.7588] → [8.1279:1362]

                info.references = readStorePaths<StorePathSet>(*localStore, from);

[10.7588]

[10.7646]

                auto references = readStorePaths<StorePathSet>(*localStore, from);

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

B:BD[10.7699] → [8.1363:1460]

B:BD[8.1460] → [3.83:158]

∅:D[3.158] → [8.1525:1593]

B:BD[8.1525] → [8.1525:1593]

                info.narSize = readLongLong(from);
                totalNarSize += info.narSize;
                info.narHash = Hash::parseAny(readString(from), htSHA256);
                info.ca = parseContentAddressOpt(readString(from));

[10.7699]

[8.1593]

                auto narSize = readLongLong(from);
                auto narHash = Hash::parseAny(readString(from), htSHA256);
                auto ca = parseContentAddressOpt(readString(from));

Insertion in src/hydra-queue-runner/build-remote.cc at line 455 [9.85]

[8.1647]

                ValidPathInfo info(localStore->parseStorePath(storePathS), narHash);
                assert(outputs.count(info.path));
                info.references = references;
                info.narSize = narSize;
                totalNarSize += info.narSize;
                info.narHash = narHash;
                info.ca = ca;

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 433 [13.20067]

B:BD[11.1] → [12.219:285]

    step->preferLocalBuild = step->parsedDrv->willBuildLocally();

[11.1]

[14.8536]

    step->preferLocalBuild = step->parsedDrv->willBuildLocally(*localStore);