Fixes for ghcjs 8.10.7

Author: hamishmack

lib/ghcjs-project.nix

@@ -147,6 +147,17 @@ let
         index-state = "2021-03-20T00:00:00Z";
         inherit compiler-nix-name;
         configureArgs = pkgs.lib.optionalString (isGhcjs88 && !isGhcjs810) "--constraint='Cabal >=3.0.2.0 && <3.1'";
+        # set use-host-template-haskell. This *does*
+        # work as we use a patched ghc to boot anyway.
+        # (we apply https://github.com/ghcjs/ghc/commit/2918d88d4ef786b5f2801f6f77ac333cc56dde75 already)
+        cabalProjectLocal = ''
+          package ghcjs
+            flags: +use-host-template-haskell +no-wrapper-install
+          package ghc-api-ghcjs
+            flags: +use-host-template-haskell
+          package ghcjs-th
+            flags: +use-host-template-haskell
+        '';
         # If a package is in both build-depends and build-tool-depends multiple versions may
         # be in the `plan.json` file.  Haskell.nix will pick the newer one, but when nbuilding
         # ghcjs 8.6 we need to use the older happy version.
@@ -162,13 +173,6 @@ let
                 packages.ghcjs.doHaddock = false;
                 packages.haddock-ghcjs.doHaddock = false;
                 packages.haddock-api-ghcjs.doHaddock = false;
-                packages.ghcjs.flags.no-wrapper-install = true;
-                # set use-host-template-haskell. This *does*
-                # work as we use a patched ghc to boot anyway.
-                # (we apply https://github.com/ghcjs/ghc/commit/2918d88d4ef786b5f2801f6f77ac333cc56dde75 already)
-                packages.ghcjs.flags.use-host-template-haskell = true;
-                packages.ghc-api-ghcjs.flags.use-host-template-haskell = true;
-                packages.ghcjs-th.flags.use-host-template-haskell = true;
                 packages.ghc.flags.ghci = true;
                 packages.ghci.flags.ghci = true;
                 # packages.ghcjs.components.library.configureFlags = [ "-fno-wrapper-install" ];

materialized/ghcjs/ghc8107/default.nix

@@ -771,7 +771,12 @@ final: prev: {
                         }) plan-json.install-plan);
                   });
                   modules = [({config, pkgs, ...}: {
-                    nonReinstallablePkgs = ["rts"] ++ final.lib.optionals (pkgs.stdenv.hostPlatform.isGhcjs) ([
+                    nonReinstallablePkgs = ["rts" "base" "ghc-prim" "integer-gmp" "integer-simple"]
+                      ++ final.lib.optionals (builtins.compareVersions config.compiler.version "8.11" >= 0) [
+                        "ghc-bignum"]
+                      ++ final.lib.optionals (builtins.compareVersions config.compiler.version "9.9" >= 0) [
+                        "ghc-internal"]
+                      ++ final.lib.optionals (pkgs.stdenv.hostPlatform.isGhcjs) ([
                         # ghci and its dependencies
                         "ghci" "binary" "bytestring" "containers" "template-haskell" "array" "deepseq" "filepath" "ghc-boot" "ghc-boot-th" "ghc-heap" "transformers" "unix" "directory" "time" "ghc-platform" "os-string"
                       ] ++ final.lib.optionals (builtins.compareVersions config.compiler.version "8.11" < 0) [