Revert to using GHC9.8.2 + HLS 2.9

IntersectMBO · Jan 28, 2025 · 3c6cdf7 · 3c6cdf7
1 parent f362331
commit 3c6cdf7
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 83 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -30,30 +30,11 @@
     ];
 
     # see flake `variants` below for alternative compilers
-    defaultCompiler = "ghc984";
+    defaultCompiler = "ghc982";
     haddockShellCompiler = defaultCompiler;
     # Used for cross compilation, and so referenced in .github/workflows/release-upload.yml. Adapt the
     # latter if you change this value.
     crossCompilerVersion = "ghc966";
-    hls2901overlay = final: prev:
-      let
-        hlsExes =
-          (final.haskell-nix.cabalProject {
-            src = final.fetchFromGitHub {
-              owner = "haskell";
-              repo = "haskell-language-server";
-              rev = "d75400d7a3416a71b900e54177124ac1183a340b";
-              hash = "sha256-m58D1Oe6oWbJ7E9xzEf9TsUx5wXIx4c2tWnxKwIFGEo=";
-            };
-            # index-state = "2024-12-24T12:56:48Z";
-            compiler-nix-name = defaultCompiler;
-          })
-          .haskell-language-server
-          .components
-          .exes;
-      in {
-        inherit (hlsExes) haskell-language-server haskell-language-server-wrapper;
-      };
   in
     {inherit (inputs) incl;}
     // inputs.flake-utils.lib.eachSystem supportedSystems (
@@ -68,7 +49,6 @@
             inputs.haskellNix.overlay
             # configure haskell.nix to use iohk-nix crypto librairies.
             inputs.iohkNix.overlays.haskell-nix-crypto
-            hls2901overlay
           ];
           inherit system;
           inherit (inputs.haskellNix) config;
@@ -114,18 +94,18 @@
           shell.tools =
             {
               cabal = "3.14.1.1";
-              ghcid = "0.8.9";
             }
             // lib.optionalAttrs (config.compiler-nix-name == defaultCompiler) {
               # tools that work only with default compiler
+              ghcid = "0.8.9";
               cabal-gild = "1.3.1.2";
               fourmolu = "0.17.0.0";
-              # haskell-language-server = "2.9.0.0"; # nixpkgs.haskell-nix.sources."hls-2.9";
+              haskell-language-server.src = nixpkgs.haskell-nix.sources."hls-2.9";
               hlint = "3.8";
               stylish-haskell = "0.14.6.0";
             };
           # and from nixpkgs or other inputs
-          shell.nativeBuildInputs = with nixpkgs; [gh jq yq-go actionlint shellcheck haskell-language-server haskell-language-server-wrapper] ++ (lib.optional isDarwin macOS-security);
+          shell.nativeBuildInputs = with nixpkgs; [gh jq yq-go actionlint shellcheck haskell-language-server] ++ (lib.optional isDarwin macOS-security);
           # disable Hoogle until someone request it
           shell.withHoogle = false;
           # Skip cross compilers for the shell