diff options
| author | John Ericson <git@JohnEricson.me> | 2019-09-02 01:39:18 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-09-02 01:44:30 -0400 |
| commit | f57fe63d5fe7bdd434bfe172370d49eddf666a5e (patch) | |
| tree | 2f04d3801d790772ab26e026f9261768677db4a1 /lib | |
| parent | c33d80c071927d783bd10943e723ed408ec89e48 (diff) | |
| parent | 3d8cf087068c4d2f011d06d11453e3dd966da321 (diff) | |
| download | nixlib-f57fe63d5fe7bdd434bfe172370d49eddf666a5e.tar nixlib-f57fe63d5fe7bdd434bfe172370d49eddf666a5e.tar.gz nixlib-f57fe63d5fe7bdd434bfe172370d49eddf666a5e.tar.bz2 nixlib-f57fe63d5fe7bdd434bfe172370d49eddf666a5e.tar.lz nixlib-f57fe63d5fe7bdd434bfe172370d49eddf666a5e.tar.xz nixlib-f57fe63d5fe7bdd434bfe172370d49eddf666a5e.tar.zst nixlib-f57fe63d5fe7bdd434bfe172370d49eddf666a5e.zip | |
Merge lib sort into feature/js-unknown-ghcjs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems/inspect.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 8a95787110b8..51effb7d1572 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -12,7 +12,7 @@ rec { isx86_32 = { cpu = { family = "x86"; bits = 32; }; }; isx86_64 = { cpu = { family = "x86"; bits = 64; }; }; isPowerPC = { cpu = cpuTypes.powerpc; }; - isPower = { cpu = { family = "power"; }; }; + isPower = { cpu = { family = "power"; }; }; isx86 = { cpu = { family = "x86"; }; }; isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; @@ -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; }; |