[chore] compatibility with ghc ghc 9.6 (#4)

wireapp · May 29, 2024 · 5e0cad1 · 5e0cad1
1 parent 95ee8b5
commit 5e0cad1
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 75 deletions.
diff --git a/.github/workflows/test-flake.yml b/.github/workflows/test-flake.yml
@@ -8,9 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: cachix/install-nix-action@v22
+    - uses: cachix/install-nix-action@v27
       with:
         github_access_token: ${{ secrets.GITHUB_TOKEN }}
     - run: nix flake check -Lv --allow-import-from-derivation --fallback --accept-flake-config
     - run: nix build .#transitive-anns -Lv --fallback --accept-flake-config
+    - run: nix build .#ghc94-transitive-anns -Lv --fallback --accept-flake-config
     - run: nix build .#ghc92-transitive-anns -Lv --fallback --accept-flake-config
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -26,7 +26,6 @@
             hlint.enable = true;
 
             alejandra.enable = true;
-            statix.enable = true;
             deadnix.enable = true;
           };
         };
@@ -38,12 +37,18 @@
           devShell.mkShellArgs.shellHook = config.pre-commit.installationScript;
         };
 
-        haskellProjects.default = {
+        haskellProjects.ghc94 = {
           packages = {};
           settings = {};
           basePackages = pkgs.haskell.packages.ghc94;
           devShell.mkShellArgs.shellHook = config.pre-commit.installationScript;
         };
+        haskellProjects.default = {
+          packages = {};
+          settings = {};
+          basePackages = pkgs.haskellPackages;
+          devShell.mkShellArgs.shellHook = config.pre-commit.installationScript;
+        };
       };
     };
 }
diff --git a/src/TransitiveAnns/Plugin/Annotations.hs b/src/TransitiveAnns/Plugin/Annotations.hs
@@ -27,7 +27,7 @@ import qualified TransitiveAnns.Types as TA
 ------------------------------------------------------------------------------
 -- | Get the name and set of referenced variables for a binding.
 hsBinds :: HsBindLR GhcTc GhcTc -> Maybe (Var, Set Var)
-hsBinds (FunBind _ (L _ gl) mg _) = Just (gl, getVars mg)
+hsBinds FunBind {fun_id = (L _ gl), fun_matches = mg} = Just (gl, getVars mg)
 hsBinds PatBind{} = Nothing
 hsBinds VarBind{} = Nothing
 #if MIN_VERSION_GLASGOW_HASKELL(9,4,0,0)