Skip to content

Commit

Permalink
Update ghcjs810-src.json (#1291)
Browse files Browse the repository at this point in the history
* Update ghcjs810-src.json

* Update ghcjs-project.nix

* Update ghcjs.nix

Use nodejs-12_x, to allow larger strings to be loaded. See nodejs/node#33960

* Update comp-builder.nix

Allow large strings, see nodejs/node#33960

* Update cabal-os-arch-comp.nix

* Update ghcjs-src

* Update ghcjs ref

Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
  • Loading branch information
angerman and hamishmack authored Nov 16, 2021
1 parent 499ab5b commit 59ad299
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion builder/comp-builder.nix
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ let
if [ -f ${testExecutable} ]; then
mkdir -p $(dirname $out/bin/${exeName})
${if stdenv.hostPlatform.isGhcjs then ''
cat <(echo \#!${lib.getBin buildPackages.nodejs}/bin/node) ${testExecutable} >| $out/bin/${exeName}
cat <(echo \#!${lib.getBin buildPackages.nodejs-12_x}/bin/node) ${testExecutable} >| $out/bin/${exeName}
chmod +x $out/bin/${exeName}
'' else ''
cp -r ${testExecutable} $(dirname $out/bin/${exeName})
Expand Down
6 changes: 3 additions & 3 deletions compiler/ghcjs/ghcjs810-src.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"url": "https://github.com/ghcjs/ghcjs",
"rev": "8802b310c89eda51f0b1ac0cded74a756642a615",
"sha256": "1ar2fzl86rik1nh06158gaa8prqbfhllh03xygsqgmj92r263ga1",
"url": "https://github.com/angerman/ghcjs",
"rev": "35afeaacd1184e7be3bb10692c242c5649ac9d89",
"sha256": "sha256-txc2mGB0hCmaXB0sC3quDKP9CCr+HQh8aLSkNozDtVY=",
"fetchSubmodules": true
}
2 changes: 1 addition & 1 deletion lib/cabal-os-arch-comp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
isPPC64 = false;
isSparc = false;
isArm = false;
isAArch64= false;
isAarch64= false;
isMips = false;
isSH = false;
isIA64 = false;
Expand Down
4 changes: 3 additions & 1 deletion lib/ghcjs-project.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ let

# Inputs needed to boot the GHCJS compiler
bootInputs = with pkgs.buildPackages; [
nodejs
# pin nodejs to the 12 series for now, as strings can only be half the length in node 14+
# see https://github.com/nodejs/node/issues/33960, this can break large TH splices for now.
nodejs-12_x
makeWrapper
xorg.lndir
gmp
Expand Down
2 changes: 1 addition & 1 deletion overlays/ghcjs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ final: prev:
set -euo pipefail
exe=$1
shift
${final.buildPackages.nodejs}/bin/node $exe $@
${final.buildPackages.nodejs-12_x}/bin/node $exe $@
'') + "/bin/node-wrapper")];
})
);
Expand Down

0 comments on commit 59ad299

Please sign in to comment.