Skip to content

Commit

Permalink
Disable windows cross tests with ghc 8.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Jun 5, 2020
1 parent 0d35e65 commit 5fcbbcd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
linux = "x86_64-linux";
darwin = "x86_64-darwin";
};
crossSystems = nixpkgsName: nixpkgs: system:
crossSystems = nixpkgsName: nixpkgs: compilerNixName: system:
# We need to use the actual nixpkgs version we're working with here, since the values
# of 'lib.systems.examples' are not understood between all versions
let lib = nixpkgs.lib;
in lib.optionalAttrs (system == "x86_64-linux") {
in lib.optionalAttrs (system == "x86_64-linux" && compilerNixName != "ghc8101") {
# Windows cross compilation is currently broken on macOS
inherit (lib.systems.examples) mingwW64;
} // lib.optionalAttrs (system == "x86_64-linux") {
Expand Down Expand Up @@ -57,7 +57,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: nixpkgs-pin:
});
}
//
dimension "Cross system" (crossSystems nixpkgsName genericPkgs system) (crossSystemName: crossSystem:
dimension "Cross system" (crossSystems nixpkgsName genericPkgs compilerNixName system) (crossSystemName: crossSystem:
# Cross builds
let pkgs = import pinnedNixpkgsSrc (nixpkgsArgs // { inherit system crossSystem; });
build = import ./build.nix { inherit pkgs ifdLevel; };
Expand Down

0 comments on commit 5fcbbcd

Please sign in to comment.