From 6e5a748224009c5f9ccf2be4f48ee2bf06b67fdc Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 26 Feb 2016 18:53:03 +0000 Subject: [PATCH] lib.platforms: alphabetize --- lib/platforms.nix | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/platforms.nix b/lib/platforms.nix index 5ac0b528714..b068d080e75 100644 --- a/lib/platforms.nix +++ b/lib/platforms.nix @@ -1,21 +1,24 @@ let lists = import ./lists.nix; in rec { - gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ - linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "mips64el-linux"]; + all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; + allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; + none = []; + + arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; + i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; + mips = [ "mips64el-linux" ]; + x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"]; + + cygwin = ["i686-cygwin" "x86_64-cygwin"]; darwin = ["x86_64-darwin"]; freebsd = ["i686-freebsd" "x86_64-freebsd"]; - openbsd = ["i686-openbsd" "x86_64-openbsd"]; - netbsd = ["i686-netbsd" "x86_64-netbsd"]; - cygwin = ["i686-cygwin" "x86_64-cygwin"]; + gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ illumos = ["x86_64-solaris"]; + linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "mips64el-linux"]; + netbsd = ["i686-netbsd" "x86_64-netbsd"]; + openbsd = ["i686-openbsd" "x86_64-openbsd"]; 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" "armv7l-linux"]; - x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"]; - i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; - arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; - mips = [ "mips64el-linux" ]; }