From 38be99b74573e366aba823e94b622e5fbf3fc865 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 29 Oct 2024 23:56:20 +1300 Subject: [PATCH] Enable external-static-plugin test for GHC >=9.6 (Fixes #2265) --- test/external-static-plugin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/external-static-plugin/default.nix b/test/external-static-plugin/default.nix index d5a4ac7384..d1ba999259 100644 --- a/test/external-static-plugin/default.nix +++ b/test/external-static-plugin/default.nix @@ -1,4 +1,4 @@ -{ cabalProject', testSrc, compiler-nix-name, evalPackages, recurseIntoAttrs, haskellLib }: let +{ cabalProject', testSrc, compiler-nix-name, buildPackages evalPackages, recurseIntoAttrs, haskellLib }: let project = cabalProject' { src = testSrc "external-static-plugin"; inherit compiler-nix-name evalPackages; @@ -19,9 +19,9 @@ in recurseIntoAttrs { inherit (project) plan-nix; }; - meta.disabled = !(builtins.elem compiler-nix-name [ - "ghc810420210212" - ]) || haskellLib.isCrossHost; + meta.disabled = + __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.6" < 0 + || haskellLib.isCrossHost; build = project.hsPkgs.prog.components.exes.prog; }