diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-05 11:11:51 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-05 11:11:51 +0100 |
| commit | 263fd55d4b2d9c17dac87ee7a7a39c951aee1b86 (patch) | |
| tree | 50c30ebb0626be0b3333d90202081e8697a85abf /lib | |
| parent | b1dca6ca881e3e5864c60a2ef206579ce4d718b1 (diff) | |
| parent | c20b6846f2ec4b1fe70d62fe99d165476aed65d0 (diff) | |
Merge recent staging built on Hydra
http://hydra.nixos.org/eval/1231884 Only Darwin jobs seem to be queued now, but we can't afford to wait for that single build slave.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/platforms.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/platforms.nix b/lib/platforms.nix index 825cc4136a19d..750829da3751a 100644 --- a/lib/platforms.nix +++ b/lib/platforms.nix @@ -8,8 +8,9 @@ rec { openbsd = ["i686-openbsd" "x86_64-openbsd"]; netbsd = ["i686-netbsd" "x86_64-netbsd"]; cygwin = ["i686-cygwin" "x86_64-cygwin"]; - unix = linux ++ darwin ++ freebsd ++ openbsd; - all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd; + illumos = ["x86_64-solaris"]; + unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; + all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; none = []; allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"]; |