Update nix and CI

Author: berberman

.github/workflows/test.yml

@@ -170,7 +170,7 @@ jobs:
         name: Test hls-class-plugin
         run: cabal test hls-class-plugin --test-options="-j1 --rerun-update" || cabal test hls-class-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-class-plugin --test-options="-j1 --rerun"
 
-      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc == '9.0.1' }}
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc }}
         name: Test hls-eval-plugin
         run: cabal test hls-eval-plugin --test-options="-j1 --rerun-update" || cabal test hls-eval-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="-j1 --rerun"
 

configuration-ghc-901.nix

@@ -9,7 +9,6 @@ let
     "hls-fourmolu-plugin"
     "hls-splice-plugin"
     "hls-ormolu-plugin"
-    "hls-eval-plugin"
     "hls-class-plugin"
     "hls-refine-imports-plugin"
   ];
@@ -106,7 +105,6 @@ let
         (pkgs.lib.concatStringsSep " " [
           "-f-brittany"
           "-f-class"
-          "-f-eval"
           "-f-fourmolu"
           "-f-ormolu"
           "-f-splice"

plugins/hls-eval-plugin/test/Main.hs

@@ -20,11 +20,13 @@ import           System.FilePath         ((</>))
 import           Test.Hls
 
 main :: IO ()
-main = defaultTestRunner $ if ghcVersion == GHC901 then tests else dummyTestCase
+main = defaultTestRunner $ ignore tests
 
--- | Now we only maintain test cases for GHC 9.0.1
-dummyTestCase :: TestTree
-dummyTestCase = testCase "Tests are skipped before GHC 9.0.1" $ pure ()
+ignore :: TestTree -> TestTree
+ignore =
+    if ghcVersion == GHC901
+       then id
+       else ignoreTestBecause "Eval plugin tests are enabled for GHC 9.0.1"
 
 evalPlugin :: PluginDescriptor IdeState
 evalPlugin = Eval.descriptor "eval"