diff options
| author | John Ericson <git@JohnEricson.me> | 2019-09-02 01:57:01 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-09-02 01:57:01 -0400 |
| commit | c2b34b2b57f1b789cc2a468ff8e75a0da71349c4 (patch) | |
| tree | 1c59fb79b1d1be4a6de37d6ba8f44dadfaaa4305 /lib/systems/inspect.nix | |
| parent | a77a2cfe4a61c8fda4108fb3670605f04246f857 (diff) | |
| parent | d2d107c4de7f5b36eb82e6884a90c144e9014e5a (diff) | |
| download | nixpkgs-c2b34b2b57f1b789cc2a468ff8e75a0da71349c4.tar nixpkgs-c2b34b2b57f1b789cc2a468ff8e75a0da71349c4.tar.gz nixpkgs-c2b34b2b57f1b789cc2a468ff8e75a0da71349c4.tar.bz2 nixpkgs-c2b34b2b57f1b789cc2a468ff8e75a0da71349c4.tar.lz nixpkgs-c2b34b2b57f1b789cc2a468ff8e75a0da71349c4.tar.xz nixpkgs-c2b34b2b57f1b789cc2a468ff8e75a0da71349c4.tar.zst nixpkgs-c2b34b2b57f1b789cc2a468ff8e75a0da71349c4.zip | |
Merge remote-tracking branch 'upstream/master' into js-unknown-ghcjs
Diffstat (limited to 'lib/systems/inspect.nix')
| -rw-r--r-- | lib/systems/inspect.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 129c7a94d3d..8a983b3d363 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -20,7 +20,9 @@ rec { isRiscV = { cpu = { family = "riscv"; }; }; isSparc = { cpu = { family = "sparc"; }; }; isWasm = { cpu = { family = "wasm"; }; }; + isMsp430 = { cpu = { family = "msp430"; }; }; isAvr = { cpu = { family = "avr"; }; }; + isAlpha = { cpu = { family = "alpha"; }; }; isJavaScript = { cpu = cpuTypes.js; }; is32bit = { cpu = { bits = 32; }; }; @@ -42,7 +44,9 @@ rec { isWindows = { kernel = kernels.windows; }; isCygwin = { kernel = kernels.windows; abi = abis.cygnus; }; isMinGW = { kernel = kernels.windows; abi = abis.gnu; }; + isWasi = { kernel = kernels.wasi; }; isGhcjs = { kernel = kernels.ghcjs; }; + isNone = { kernel = kernels.none; }; isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; |