Skip to content

Commit ea77ac0

Browse files
committed
Fixes for ghcjs 8.10.7
1 parent 27cc10a commit ea77ac0

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

lib/ghcjs-project.nix

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,6 @@ let
155155
});
156156
materialized = materialized-dir + "/ghcjs/${compiler-nix-name}";
157157
modules = [
158-
{
159-
# we need ghc-boot in here for ghcjs.
160-
nonReinstallablePkgs = [ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base"
161-
"deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"
162-
"ghc-boot" "binary" "bytestring" "filepath" "directory" "containers"
163-
"time" "unix" "Win32" ];
164-
}
165158
(pkgs.lib.optionalAttrs (!isGhcjs88) {
166159
packages.Cabal.patches = [ ./../overlays/patches/Cabal/fix-data-dir.patch ];
167160
})
@@ -179,7 +172,7 @@ let
179172
packages.ghc.flags.ghci = true;
180173
packages.ghci.flags.ghci = true;
181174
# packages.ghcjs.components.library.configureFlags = [ "-fno-wrapper-install" ];
182-
packages.ghcjs.components.library.build-tools = [ alex ];
175+
packages.ghcjs.components.library.build-tools = [ alex happy ];
183176
}
184177
];
185178
});

materialized/ghcjs/ghc8107/plan.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)