Update ghcjs810-src.json (#1291)
* Update ghcjs810-src.json
* Update ghcjs-project.nix
* Update ghcjs.nix
Use nodejs-12_x, to allow larger strings to be loaded. See https://github.com/nodejs/node/issues/33960
* Update comp-builder.nix
Allow large strings, see https://github.com/nodejs/node/issues/33960
* Update cabal-os-arch-comp.nix
* Update ghcjs-src
* Update ghcjs ref
Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
commit59ad2995cc52f963be8aeb4a7a10124669aa9bdb
authorMoritz Angermann <moritz.angermann@gmail.com>
dateTue 16 Nov 2021, 21:17 (5 years ago)
parent499ab5b
builder/comp-builder.nix+1−1
@@ -457,7 +457,7 @@ let
457457 if [ -f ${testExecutable} ]; then
458458 mkdir -p $(dirname $out/bin/${exeName})
459459 ${if stdenv.hostPlatform.isGhcjs then ''
460− cat <(echo \#!${lib.getBin buildPackages.nodejs}/bin/node) ${testExecutable} >| $out/bin/${exeName}
460+ cat <(echo \#!${lib.getBin buildPackages.nodejs-12_x}/bin/node) ${testExecutable} >| $out/bin/${exeName}
461461 chmod +x $out/bin/${exeName}
462462 '' else ''
463463 cp -r ${testExecutable} $(dirname $out/bin/${exeName})
compiler/ghcjs/ghcjs810-src.json+3−3
@@ -1,6 +1,6 @@
11{
2− "url": "https://github.com/ghcjs/ghcjs",
3− "rev": "8802b310c89eda51f0b1ac0cded74a756642a615",
4− "sha256": "1ar2fzl86rik1nh06158gaa8prqbfhllh03xygsqgmj92r263ga1",
2+ "url": "https://github.com/angerman/ghcjs",
3+ "rev": "35afeaacd1184e7be3bb10692c242c5649ac9d89",
4+ "sha256": "sha256-txc2mGB0hCmaXB0sC3quDKP9CCr+HQh8aLSkNozDtVY=",
55 "fetchSubmodules": true
66}
lib/cabal-os-arch-comp.nix+1−1
@@ -43,7 +43,7 @@
4343 isPPC64 = false;
4444 isSparc = false;
4545 isArm = false;
46− isAArch64= false;
46+ isAarch64= false;
4747 isMips = false;
4848 isSH = false;
4949 isIA64 = false;
lib/ghcjs-project.nix+3−1
@@ -75,7 +75,9 @@ let
7575
7676 # Inputs needed to boot the GHCJS compiler
7777 bootInputs = with pkgs.buildPackages; [
78− nodejs
78+ # pin nodejs to the 12 series for now, as strings can only be half the length in node 14+
79+ # see https://github.com/nodejs/node/issues/33960, this can break large TH splices for now.
80+ nodejs-12_x
7981 makeWrapper
8082 xorg.lndir
8183 gmp
overlays/ghcjs.nix+1−1
@@ -22,7 +22,7 @@ final: prev:
2222 set -euo pipefail
2323 exe=$1
2424 shift
25− ${final.buildPackages.nodejs}/bin/node $exe $@
25+ ${final.buildPackages.nodejs-12_x}/bin/node $exe $@
2626 '') + "/bin/node-wrapper")];
2727 })
2828 );