diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-24 00:16:17 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-24 00:16:17 +0000 |
commit | 6e7c70d02d4f24dd840fd24a812895205c3a2f9b (patch) | |
tree | ffbed9ee289a0ad29b6e4bacd2d42043e70e1942 /lib | |
parent | 0d0e7ca7695a2d45cd53169d3a6ae423edf46b80 (diff) | |
parent | c298ef8855f6ad629da5e09aab36ee673473316c (diff) | |
download | nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar.gz nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar.bz2 nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar.lz nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar.xz nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar.zst nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.zip |
Merge master into staging-next
Diffstat (limited to 'lib')
-rw-r--r-- | lib/systems/doubles.nix | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 8220bca249f..7ad40c8c62c 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -6,43 +6,51 @@ let inherit (lib.attrsets) matchAttrs; all = [ - "aarch64-linux" - "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" + # Cygwin + "i686-cygwin" "x86_64-cygwin" - "mipsel-linux" + # Darwin + "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" - "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd" + # FreeBSD + "i686-freebsd" "x86_64-freebsd" - "x86_64-cygwin" "x86_64-freebsd" "x86_64-linux" - "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris" + # Genode + "aarch64-genode" "i686-genode" "x86_64-genode" - "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" + # illumos + "x86_64-solaris" - "x86_64-windows" "i686-windows" + # JS + "js-ghcjs" - "wasm64-wasi" "wasm32-wasi" + # Linux + "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" + "armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux" + "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" - "x86_64-redox" + # MMIXware + "mmix-mmixware" - "powerpc64-linux" - "powerpc64le-linux" + # NetBSD + "i686-netbsd" "x86_64-netbsd" - "riscv32-linux" "riscv64-linux" + # none + "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" + "or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none" + "x86_64-none" - "arm-none" "armv6l-none" "aarch64-none" - "avr-none" - "i686-none" "x86_64-none" - "powerpc-none" - "msp430-none" - "riscv64-none" "riscv32-none" - "vc4-none" - "or1k-none" + # OpenBSD + "i686-openbsd" "x86_64-openbsd" - "mmix-mmixware" + # Redox + "x86_64-redox" - "js-ghcjs" + # WASI + "wasm64-wasi" "wasm32-wasi" - "aarch64-genode" "i686-genode" "x86_64-genode" + # Windows + "x86_64-windows" "i686-windows" ]; allParsed = map parse.mkSystemFromString all; |