ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fixes for macOS

Browse Source 
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 >`.
This commit is contained in:
Hamish Mackenzie
2020-01-07 12:38:06 +13:00
parent d0f1bda0b8
commit c40c887e50
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hydra-evaluator/hydra-evaluator.cc
View File

@ -6,7 +6,7 @@
#include <algorithm>
#include <thread>
#include <cstring>
#include <experimental/optional>
#include <optional>
#include <sys/types.h>
#include <sys/wait.h>
@ -31,7 +31,7 @@ struct Evaluator
typedef std::map<JobsetName, Jobset> Jobsets;
std::experimental::optional<JobsetName> evalOne;
std::optional<JobsetName> evalOne;
const size_t maxEvals;