on iko/ghcjs-patch-master help sign in
Enabled fast-weak for reflex
c82a006iko
overlays/haskell.nix+5−2
@@ -151,9 +151,11 @@ final: prev: {
151 else compiler-nix-name';
151 else compiler-nix-name';
152 pkg-def = excludeBootPackages compiler-nix-name plan-pkgs.pkgs;
152 pkg-def = excludeBootPackages compiler-nix-name plan-pkgs.pkgs;
153 patchesModule = ghcHackagePatches.${compiler-nix-name-with-js-prefix} or {};
153 patchesModule = ghcHackagePatches.${compiler-nix-name-with-js-prefix} or {};
154− package.compiler-nix-name.version = final.buildPackages.haskell-nix.compiler.${compiler-nix-name'}.version;
154+ compilerVersion = final.buildPackages.haskell-nix.compiler.${compiler-nix-name'}.version;
155+ package.compiler-nix-name.version = compilerVersion;
155 plan.compiler-nix-name.version = final.buildPackages.haskell-nix.compiler.${(plan-pkgs.pkgs hackage).compiler.nix-name}.version;
156 plan.compiler-nix-name.version = final.buildPackages.haskell-nix.compiler.${(plan-pkgs.pkgs hackage).compiler.nix-name}.version;
156 withMsg = final.lib.assertMsg;
157 withMsg = final.lib.assertMsg;
158+ isPatchedGHCJS = final.stdenv.hostPlatform.isGhcjs && builtins.compareVersions compilerVersion "8.10.0.0" >= 0;
157 in
159 in
158 # Check that the GHC version of the selected compiler matches the one of the plan
160 # Check that the GHC version of the selected compiler matches the one of the plan
159 assert (withMsg
161 assert (withMsg
@@ -175,7 +177,8 @@ final: prev: {
175 # the plan.
177 # the plan.
176 modules = [ { doExactConfig = true; } patchesModule ]
178 modules = [ { doExactConfig = true; } patchesModule ]
177 ++ modules
179 ++ modules
178− ++ plan-pkgs.modules or [];
180+ ++ (plan-pkgs.modules or [])
181+ ++ final.lib.optional isPatchedGHCJS { packages.reflex.flags.fast-weak = true; };
179 inherit extra-hackages;
182 inherit extra-hackages;
180 };
183 };
181
184