grahamc/hydra2 - Change SK6WHODMWAUL7LNH6QTUXZW7GQFNKKDYN4BU45ODTMMKYMG6O7KAC

Support preferLocalBuild

Derivations with "preferLocalBuild = true" can now be executed on specific machines (typically localhost) by setting the mandary system features field to include "local". For example:

localhost x86_64-linux,i686-linux - 10 100 - local

says that "localhost" can only do builds with "preferLocalBuild = true". The speed factor of 100 will make the machine almost always win over other machines.

Created by Eelco Dolstra on June 29, 2015

SK6WHODMWAUL7LNH6QTUXZW7GQFNKKDYN4BU45ODTMMKYMG6O7KAC

Dependencies

In channels

main

Change contents

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 141 [4.4840]
[3.50]
[4.5820]
```
    bool preferLocalBuild;
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 198 [4.4840]

B:BD[3.94] → [3.94:200]

            if (step->requiredSystemFeatures.find(f) == step->requiredSystemFeatures.end()) return false;

[3.94]

[3.200]

            if (step->requiredSystemFeatures.find(f) == step->requiredSystemFeatures.end()
                && !(step->preferLocalBuild && f == "local"))
                return false;

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 213 [4.4840]
[5.6816]
[6.947]
```
    StringSet localPlatforms;
```

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 369 [4.4840]

[2.825]

[4.7503]


    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 389 [4.4840]

B:BD[2.1289] → [2.1289:1509]

        StringSet systems = StringSet({settings.thisSystem});
        if (settings.thisSystem == "x86_64-linux")
            systems.insert("i686-linux");
        contents = "localhost " + concatStringsSep(",", systems)

[2.1289]

[2.1509]

        contents = "localhost " + concatStringsSep(",", localPlatforms)

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 414 [4.4840]
[2.2297]
[2.2297]
```
        if (tokens[5] == "-") tokens[5] = "";
```
Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 416 [4.4840]
[2.2377]
[2.2377]
```
        if (tokens[6] == "-") tokens[6] = "";
```

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 831 [4.4840]

[4.11833]

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

Support preferLocalBuild

Dependencies

In channels

Change contents

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 141 [4.4840]

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 198 [4.4840]

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 213 [4.4840]

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 369 [4.4840]

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 389 [4.4840]

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 414 [4.4840]

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 416 [4.4840]

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 831 [4.4840]