disable hls for 9.7+

We need to find a hls (and have it in haskell.nix) that builds with 9.8 🤦
input-output-hk · Apr 14, 2024 · 4fc484c · 4fc484c
1 parent 0a021de
commit 4fc484c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dynamic.nix b/dynamic.nix
@@ -95,7 +95,7 @@ pkgs.mkShell {
         ++ pkgs.lib.optional pkgs.stdenv.hostPlatform.isLinux systemd
     )
     ++ pkgs.lib.optional (withHLS && (compiler-not-in (
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.10" >= 0) compiler-nix-name
+         pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
       ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) (tool "haskell-language-server")
     ++ pkgs.lib.optional (withHlint && (compiler-not-in (
          pkgs.lib.optional (builtins.compareVersions compiler.version "9.10" >= 0) compiler-nix-name

diff --git a/static.nix b/static.nix
@@ -142,7 +142,7 @@ pkgs.mkShell (rec {
         stdenv.cc.cc.lib ]) ++ (with pkgs.buildPackages; [
     ])
     ++ pkgs.lib.optional (withHLS && (compiler-not-in (
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.9" >= 0) compiler-nix-name) "Haskell Language Server")) (tool "haskell-language-server")
+         pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name) "Haskell Language Server")) (tool "haskell-language-server")
     ++ pkgs.lib.optional (withHlint && (compiler-not-in (
          pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name) "HLint")) (tool "hlint")
     ++ pkgs.lib.optional withIOG (with pkgs; [ cddl cbor-diag ])