Fix cross compilers (#1886)

* Update flake-utils so cross compile works runs CI
* While it's technically true that we are building a cross compiler, we don't care, and want to build a full stage2 compiler, _if_ the architecture is the same.

---------

Co-authored-by: Moritz Angermann <moritz.angermann@gmail.com>

Author: hamishmack

builder/comp-builder.nix

@@ -170,7 +170,7 @@ let
       "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
       "--with-hsc2hs=${ghc.targetPrefix}hsc2hs"
     ] ++ lib.optional (pkgconfig != [])
-      "--with-pkg-config=${ghc.targetPrefix}pkg-config"
+      "--with-pkg-config=${buildPackages.cabalPkgConfigWrapper.targetPrefix}pkg-config"
       ++ lib.optionals (stdenv.hasCC or (stdenv.cc != null))
     ( # CC
       [ "--with-gcc=${stdenv.cc.targetPrefix}cc"

builder/ghc-for-component-wrapper.nix

@@ -39,7 +39,11 @@ let
   ''
   # ... but retain the lib/ghc/bin directory. This contains `unlit' and friends.
   + ''
-    ln -s $unwrappedGhc/lib/${ghcCommand}-${ghc.version}/bin ${libDir}
+    if [ -d $unwrappedGhc/lib/${ghcCommand}-${ghc.version}/bin ]; then
+      ln -s $unwrappedGhc/lib/${ghcCommand}-${ghc.version}/bin ${libDir}
+    else
+      ln -s $unwrappedGhc/lib/bin ${libDir}
+    fi
   ''
   # ... and the ghcjs shim's if they are available ...
   + ''

compiler/ghc/default.nix

@@ -220,7 +220,11 @@ let
 
   useHadrian = builtins.compareVersions ghc-version "9.4" >= 0;
   # Indicates if we are installing by copying the hadrian stage1 output
-  installStage1 = useHadrian && (haskell-nix.haskellLib.isCrossTarget || targetPlatform.isMusl);
+  # I think we want to _always_ just install stage1. For now let's do this
+  # for musl only; but I'd like to stay far away from the unnecessary
+  # bindist logic as we can. It's slow, and buggy, and doesn't provide any
+  # value for us.
+  installStage1 = useHadrian && (haskell-nix.haskellLib.isCrossTarget || stdenv.targetPlatform.isMusl);
 
   inherit ((buildPackages.haskell-nix.cabalProject {
       compiler-nix-name = "ghc8107";
@@ -586,6 +590,10 @@ stdenv.mkDerivation (rec {
           --replace 'dynamic-library-dirs:' 'dynamic-library-dirs: ${libcxx}/lib ${libcxxabi}/lib'
         find . -name 'system*.conf*'
         cat mk/system-cxx-std-lib-1.0.conf
+      '' + lib.optionalString (installStage1 && stdenv.targetPlatform.isMusl) ''
+        substituteInPlace hadrian/cfg/system.config \
+          --replace 'cross-compiling       = YES' \
+                    'cross-compiling       = NO'
       '';
     });
 
@@ -651,13 +659,24 @@ stdenv.mkDerivation (rec {
       --replace 'dynamic-library-dirs:' 'dynamic-library-dirs: ${libcxx}/lib ${libcxxabi}/lib'
     find . -name 'system*.conf*'
     cat mk/system-cxx-std-lib-1.0.conf
+  '' + lib.optionalString (installStage1 && stdenv.targetPlatform.isMusl) ''
+    substituteInPlace hadrian/cfg/system.config \
+      --replace 'cross-compiling       = YES' \
+                'cross-compiling       = NO'
   '';
   buildPhase = ''
     ${hadrian}/bin/hadrian ${hadrianArgs}
   '' + lib.optionalString installStage1 ''
     ${hadrian}/bin/hadrian ${hadrianArgs} stage1:lib:libiserv
   '' + lib.optionalString targetPlatform.isMusl ''
     ${hadrian}/bin/hadrian ${hadrianArgs} stage1:lib:terminfo
+  '' + lib.optionalString (installStage1 && !haskell-nix.haskellLib.isCrossTarget) ''
+    ${hadrian}/bin/hadrian ${hadrianArgs} stage2:exe:iserv
+    pushd _build/stage1/bin
+    for exe in *; do
+      mv $exe ${targetPrefix}$exe
+    done
+    popd
   '';
 
   # Hadrian's installation only works for native compilers, and is broken for cross compilers.

compiler/windows/include/windows.h

@@ -7,6 +7,8 @@
 
 typedef unsigned long DWORD;
 typedef void * PVOID;
+typedef PVOID HANDLE;
+typedef void CRITICAL_SECTION;
 
 typedef struct _RTL_CONDITION_VARIABLE { PVOID Ptr; } RTL_CONDITION_VARIABLE;
 typedef RTL_CONDITION_VARIABLE CONDITION_VARIABLE;

overlays/bootstrap.nix

@@ -184,8 +184,8 @@ in {
                 ++ fromUntil "8.6.5"  "9.5"    ./patches/ghc/ghc-hpc-response-files.patch   # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8194
                 ++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.4.1"  "9.5"    ./patches/ghc/ghc-9.4-hadrian-win-cross.patch)
                 ++ fromUntil "9.6.1"  "9.8"    ./patches/ghc/MR10116.patch
-                ++ fromUntil "9.4.1"  "9.6"    ./patches/ghc/hadrian-build-deriveConstants-genprimopcode-ghc94.patch
-                ++ fromUntil "9.6.1"  "9.8"    ./patches/ghc/hadrian-build-deriveConstants-genprimopcode.patch
+                ++ final.lib.optionals (final.stdenv.buildPlatform == final.stdenv.targetPlatform) (fromUntil "9.4.1" "9.6" ./patches/ghc/hadrian-build-deriveConstants-genprimopcode-ghc94.patch)
+                ++ final.lib.optionals (final.stdenv.buildPlatform == final.stdenv.targetPlatform) (fromUntil "9.6.1" "9.8" ./patches/ghc/hadrian-build-deriveConstants-genprimopcode.patch)
 
                 # the following is a partial reversal of https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4391, to address haskell.nix#1227
                 ++ final.lib.optional (versionAtLeast "8.10.6" && versionLessThan "9.0" && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/mmap-next.patch

scripts/check-compiler-materialization/default.nix

@@ -40,7 +40,7 @@ in builtins.listToAttrs (builtins.concatMap (system: builtins.concatMap (compile
   # In some cased you may need comment out one or more of these if the GHC version needed cannot be built.
   { name = "${prefix}-musl";          value = (pkgs.pkgsCross.musl64.haskell-nix.roots' compiler-nix-name).ghc-extra-projects-nix or {}; }
   { name = "${prefix}-hello-musl";    value = pkgs.pkgsCross.musl64.haskell-nix.tool compiler-nix-name "hello" {}; }
-] ++ eval.lib.optionals (system == "x86_64-linux" && __elem compiler-nix-name ["ghc884" "ghc8105" "ghc8106" "ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc925" "ghc926" "ghc927" "ghc944"]) [
+] ++ eval.lib.optionals (system == "x86_64-linux" && !__elem compiler-nix-name ["ghc865" "ghc881" "ghc882" "ghc883" "ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc901" "ghc921" "ghc941" "ghc942" "ghc943"]) [
   { name = "${prefix}-arm";           value = (pkgs.pkgsCross.aarch64-multiplatform.haskell-nix.roots' compiler-nix-name).ghc-extra-projects-nix or {}; }
   { name = "${prefix}-hello-arm";     value = pkgs.pkgsCross.aarch64-multiplatform.haskell-nix.tool compiler-nix-name "hello" {}; }
 ] ++ eval.lib.optionals (