diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1eb9382486e5..2ba1b629be0f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -193,6 +193,20 @@ 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; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 6794a86fc302..9bcbcae3953c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -32,7 +32,6 @@ default-package-overrides: # 2025-12-26: Needs to match egison-pattern-src from Stackage LTS - egison-pattern-src-th-mode < 0.2.2 - extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10) - - futhark-server == 1.3.0.0 # required by futhark-0.25.36 # 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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 33ca5ce1d9cf..d973d37571e4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -255007,39 +255007,6 @@ self: { ) { }; futhark-server = callPackage ( - { - mkDerivation, - base, - binary, - bytestring, - directory, - futhark-data, - mtl, - process, - temporary, - text, - }: - mkDerivation { - pname = "futhark-server"; - version = "1.3.0.0"; - sha256 = "1v8c5zfsc6x48z31lrfcyibbj4742cql3lglg6l59ly39cxi4and"; - libraryHaskellDepends = [ - base - binary - bytestring - directory - futhark-data - mtl - process - temporary - text - ]; - description = "Client implementation of the Futhark server protocol"; - license = lib.meta.getLicenseFromSpdxId "ISC"; - } - ) { }; - - futhark-server_1_3_3_0 = callPackage ( { mkDerivation, base, @@ -255069,7 +255036,6 @@ self: { ]; description = "Client implementation of the Futhark server protocol"; license = lib.meta.getLicenseFromSpdxId "ISC"; - hydraPlatforms = lib.platforms.none; } ) { };