grahamc/hydra - Change FJ5H26J66SSQBDNQTKOFKGOKND2IBZLGVAR3CIANKZLTQNELTTVAC

Fix building against nix master

Created by Eelco Dolstra on October 30, 2018

FJ5H26J66SSQBDNQTKOFKGOKND2IBZLGVAR3CIANKZLTQNELTTVAC

Dependencies

In channels

upstream

main

Change contents

Replacement in release.nix at line 2 [5.1]

B:BD[4.35] → [3.0:114]

, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.03-small"; }

[4.35]

[6.65]

, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.09-small"; }

Insertion in release.nix at line 114 [5.1]
[2.16]
[7.2651]
```
          nlohmann_json
```
Insertion in src/hydra-queue-runner/queue-monitor.cc at line 431 [8.20067]
[8.31444]
[9.0]
```
    step->parsedDrv = std::make_unique<ParsedDerivation>(drvPath, step->drv);
```

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

B:BD[9.1] → [10.950:1009]

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

[9.1]

[11.657]

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

Replacement in src/hydra-queue-runner/state.hh at line 13 [13.1128]
B:BD[12.1521] → [12.1521:1547]
```
#include "derivations.hh"
```
[12.1521]
[13.1299]
```
#include "parsed-derivations.hh"
```
Insertion in src/hydra-queue-runner/state.hh at line 155 [13.1128]
[14.403]
[13.2411]
```
    std::unique_ptr<nix::ParsedDerivation> parsedDrv;
```