Merge pull request #47 from solomon-b/solomon/update-flake-and-ci

Update flake and github actions

.github/workflows/cabal.yml

@@ -19,15 +19,15 @@ jobs:
 
     strategy:
       matrix:
-        cabal: ["3.6"]
-        ghc: ["8.10.7", "9.0.2", "9.2.4", "9.4.5", "9.6.2"]
+        cabal: ["3.6", "3.10"]
+        ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.3"]
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Setup
-        uses: haskell/actions/setup@v1
+        uses: haskell-actions/setup@v2
         id: setup-haskell-cabal
         with:
           ghc-version: ${{ matrix.ghc }}

flake.nix

@@ -8,6 +8,8 @@
 
   outputs = { self, nixpkgs, flake-utils }:
     let
+      ghcVersion = "963";
+      compiler = "ghc${ghcVersion}";
       overlay = import ./overlay.nix;
       overlays = [ overlay ];
     in
@@ -19,9 +21,9 @@
         rec {
           devShell = pkgs.mkShell {
             buildInputs = with pkgs; [
-              pkgs.haskellPackages.cabal-install
-              pkgs.haskellPackages.ghc
-              pkgs.haskellPackages.haskell-language-server
+              cabal-install
+              haskell.compiler.${compiler}
+              haskell.packages.${compiler}.haskell-language-server
               nixpkgs-fmt
               ormolu
             ];