diff --git a/build.nix b/build.nix index 6939a16517..70a2ab772e 100644 --- a/build.nix +++ b/build.nix @@ -60,12 +60,7 @@ in rec { } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.11") { "hls" = tool compiler-nix-name "haskell-language-server" { inherit evalPackages; - src = pkgs.haskell-nix.sources.hls; - cabalProjectLocal = '' - if impl(ghc >=9.6.7) && impl(ghc <9.7) || impl(ghc >=9.8.3) - constraints: ghc-lib-parser >=9.8.4 - allow-older: ghc-lib-parser:filepath - ''; + src = pkgs.haskell-nix.sources."hls-2.10"; }; }) ); diff --git a/flake.lock b/flake.lock index 095211d470..6bfa0c5871 100644 --- a/flake.lock +++ b/flake.lock @@ -336,6 +336,23 @@ "type": "github" } }, + "hls-2.10": { + "flake": false, + "locked": { + "lastModified": 1743069404, + "narHash": "sha256-q4kDFyJDDeoGqfEtrZRx4iqMVEC2MOzCToWsFY+TOzY=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "2318c61db3a01e03700bd4b05665662929b7fe8b", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.10.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -488,6 +505,7 @@ "hls-2.7": "hls-2.7", "hls-2.8": "hls-2.8", "hls-2.9": "hls-2.9", + "hls-2.10": "hls-2.10", "hpc-coveralls": "hpc-coveralls", "iserv-proxy": "iserv-proxy", "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 65ffb7ef5e..017d695555 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,7 @@ "hls-2.7" = { url = "github:haskell/haskell-language-server/2.7.0.0"; flake = false; }; "hls-2.8" = { url = "github:haskell/haskell-language-server/2.8.0.0"; flake = false; }; "hls-2.9" = { url = "github:haskell/haskell-language-server/2.9.0.1"; flake = false; }; + "hls-2.10" = { url = "github:haskell/haskell-language-server/2.10.0.0"; flake = false; }; "hls" = { url = "github:haskell/haskell-language-server"; flake = false; }; hackage = { url = "github:input-output-hk/hackage.nix"; diff --git a/test/haskell-language-server/cabal.nix b/test/haskell-language-server/cabal.nix index 3d1e5c378b..9c218d4bb7 100644 --- a/test/haskell-language-server/cabal.nix +++ b/test/haskell-language-server/cabal.nix @@ -3,13 +3,8 @@ let project = haskell-nix.cabalProject' { inherit compiler-nix-name evalPackages; name = "haskell-language-server"; - src = haskell-nix.sources.hls; + src = haskell-nix.sources."hls-2.10"; configureArgs = "--disable-benchmarks --disable-tests"; # This makes cabalProject' more like the `tool` function - cabalProjectLocal = '' - if impl(ghc >=9.6.7) && impl(ghc <9.7) || impl(ghc >=9.8.3) - constraints: ghc-lib-parser >=9.8.4 - allow-older: ghc-lib-parser:filepath - ''; }; in recurseIntoAttrs { ifdInputs = {