59ad299 · haskell.nix · git.iko.soy

builder/comp-builder.nix+1−1

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -457,7 +457,7 @@ let

457 if [ -f ${testExecutable} ]; then

458 mkdir -p $(dirname $out/bin/${exeName})

459 ${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}

461 chmod +x $out/bin/${exeName}

462 '' else ''

463 cp -r ${testExecutable} $(dirname $out/bin/${exeName})

compiler/ghcjs/ghcjs810-src.json+3−3

@@ -1,6 +1,6 @@

1{

2− "url": "https://github.com/ghcjs/ghcjs",

2+ "url": "https://github.com/angerman/ghcjs",

3− "rev": "8802b310c89eda51f0b1ac0cded74a756642a615",

3+ "rev": "35afeaacd1184e7be3bb10692c242c5649ac9d89",

4− "sha256": "1ar2fzl86rik1nh06158gaa8prqbfhllh03xygsqgmj92r263ga1",

4+ "sha256": "sha256-txc2mGB0hCmaXB0sC3quDKP9CCr+HQh8aLSkNozDtVY=",

5 "fetchSubmodules": true

6}

lib/cabal-os-arch-comp.nix+1−1

@@ -43,7 +43,7 @@

43 isPPC64 = false;

44 isSparc = false;

45 isArm = false;

46− isAArch64= false;

46+ isAarch64= false;

47 isMips = false;

48 isSH = false;

49 isIA64 = false;

lib/ghcjs-project.nix+3−1

@@ -75,7 +75,9 @@ let

75

76 # Inputs needed to boot the GHCJS compiler

77 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

79 makeWrapper

81 makeWrapper

80 xorg.lndir

82 xorg.lndir

81 gmp

83 gmp

overlays/ghcjs.nix+1−1

@@ -22,7 +22,7 @@ final: prev:

22 set -euo pipefail

23 exe=$1

24 shift

25− ${final.buildPackages.nodejs}/bin/node $exe $@

25+ ${final.buildPackages.nodejs-12_x}/bin/node $exe $@

26 '') + "/bin/node-wrapper")];

27 })

28 );