Skip to content

Commit 38be99b

Browse files
committed
Enable external-static-plugin test for GHC >=9.6 (Fixes #2265)
1 parent 329d7f0 commit 38be99b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

test/external-static-plugin/default.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ cabalProject', testSrc, compiler-nix-name, evalPackages, recurseIntoAttrs, haskellLib }: let
1+
{ cabalProject', testSrc, compiler-nix-name, buildPackages evalPackages, recurseIntoAttrs, haskellLib }: let
22
project = cabalProject' {
33
src = testSrc "external-static-plugin";
44
inherit compiler-nix-name evalPackages;
@@ -19,9 +19,9 @@ in recurseIntoAttrs {
1919
inherit (project) plan-nix;
2020
};
2121

22-
meta.disabled = !(builtins.elem compiler-nix-name [
23-
"ghc810420210212"
24-
]) || haskellLib.isCrossHost;
22+
meta.disabled =
23+
__compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.6" < 0
24+
|| haskellLib.isCrossHost;
2525

2626
build = project.hsPkgs.prog.components.exes.prog;
2727
}

0 commit comments

Comments
 (0)