Skip to content

Commit

Permalink
Keep mingwW64 target to ghc96
Browse files Browse the repository at this point in the history
  • Loading branch information
palas committed Jul 9, 2024
1 parent 3b5834f commit 58cecb6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# see flake `variants` below for alternative compilers
defaultCompiler = "ghc982";
haddockShellCompiler = defaultCompiler;

mingwVersion = "ghc965";
cabalHeadOverlay = final: prev: {
cabal-head =
(final.haskell-nix.cabalProject {
Expand Down Expand Up @@ -85,7 +85,7 @@

# we also want cross compilation to windows on linux (and only with default compiler).
crossPlatforms = p:
lib.optional (system == "x86_64-linux" && config.compiler-nix-name == defaultCompiler)
lib.optional (system == "x86_64-linux" && config.compiler-nix-name == mingwVersion)
p.mingwW64;

# CHaP input map, so we can find CHaP packages (needs to be more
Expand Down Expand Up @@ -167,7 +167,7 @@
flake = cabalProject.flake (
lib.optionalAttrs (system == "x86_64-linux") {
# on linux, build/test other supported compilers
variants = lib.genAttrs ["ghc8107"] (compiler-nix-name: {
variants = lib.genAttrs ["ghc8107" "ghc964"] (compiler-nix-name: {
inherit compiler-nix-name;
});
}
Expand Down

0 comments on commit 58cecb6

Please sign in to comment.