@@ -12,7 +12,7 @@ rec {
1212 isx86_32 = { cpu = { family = "x86"; bits = 32; }; };
1313 isx86_64 = { cpu = { family = "x86"; bits = 64; }; };
1414 isPowerPC = { cpu = cpuTypes.powerpc; };
15− isPower = { cpu = { family = "power"; }; };
15+ isPower = { cpu = { family = "power"; }; };
1616 isx86 = { cpu = { family = "x86"; }; };
1717 isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
1818 isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
@@ -23,6 +23,7 @@ rec {
2323 isMsp430 = { cpu = { family = "msp430"; }; };
2424 isAvr = { cpu = { family = "avr"; }; };
2525 isAlpha = { cpu = { family = "alpha"; }; };
26+ isJavaScript = { cpu = cpuTypes.js; };
2627
2728 is32bit = { cpu = { bits = 32; }; };
2829 is64bit = { cpu = { bits = 64; }; };
@@ -45,6 +46,7 @@ rec {
4546 isMinGW = { kernel = kernels.windows; abi = abis.gnu; };
4647 isWasi = { kernel = kernels.wasi; };
4748 isNone = { kernel = kernels.none; };
49+ isGhcjs = { kernel = kernels.ghcjs; };
4850
4951 isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
5052 isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
@@ -53,8 +55,6 @@ rec {
5355 isEfi = map (family: { cpu.family = family; })
5456 [ "x86" "arm" "aarch64" ];
5557
56− isJavaScript = { cpu = cpuTypes.js; };
57− isGhcjs = { kernel = kernels.ghcjs; };
5858 # Deprecated after 18.03
5959 isArm = isAarch32;
6060 };