Merge lib sort into feature/js-unknown-ghcjs
This commit is contained in:
commit
f57fe63d5f
|
@ -23,6 +23,7 @@ rec {
|
|||
isMsp430 = { cpu = { family = "msp430"; }; };
|
||||
isAvr = { cpu = { family = "avr"; }; };
|
||||
isAlpha = { cpu = { family = "alpha"; }; };
|
||||
isJavaScript = { cpu = cpuTypes.js; };
|
||||
|
||||
is32bit = { cpu = { bits = 32; }; };
|
||||
is64bit = { cpu = { bits = 64; }; };
|
||||
|
@ -45,6 +46,7 @@ rec {
|
|||
isMinGW = { kernel = kernels.windows; abi = abis.gnu; };
|
||||
isWasi = { kernel = kernels.wasi; };
|
||||
isNone = { kernel = kernels.none; };
|
||||
isGhcjs = { kernel = kernels.ghcjs; };
|
||||
|
||||
isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
|
||||
isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
|
||||
|
@ -53,8 +55,6 @@ rec {
|
|||
isEfi = map (family: { cpu.family = family; })
|
||||
[ "x86" "arm" "aarch64" ];
|
||||
|
||||
isJavaScript = { cpu = cpuTypes.js; };
|
||||
isGhcjs = { kernel = kernels.ghcjs; };
|
||||
# Deprecated after 18.03
|
||||
isArm = isAarch32;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue