Skip to content

Commit 6134e66

Browse files
authored
Fix ghc 8.10 windows cross (boot with 8.6.5) (#865)
It looks like we can't use 8.8 for booting due to https://gitlab.haskell.org/ghc/ghc/-/issues/18143 * Adds nixpkgs 20.09 to get mingw-w64 version 6 (also needed for ghc 8.10 windows cross compile) * Add materialization for ghc 8.10.2 windows cross * Fix issue with harfbuzz override so it works with nixpkgs 20.09 * Fixes eval time issue for windows index-state test (turns off native-dns cabal flag for windows) * Include exe extension for windows in coverage test lib:ghc is still broken for ghc 8.10 (all variants), but it always has been and we should try to fix it properly, but it will be very tricky.
1 parent 8f5819c commit 6134e66

File tree

16 files changed

+1236
-8
lines changed

16 files changed

+1236
-8
lines changed

ci.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
nixpkgsVersions = {
1212
"R1909" = "nixpkgs-1909";
1313
"R2003" = "nixpkgs-2003";
14+
"R2009" = "nixpkgs-2009";
1415
};
1516
compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
1617
inherit (import ./default.nix { inherit checkMaterialization; }) nixpkgsArgs;
@@ -29,6 +30,8 @@
2930
ghc884 = true;
3031
ghc8101 = false;
3132
ghc8102 = true;
33+
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
34+
ghc8102 = true;
3235
});
3336
systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {
3437
# I wanted to take these from 'lib.systems.examples', but apparently there isn't one for linux!
@@ -39,7 +42,7 @@
3942
# We need to use the actual nixpkgs version we're working with here, since the values
4043
# of 'lib.systems.examples' are not understood between all versions
4144
let lib = nixpkgs.lib;
42-
in lib.optionalAttrs (system == "x86_64-linux" && compiler-nix-name != "ghc8101" && compiler-nix-name != "ghc8102") {
45+
in lib.optionalAttrs (system == "x86_64-linux" && (nixpkgsName == "R2009" || (compiler-nix-name != "ghc8101" && compiler-nix-name != "ghc8102"))) {
4346
# Windows cross compilation is currently broken on macOS
4447
inherit (lib.systems.examples) mingwW64;
4548
} // lib.optionalAttrs (system == "x86_64-linux") {

materialized/ghc-extra-projects/windows/ghc8102/.plan.nix/bytestring.nix

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

materialized/ghc-extra-projects/windows/ghc8102/.plan.nix/ghc-boot.nix

Lines changed: 60 additions & 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)