Fixes for hlint and hls

Author: hamishmack

cross-js.nix

@@ -4,11 +4,10 @@ let tool-version-map = (import ./tool-map.nix) self;
     cabal-install = tool "cabal";
     haskell-tools =
          pkgs.lib.optionalAttrs (withHLS && (compiler-not-in (
-           # it appears we can't get HLS build with 9.8 yet.
-           pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.11" >= 0) compiler-nix-name
         ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) { hls = tool "haskell-language-server"; }
       // pkgs.lib.optionalAttrs (withHlint && (compiler-not-in (
-           pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.11" >= 0) compiler-nix-name
         ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "HLint")) { hlint = tool "hlint"; };
     # add a trace helper. This will trace a message about disabling a component despite requesting it, if it's not supported in that compiler.
     compiler-not-in = compiler-list: name: (if __elem compiler-nix-name compiler-list then __trace "No ${name}. Not yet compatible with ${compiler-nix-name}" false else true);

cross-windows.nix

@@ -5,10 +5,10 @@ let tool-version-map = (import ./tool-map.nix) self;
     haskell-tools =
          pkgs.lib.optionalAttrs (withHLS && (compiler-not-in (
            # it appears we can't get HLS build with 9.8 yet.
-           pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.11" >= 0) compiler-nix-name
         ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) { hls = tool "haskell-language-server"; }
       // pkgs.lib.optionalAttrs (withHlint && (compiler-not-in (
-           pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.11" >= 0) compiler-nix-name
         ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "HLint")) { hlint = tool "hlint"; };
     # add a trace helper. This will trace a message about disabling a component despite requesting it, if it's not supported in that compiler.
     compiler-not-in = compiler-list: name: (if __elem compiler-nix-name compiler-list then __trace "No ${name}. Not yet compatible with ${compiler-nix-name}" false else true);

dynamic.nix

@@ -5,10 +5,10 @@ let tool-version-map = (import ./tool-map.nix) self;
     cabal-install = tool "cabal";
     haskell-tools =
          pkgs.lib.optionalAttrs (withHLS && (compiler-not-in (
-           pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.11" >= 0) compiler-nix-name
         ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) { hls = tool "haskell-language-server"; }
       // pkgs.lib.optionalAttrs (withHlint && (compiler-not-in (
-           pkgs.lib.optional (builtins.compareVersions compiler.version "9.10" >= 0) compiler-nix-name
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.11" >= 0) compiler-nix-name
         ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "HLint")) { hlint = tool "hlint"; };
     # add a trace helper. This will trace a message about disabling a component despite requesting it, if it's not supported in that compiler.
     compiler-not-in = compiler-list: name: (if __elem compiler-nix-name compiler-list then __trace "No ${name}. Not yet compatible with ${compiler-nix-name}" false else true);

static.nix

@@ -4,9 +4,9 @@ let tool-version-map = (import ./tool-map.nix) self;
     cabal-install = tool "cabal";
     haskell-tools =
         pkgs.lib.optionalAttrs (withHLS && (compiler-not-in (
-           pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name) "Haskell Language Server")) { hls = tool "haskell-language-server"; }
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.11" >= 0) compiler-nix-name) "Haskell Language Server")) { hls = tool "haskell-language-server"; }
       // pkgs.lib.optionalAttrs (withHlint && (compiler-not-in (
-           pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name) "HLint")) { hlint = tool "hlint"; };
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.11" >= 0) compiler-nix-name) "HLint")) { hlint = tool "hlint"; };
     # add a trace helper. This will trace a message about disabling a component despite requesting it, if it's not supported in that compiler.
     compiler-not-in = compiler-list: name: (if __elem compiler-nix-name compiler-list then __trace "No ${name}. Not yet compatible with ${compiler-nix-name}" false else true);
 

tool-map.nix

@@ -59,4 +59,10 @@ compiler-nix-name: tool: {
       index-state: hackage.haskell.org 2025-03-17T00:00:00Z
     '';
   };
+  hlint = {
+    cabalProjectLocal = ''
+      if impl(ghc ==9.8.4)
+        constraints: ghc-lib-parser <9.12.2
+    '';
+  };
 }.${tool} or fixed-versions.${tool}.${compiler-nix-name} or {}