support ghc 9.4 and 9.6

kokobd · Feb 12, 2024 · fb43d13 · fb43d13
1 parent 7452c2b
commit fb43d13
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 22 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,13 +8,11 @@ jobs:
           - ubuntu-latest
           - macos-latest
         ghc:
-          - "8.10.7"
-          - "9.0.2"
-          - "9.2.4"
+          - "9.2.8"
+          - "9.4.8"
+          - "9.6.4"
         exclude:
-        # precompiled 9.0 and 9.2 don't have docs
-          - os: macos-latest
-            ghc: "9.0.2"
+        # precompiled 9.0 and 9.2 don't have docs on MacOS
           - os: macos-latest
             ghc: "9.2.4"
     runs-on: ${{ matrix.os }}
@@ -31,7 +29,7 @@ jobs:
           ghcup list
           ghcup rm ghc ${{ matrix.ghc }} || true
           ghcup install ghc ${{ matrix.ghc }} --set
-          ghcup install cabal 3.6.2.0 --set
+          ghcup install cabal 3.10.2.1 --set
           cabal update
       - name: Build
         run: |

diff --git a/cabal-hoogle.cabal b/cabal-hoogle.cabal
@@ -37,9 +37,9 @@ library
     , optparse-applicative  >=0.16     && <1
     , regex-tdfa            ^>=1.3.1
     , string-interpolate    ^>=0.3.1.2
-    , text                  ^>=1.2.4
+    , text                  ^>=1.2.4   || ^>=2.0
     , time                  >=1.10     && <2
-    , transformers          ^>=0.5.6
+    , transformers          ^>=0.5.6   || ^>=0.6
     , typed-process         ^>=0.2.10
 
   default-language:   Haskell2010

diff --git a/cabal.project b/cabal.project
@@ -1,2 +1 @@
 packages: ./
-index-state: 2023-06-05T00:00:00Z
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -8,8 +8,8 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
-        compilers = [ "ghc8107" "ghc926" "ghc944" ];
-        defaultCompiler = "ghc8107";
+        compilers = [ "ghc92" "ghc94" "ghc96" ];
+        defaultCompiler = "ghc94";
 
         mkShell = compiler: pkgs.mkShell {
           buildInputs = with pkgs; [
@@ -20,10 +20,10 @@
             haskell.compiler.${compiler}
             ormolu
             miniserve
-          ] ++ (with haskell.packages.${compiler}; [
-            haskell-language-server
-            cabal-fmt
-          ]);
+          ] ++ (with haskell.packages.${compiler};
+            (lib.lists.optional (compiler != "ghc96") haskell-language-server) ++
+              [ cabal-fmt ghcid ]
+          );
           shellHook = ''
             export CABAL_DIR=$(pwd)/.cabal
             export CABAL_CONFIG=$(pwd)/.cabal/config