diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0cd18a172d4d..01817d2c01f5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -198,25 +198,12 @@ with haskellLib; } ); - # First to upgrade to lsp >= 2.8 while HLS hasn't yet had a compatible release - futhark = super.futhark.override { - lsp = self.lsp_2_8_0_0; - lsp-test = - overrideCabal - (old: { - testTargets = [ - "tests" - "func-test" - ]; - }) - ( - self.lsp-test_0_18_0_0.override { - lsp = self.lsp_2_8_0_0; - lsp-types = self.lsp-types_2_4_0_0; - } - ); - lsp-types = self.lsp-types_2_4_0_0; - }; + lsp-test = overrideCabal (old: { + testTargets = [ + "tests" + "func-test" + ]; + }) super.lsp-test; ####################################### ### HASKELL-LANGUAGE-SERVER SECTION ### @@ -280,7 +267,6 @@ with haskellLib; haskell-language-server hls-plugin-api ghcide - lsp-types ; # For -f-auto see cabal.project in haskell-language-server. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 4dd8652f5b3f..fee8bef287ea 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -32,9 +32,6 @@ default-package-overrides: - extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10) # 2026-01-30: Needs to match hasql from Stackage LTS 24 - hasql-notifications < 0.2.5.0 - # 2026-02-04: as requested by ghcide >= 2.13 - - hie-bios < 0.18.0 - - hiedb < 0.8.0 # 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8 # https://github.com/haskell-nix/hnix/pull/1112 # Note: When removing this, also remove hnix-store-core from maintainers/scripts/haskell/update-stackage.sh @@ -49,10 +46,6 @@ default-package-overrides: # liquidhaskell(-boot) support one GHC at a time, so we choose the one matching the current GHC (9.10) - liquidhaskell == 0.9.10.* - liquidhaskell-boot == 0.9.10.* - # 2025-03-07: HLS and many other pkgs don't support lsp >= 2.8 (yet) - - lsp < 2.8 - - lsp-test < 0.18 - - lsp-types < 2.4 # Needs to match microlens == 0.4.* in Stackage LTS 24 - microlens-pro < 0.2.0.4 # 2026-04-06: 4.0.10 merely adjusts to dependencies that are incompatible with our LTS