git.iko.soy/typeable/nixpkgs
on master help sign in
Add support for `js-unknown-ghcjs`

This adds enough logic to nixpkgs to support the `js-unknown-ghcjs` triple.

commit446f8c851d599326373a2c910841d092ff8e68ae authorMoritz Angermann <moritz.angermann@gmail.com> dateFri 23 Aug 2019, 18:53 (7 years ago) parent280795c
5 files changed+20−4
lib/systems/examples.nix+9−3 lib/systems/inspect.nix+2 lib/systems/parse.nix+6−1 pkgs/stdenv/cross/default.nix+2 pkgs/top-level/all-packages.nix+1
lib/systems/examples.nix+9−3
@@ -119,7 +119,7 @@ rec {
119119 config = "aarch64-none-elf";
120120 libc = "newlib";
121121 };
122−
122+
123123 aarch64be-embedded = {
124124 config = "aarch64_be-none-elf";
125125 libc = "newlib";
@@ -129,12 +129,12 @@ rec {
129129 config = "powerpc-none-eabi";
130130 libc = "newlib";
131131 };
132−
132+
133133 ppcle-embedded = {
134134 config = "powerpcle-none-eabi";
135135 libc = "newlib";
136136 };
137−
137+
138138 alpha-embedded = {
139139 config = "alpha-elf";
140140 libc = "newlib";
@@ -212,4 +212,10 @@ rec {
212212 libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
213213 platform = {};
214214 };
215+
216+ # Ghcjs
217+ ghcjs = {
218+ config = "js-unknown-ghcjs";
219+ platform = {};
220+ };
215221}
lib/systems/inspect.nix+2
@@ -49,6 +49,8 @@ rec {
4949 isEfi = map (family: { cpu.family = family; })
5050 [ "x86" "arm" "aarch64" ];
5151
52+ isJavaScript = { cpu = cpuTypes.js; };
53+ isGhcjs = { kernel = kernels.ghcjs; };
5254 # Deprecated after 18.03
5355 isArm = isAarch32;
5456 };
lib/systems/parse.nix+6−1
@@ -106,10 +106,12 @@ rec {
106106
107107 wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
108108 wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
109−
109+
110110 alpha = { bits = 64; significantByte = littleEndian; family = "alpha"; };
111111
112112 avr = { bits = 8; family = "avr"; };
113+
114+ js = { bits = 32; significantByte = littleEndian; family = "js"; };
113115 };
114116
115117 ################################################################################
@@ -188,6 +190,7 @@ rec {
188190 openbsd = { execFormat = elf; families = { inherit bsd; }; };
189191 solaris = { execFormat = elf; families = { }; };
190192 windows = { execFormat = pe; families = { }; };
193+ ghcjs = { execFormat = unknown; families = { }; };
191194 } // { # aliases
192195 # 'darwin' is the kernel for all of them. We choose macOS by default.
193196 darwin = kernels.macos;
@@ -299,6 +302,8 @@ rec {
299302 then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
300303 else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
301304 then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; }
305+ else if (elemAt l 2 == "ghcjs")
306+ then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 2; }
302307 else throw "Target specification with 3 components is ambiguous";
303308 "4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
304309 }.${toString (length l)}
pkgs/stdenv/cross/default.nix+2
@@ -54,6 +54,8 @@ in lib.init bootStages ++ [
5454 then buildPackages.darwin.iosSdkPkgs.clang
5555 else if crossSystem.useAndroidPrebuilt or false
5656 then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc
57+ else if targetPlatform.isGhcjs
58+ then null
5759 else buildPackages.gcc;
5860
5961 extraNativeBuildInputs = old.extraNativeBuildInputs
pkgs/top-level/all-packages.nix+1
@@ -9984,6 +9984,7 @@ in
99849984 else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
99859985 else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries
99869986 else if name == "libSystem" then targetPackages.darwin.xcode
9987+ else if stdenv.targetPlatform.isGhcjs then null
99879988 else throw "Unknown libc";
99889989
99899990 libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;