Fix GHC 9.6 mingwW64 cross compile

Author: hamishmack

ci.nix

@@ -89,7 +89,7 @@
     inherit (lib.systems.examples) ghcjs;
   } // lib.optionalAttrs (nixpkgsName == "unstable"
       && (__match ".*llvm" compiler-nix-name == null)
-      && ((system == "x86_64-linux"  && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc966" "ghc967" "ghc96720250227"]) # Not sure why GHC 9.6.6 TH code now wants `log1pf`
+      && ((system == "x86_64-linux"  && !builtins.elem compiler-nix-name ["ghc902" "ghc928"])
        || (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
     inherit (lib.systems.examples) mingwW64;
   } // lib.optionalAttrs (nixpkgsName == "unstable"

flake.lock

@@ -229,10 +229,7 @@ in {
 
                 # This one will lead to segv's on darwin, when calling `strlen` during lookupStrHashTable. `strlen` ends up being called with 0x0.
                 # This patch will allow adding additional symbols to iserv, instead of having to patch them into GHC all the time.
-                ++ final.lib.optionals (
-                        (final.stdenv.targetPlatform.isAndroid || final.stdenv.targetPlatform.isLinux)
-                     && (final.stdenv.targetPlatform.isAarch64 || final.stdenv.targetPlatform.is32bit))
-                  (fromUntil "9.6.1" "9.11" ./patches/ghc/iserv-syms.patch)
+                ++ fromUntil "9.6.1" "9.11" ./patches/ghc/iserv-syms.patch
                 ++ onAndroid (until "9.0" ./patches/ghc/ghc-8.10.7-weak-symbols-2.patch)
                 ++ onDarwin (onAarch64 (until "9.0" ./patches/ghc/ghc-8.10.7-rts-aarch64-darwin.patch))
                 ++ onAndroid (onAarch32 (until "9.2" ./patches/ghc/ghc-8.10-android.patch))

overlays/bootstrap.nix

@@ -15,6 +15,9 @@ library
                      , double-conversion
                      , unix-time
                      , th-orphans
+                     , ghc-prim
+                     , math-functions
+                     , erf
   exposed-modules:     Lib
   hs-source-dirs:      src
   default-language:    Haskell2010