grahamc/hydra2 - Change M25EG2BKHICPE5J5OL6T2GKVQOZ5JSYF5LGB3Z7OCUH7RJUHCYGQC

Fixes for macOS

Building on macOS with the latest nixpkgs master and NixOS/nixpkgs#77147 fails. It seems some std::experimental (optional) for instance are not available as experimental, but are in std. Also toJSON is missing for atomic< unsigned long long >.

Created by Hamish Mackenzie on January 6, 2020

M25EG2BKHICPE5J5OL6T2GKVQOZ5JSYF5LGB3Z7OCUH7RJUHCYGQC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 9 [5.575]
B:BD[5.692] → [2.75:108]
```
#include <experimental/optional>
```
[5.692]
[5.692]
```
#include <optional>
```
Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 34 [5.575]
B:BD[5.1102] → [2.167:220]
```
    std::experimental::optional<JobsetName> evalOne;
```
[5.1102]
[2.220]
```
    std::optional<JobsetName> evalOne;
```

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 26 [6.4840]

[3.247]

template<> void toJSON<std::atomic<unsigned long long>>(std::ostream & str, const std::atomic<unsigned long long> & n) { str << n; }

Replacement in src/libhydra/db.hh at line 26 [7.93]

B:BD[7.681] → [4.236:289]

    std::experimental::optional<std::string> status;

[7.681]

[4.289]

    std::optional<std::string> status;

Replacement in src/libhydra/db.hh at line 38 [7.93]

B:BD[4.330] → [4.330:383]

    std::experimental::optional<std::string> get() {

[4.330]

[4.383]

    std::optional<std::string> get() {

Replacement in src/libhydra/db.hh at line 40 [7.93]
B:BD[4.408] → [4.408:453]
```
        status = std::experimental::nullopt;
```
[4.408]
[4.453]
```
        status = std::nullopt;
```