diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-11-23 14:45:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-11-23 14:45:44 +0100 |
| commit | 13eca6f79a0ddb09f6764273eaae0df4c2e67efc (patch) | |
| tree | 46052bf5c0aa6feb9074e7fa2dd44dbb4051f15f /lib | |
| parent | 5bc8241348a52fe7d4d88d0a6693748417a2baea (diff) | |
| parent | baf7fdcb753fc57058ba27fc335b2798fbac804a (diff) | |
| download | nixpkgs-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar nixpkgs-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar.gz nixpkgs-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar.bz2 nixpkgs-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar.lz nixpkgs-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar.xz nixpkgs-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar.zst nixpkgs-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.zip | |
Merge #11067: SmartOS updates
I amended some commits slightly.
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 825cc4136a1..750829da375 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"]; |