grahamc/hydra2 - Change H7SZRHUBSEDJ3PQ3VOV4ZEEFUWTBPGZN53G6W26HHXPJDO7MSHJAC

Use nix::willBuildLocally()

Created by Eelco Dolstra on October 21, 2015

H7SZRHUBSEDJ3PQ3VOV4ZEEFUWTBPGZN53G6W26HHXPJDO7MSHJAC

Dependencies

In channels

main

Change contents

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 24 [7.4840]

B:BD[5.7892] → [6.686:687]

B:BD[8.245] → [8.245:381]


    localPlatforms = {settings.thisSystem};
    if (settings.thisSystem == "x86_64-linux")
        localPlatforms.insert("i686-linux");

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 96 [7.4840]

B:BD[2.309] → [2.309:384]

        parseMachines("localhost " + concatStringsSep(",", localPlatforms)

[2.309]

[2.384]

        parseMachines("localhost " + settings.thisSystem

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 4 [9.20067]
[4.1279]
[9.20115]
```
#include "misc.hh"
```

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 362 [9.20067]

B:BD[3.1] → [3.1:197]

    auto attr = step->drv.env.find("preferLocalBuild");
    step->preferLocalBuild =
        attr != step->drv.env.end() && attr->second == "1"
        && has(localPlatforms, step->drv.platform);

[3.1]

[3.197]

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

Deletion in src/hydra-queue-runner/state.hh at line 261 [11.1128]
∅:D[10.437] → [11.4385:4386]
B:BD[11.4385] → [11.4385:4386]
B:BD[11.4386] → [10.438:473]
```
    nix::StringSet localPlatforms;
```