Skip to content

Commit 9f09232

Browse files
authored
Enable ghc plugin test for 9.8.1 and above (#2158)
* Enable ghc plugin test for 9.8.1 and above * ifdLevel 0 * ifdLevel 1 * Fix reinstallableLibGhc = false for ghc 9.8.1 * Use reinstallableLibGhc = false to get plugin test working * ifdLevel 2 * ifdLevel 3 * Fix version check * Disable plugin test for ghc HEAD
1 parent 89f23f6 commit 9f09232

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

modules/component-driver.nix

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ in
7777
++ lib.optionals (builtins.compareVersions config.compiler.version "8.11" >= 0) [
7878
# stm and exceptions are needed by the GHC package since 9.0.1
7979
"stm" "exceptions"]
80+
++ lib.optionals (builtins.compareVersions config.compiler.version "9.8.1" >= 0) [
81+
"semaphore-compat"]
8082
)
8183
++ lib.optionals (!config.reinstallableLibGhc || __elem config.compiler.nix-name ["ghc865"]) [
8284
"ghc-heap"

test/plugin/default.nix

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ let
66
project = project' {
77
inherit compiler-nix-name evalPackages;
88
src = testSrc "plugin";
9+
modules = [{
10+
reinstallableLibGhc = builtins.compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8.1" < 0;
11+
}];
912
};
1013

1114
packages = project.hsPkgs;
@@ -17,8 +20,7 @@ in recurseIntoAttrs {
1720

1821
# Not sure why this breaks for ghc 8.10.7
1922
meta.disabled = compiler-nix-name == "ghc8107"
20-
# TODO remove once polysemy works with ghc 9.8.1
21-
|| __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8.1" >= 0
23+
|| compiler-nix-name == "ghc9920231203"
2224
|| stdenv.hostPlatform.isMusl
2325
|| stdenv.hostPlatform.isGhcjs
2426
|| stdenv.hostPlatform.isWindows

0 commit comments

Comments
 (0)