From 3ac426d9f7cf252d5a20a02c60d4988a43dbb3f2 Mon Sep 17 00:00:00 2001
From: Kostas Dermentzis <kostas.dermentzis@iohk.io>
Date: Wed, 17 Apr 2024 20:46:26 +0300
Subject: [PATCH] Fix ghc-9.6

---
 flake.lock | 30 ++++++++++++++++++++++++------
 flake.nix  | 10 +++++-----
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7b71a971e..4e3d1b221 100644
--- a/flake.lock
+++ b/flake.lock
@@ -242,6 +242,7 @@
         "hls-2.4": "hls-2.4",
         "hls-2.5": "hls-2.5",
         "hls-2.6": "hls-2.6",
+        "hls-2.7": "hls-2.7",
         "hpc-coveralls": "hpc-coveralls",
         "hydra": "hydra",
         "iserv-proxy": "iserv-proxy",
@@ -261,11 +262,11 @@
         "stackage": "stackage"
       },
       "locked": {
-        "lastModified": 1712537422,
-        "narHash": "sha256-/8xrHBgPHS9NoFa8MAsO7oY3iCMGNdcWLzSWkbKc0OE=",
+        "lastModified": 1713315016,
+        "narHash": "sha256-HhXD+u9p1J4rQoH2KbgqRPq2YfaxF5+s/EusXpizKEk=",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "e5ff7b65946282a46e51e4058f72e38be8418c7b",
+        "rev": "8d6e6418ff112c0b5ea6f209d13af8459e52e4bc",
         "type": "github"
       },
       "original": {
@@ -393,6 +394,23 @@
         "type": "github"
       }
     },
+    "hls-2.7": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1708965829,
+        "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=",
+        "owner": "haskell",
+        "repo": "haskell-language-server",
+        "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "ref": "2.7.0.0",
+        "repo": "haskell-language-server",
+        "type": "github"
+      }
+    },
     "hpc-coveralls": {
       "flake": false,
       "locked": {
@@ -737,11 +755,11 @@
     "stackage": {
       "flake": false,
       "locked": {
-        "lastModified": 1712535048,
-        "narHash": "sha256-GkQdcpkvoX5XXfgCRSmFl3ibQRVwwa9vyJ/gtn8YW80=",
+        "lastModified": 1713148065,
+        "narHash": "sha256-8UGlrS4DgfaCtSYiSZzUGHi2WKqh8lY39gtEuFz+4lM=",
         "owner": "input-output-hk",
         "repo": "stackage.nix",
-        "rev": "ad3c8abb39f04fe28c4d57d56553e11c594705a4",
+        "rev": "0524bab941952ec29706f4c7c0db7ca283a0cf51",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 2e83d7e04..4dff6e68b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -142,10 +142,10 @@
             compiler-nix-name =
               if system == "x86_64-linux"
                 then lib.mkDefault "ghc810"
-                else lib.mkDefault "ghc963";
+                else lib.mkDefault "ghc96";
             flake.variants =
               let
-                compilers = lib.optionals (system == "x86_64-linux") ["ghc963"];
+                compilers = lib.optionals (system == "x86_64-linux") ["ghc96"];
               in
                 lib.genAttrs compilers (c: { compiler-nix-name = c; });
 
@@ -154,7 +154,7 @@
             };
 
             shell.tools = {
-              cabal = "3.10.1.0";
+              cabal = "3.10.3.0";
               ghcid = "0.8.8";
               haskell-language-server = {
                 src = nixpkgs.haskell-nix.sources."hls-1.10";
@@ -319,8 +319,8 @@
             nonRequiredMacOSPaths = [
               "checks.cardano-chain-gen:test:cardano-chain-gen"
               "checks.cardano-db:test:test-db"
-              "ghc963.checks.cardano-chain-gen:test:cardano-chain-gen"
-              "ghc963.checks.cardano-db:test:test-db"
+              "ghc96.checks.cardano-chain-gen:test:cardano-chain-gen"
+              "ghc96.checks.cardano-db:test:test-db"
             ];
 
             nonRequiredPaths =