Skip to content

Commit 5fcbbcd

Browse files
committed
Disable windows cross tests with ghc 8.10.1
1 parent 0d35e65 commit 5fcbbcd

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ci.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
linux = "x86_64-linux";
2323
darwin = "x86_64-darwin";
2424
};
25-
crossSystems = nixpkgsName: nixpkgs: system:
25+
crossSystems = nixpkgsName: nixpkgs: compilerNixName: system:
2626
# We need to use the actual nixpkgs version we're working with here, since the values
2727
# of 'lib.systems.examples' are not understood between all versions
2828
let lib = nixpkgs.lib;
29-
in lib.optionalAttrs (system == "x86_64-linux") {
29+
in lib.optionalAttrs (system == "x86_64-linux" && compilerNixName != "ghc8101") {
3030
# Windows cross compilation is currently broken on macOS
3131
inherit (lib.systems.examples) mingwW64;
3232
} // lib.optionalAttrs (system == "x86_64-linux") {
@@ -57,7 +57,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: nixpkgs-pin:
5757
});
5858
}
5959
//
60-
dimension "Cross system" (crossSystems nixpkgsName genericPkgs system) (crossSystemName: crossSystem:
60+
dimension "Cross system" (crossSystems nixpkgsName genericPkgs compilerNixName system) (crossSystemName: crossSystem:
6161
# Cross builds
6262
let pkgs = import pinnedNixpkgsSrc (nixpkgsArgs // { inherit system crossSystem; });
6363
build = import ./build.nix { inherit pkgs ifdLevel; };

0 commit comments

Comments
 (0)