Skip to content

Commit 78f5abf

Browse files
Try #1506:
2 parents 3d26d9a + 5be86c9 commit 78f5abf

File tree

6 files changed

+38
-14
lines changed

6 files changed

+38
-14
lines changed

ci.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
inherit (pkgs.haskell-nix) sources;
1212
nixpkgsVersions = {
1313
"R2111" = "nixpkgs-2111";
14+
"R2205" = "nixpkgs-2205";
1415
"unstable" = "nixpkgs-unstable";
1516
};
1617
compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
@@ -26,6 +27,9 @@
2627
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2111") {
2728
ghc865 = false;
2829
ghc8107 = true;
30+
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
31+
ghc865 = false;
32+
ghc8107 = true;
2933
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
3034
ghc865 = false;
3135
ghc884 = false; # Native version is used to boot 9.0.1

flake.lock

Lines changed: 26 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };
77
nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };
88
nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; };
9+
nixpkgs-2205 = { url = "github:NixOS/nixpkgs/nixpkgs-22.05-darwin"; };
910
nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
1011
flake-utils = { url = "github:numtide/flake-utils"; };
1112
hydra.url = "hydra";

lib/ghcjs-project.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,11 @@ let
7676

7777
# Inputs needed to boot the GHCJS compiler
7878
bootInputs = with pkgs.buildPackages; [
79-
# pin nodejs to the 12 series for now, as strings can only be half the length in node 14+
80-
# see https://github.com/nodejs/node/issues/33960, this can break large TH splices for now.
81-
nodejs-12_x
79+
# We used to pin nodejs to the 12 series, as strings can only be half the length in node 14+
80+
# see https://github.com/nodejs/node/issues/33960
81+
# Large TH splices are likely broken.
82+
# TODO reinstate the pin of find a work around for ghcjs to send TH splice in chunks.
83+
nodejs-18_x
8284
makeWrapper
8385
xorg.lndir
8486
gmp

overlays/ghcjs.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final: prev:
2222
set -euo pipefail
2323
exe=$1
2424
shift
25-
${final.buildPackages.nodejs-12_x}/bin/node $exe $@
25+
${final.buildPackages.nodejs-18_x}/bin/node $exe $@
2626
'') + "/bin/node-wrapper")];
2727

2828
# Apply the patches that came with `ghcjs`

release.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating
22
# on a machine with e.g. no way to build the Darwin IFDs you need!
33
{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]
4-
, ifdLevel ? 3
4+
, ifdLevel ? 1
55
, checkMaterialization ? false }:
66

77
let

0 commit comments

Comments
 (0)