File tree Expand file tree Collapse file tree 6 files changed +38
-14
lines changed Expand file tree Collapse file tree 6 files changed +38
-14
lines changed Original file line number Diff line number Diff line change 11
11
inherit ( pkgs . haskell-nix ) sources ;
12
12
nixpkgsVersions = {
13
13
"R2111" = "nixpkgs-2111" ;
14
+ "R2205" = "nixpkgs-2205" ;
14
15
"unstable" = "nixpkgs-unstable" ;
15
16
} ;
16
17
compilerNixNames = nixpkgsName : nixpkgs : builtins . mapAttrs ( compiler-nix-name : runTests : {
26
27
nixpkgs . lib . optionalAttrs ( nixpkgsName == "R2111" ) {
27
28
ghc865 = false ;
28
29
ghc8107 = true ;
30
+ } // nixpkgs . lib . optionalAttrs ( nixpkgsName == "R2205" ) {
31
+ ghc865 = false ;
32
+ ghc8107 = true ;
29
33
} // nixpkgs . lib . optionalAttrs ( nixpkgsName == "unstable" ) {
30
34
ghc865 = false ;
31
35
ghc884 = false ; # Native version is used to boot 9.0.1
Original file line number Diff line number Diff line change 6
6
nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin" ; } ;
7
7
nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin" ; } ;
8
8
nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin" ; } ;
9
+ nixpkgs-2205 = { url = "github:NixOS/nixpkgs/nixpkgs-22.05-darwin" ; } ;
9
10
nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable" ; } ;
10
11
flake-utils = { url = "github:numtide/flake-utils" ; } ;
11
12
hydra . url = "hydra" ;
Original file line number Diff line number Diff line change 76
76
77
77
# Inputs needed to boot the GHCJS compiler
78
78
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
82
84
makeWrapper
83
85
xorg . lndir
84
86
gmp
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ final: prev:
22
22
set -euo pipefail
23
23
exe=$1
24
24
shift
25
- ${ final . buildPackages . nodejs-12_x } /bin/node $exe $@
25
+ ${ final . buildPackages . nodejs-18_x } /bin/node $exe $@
26
26
'' ) + "/bin/node-wrapper" ) ] ;
27
27
28
28
# Apply the patches that came with `ghcjs`
Original file line number Diff line number Diff line change 1
1
# 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating
2
2
# on a machine with e.g. no way to build the Darwin IFDs you need!
3
3
{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]
4
- , ifdLevel ? 3
4
+ , ifdLevel ? 1
5
5
, checkMaterialization ? false } :
6
6
7
7
let
You can’t perform that action at this time.
0 commit comments