haskell-language-server: Fix build

4 files changed, 1 insertions, 106 deletions

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 554fbb5c0f43..b701f6eeb8b8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -116,10 +116,6 @@ self: super: {
   # There will probably be a new revision soon.
   hls-brittany-plugin = assert super.hls-brittany-plugin.version == "1.1.0.0"; doJailbreak super.hls-brittany-plugin;
 
-  hls-hlint-plugin = super.hls-hlint-plugin.override {
-    apply-refact = self.apply-refact_0_11_0_0;
-  };
-
   # For -f-auto see cabal.project in haskell-language-server.
   ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex);
 
@@ -2544,16 +2540,6 @@ self: super: {
   # has been resolved.
   lucid-htmx = doJailbreak super.lucid-htmx;
 
-  # Needs lsp >= 2.1
-  futhark = super.futhark.override {
-    lsp = self.lsp_2_1_0_0;
-  };
-
-  # Provide matching lsp-types version
-  lsp_2_1_0_0 = doDistribute (super.lsp_2_1_0_0.override {
-    lsp-types = self.lsp-types_2_0_1_1;
-  });
-
   # Too strict bounds on hspec
   # https://github.com/klapaucius/vector-hashtables/issues/11
   vector-hashtables = doJailbreak super.vector-hashtables;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 9f32c9011113..1af167f53538 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -41,11 +41,6 @@ default-package-overrides:
   - dhall-nixpkgs == 1.0.9
   - dhall-nix == 1.1.25
 
-  # 2023-06-24: HLS at large can't deal with lsp-2.0.0.0 yet
-  - lsp == 1.6.*
-  - lsp-types == 1.6.*
-  - lsp-test == 0.14.*
-
   # 2023-07-06: ghcide-2.0.0.1 explicitly needs implicit-hie < 0.1.3, because some sort of
   # breaking change was introduced in implicit-hie-0.1.3.0.
   # https://github.com/haskell/haskell-language-server/blob/feb596592de95f09cf4ee885f3e74178161919f1/ghcide/ghcide.cabal#L107-L111
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 6b8e254c3af9..60e2f6fbd0aa 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -123,7 +123,6 @@ self: super: builtins.intersectAttrs super {
     hls-brittany-plugin
     hls-floskell-plugin
     hls-fourmolu-plugin
-    hls-cabal-plugin
     hls-overloaded-record-dot-plugin
   ;
 
@@ -134,6 +133,7 @@ self: super: builtins.intersectAttrs super {
     hls-gadt-plugin
 
     # https://github.com/haskell/haskell-language-server/pull/3431
+    hls-cabal-plugin
     hls-cabal-fmt-plugin
     hls-code-range-plugin
     hls-explicit-record-fields-plugin
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e24134ff2ed0..972ac30bd5b2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -190940,35 +190940,6 @@ self: {
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring
      , co-log-core, containers, data-default, directory, exceptions
      , filepath, hashable, hspec, hspec-discover, lens, lsp-types, mtl
-     , prettyprinter, random, sorted-list, stm, temporary, text
-     , text-rope, transformers, unliftio-core, unordered-containers
-     , uuid
-     }:
-     mkDerivation {
-       pname = "lsp";
-       version = "1.6.0.0";
-       sha256 = "0w04n299d8yh545jggh93wm6nxpp5jwz8hr7qynbxslcdrv06s49";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async attoparsec base bytestring co-log-core containers
-         data-default directory exceptions filepath hashable lens lsp-types
-         mtl prettyprinter random sorted-list stm temporary text text-rope
-         transformers unliftio-core unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         base containers hspec sorted-list text text-rope
-         unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Haskell library for the Microsoft Language Server Protocol";
-       license = lib.licenses.mit;
-     }) {};
-
-  "lsp_2_1_0_0" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bytestring
-     , co-log-core, containers, data-default, directory, exceptions
-     , filepath, hashable, hspec, hspec-discover, lens, lsp-types, mtl
      , prettyprinter, random, row-types, sorted-list, stm, temporary
      , text, text-rope, transformers, unliftio-core
      , unordered-containers, uuid
@@ -190992,7 +190963,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell library for the Microsoft Language Server Protocol";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lsp-client" = callPackage
@@ -191025,35 +190995,6 @@ self: {
      , bytestring, co-log-core, conduit, conduit-parse, containers
      , data-default, Diff, directory, exceptions, extra, filepath, Glob
      , hspec, lens, lsp, lsp-types, mtl, parser-combinators, process
-     , some, text, time, transformers, unix, unliftio
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "lsp-test";
-       version = "0.14.1.0";
-       sha256 = "0db4mpzn05k3isk1a3rdpqr7if9j0kr3bxdri9739q9a8azf4fp1";
-       libraryHaskellDepends = [
-         aeson aeson-pretty ansi-terminal async base bytestring co-log-core
-         conduit conduit-parse containers data-default Diff directory
-         exceptions filepath Glob lens lsp lsp-types mtl parser-combinators
-         process some text time transformers unix unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base co-log-core data-default directory filepath hspec lens
-         lsp mtl parser-combinators process text unliftio
-         unordered-containers
-       ];
-       testToolDepends = [ lsp ];
-       benchmarkHaskellDepends = [ base extra lsp process ];
-       description = "Functional test framework for LSP servers";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "lsp-test_0_15_0_1" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
-     , bytestring, co-log-core, conduit, conduit-parse, containers
-     , data-default, Diff, directory, exceptions, extra, filepath, Glob
-     , hspec, lens, lsp, lsp-types, mtl, parser-combinators, process
      , row-types, some, text, time, transformers, unix, unliftio
      }:
      mkDerivation {
@@ -191074,7 +191015,6 @@ self: {
        benchmarkHaskellDepends = [ base extra lsp process ];
        description = "Functional test framework for LSP servers";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lsp-types_1_4_0_1" = callPackage
@@ -191103,31 +191043,6 @@ self: {
 
   "lsp-types" = callPackage
     ({ mkDerivation, aeson, base, binary, containers, data-default
-     , deepseq, Diff, dlist, exceptions, filepath, hashable, hspec
-     , hspec-discover, lens, mod, mtl, network-uri, QuickCheck
-     , quickcheck-instances, safe, scientific, some, template-haskell
-     , text, tuple, unordered-containers
-     }:
-     mkDerivation {
-       pname = "lsp-types";
-       version = "1.6.0.0";
-       sha256 = "00lqq5lw7pi8qrnjlibsvhldp747kdc9zkr6rg3bbkbz7kxw8p9q";
-       libraryHaskellDepends = [
-         aeson base binary containers data-default deepseq Diff dlist
-         exceptions filepath hashable lens mod mtl network-uri safe
-         scientific some template-haskell text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base filepath hspec lens network-uri QuickCheck
-         quickcheck-instances text tuple
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Haskell library for the Microsoft Language Server Protocol, data types";
-       license = lib.licenses.mit;
-     }) {};
-
-  "lsp-types_2_0_1_1" = callPackage
-    ({ mkDerivation, aeson, base, binary, containers, data-default
      , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath
      , hashable, hspec, hspec-discover, lens, mod, mtl, network-uri
      , prettyprinter, QuickCheck, quickcheck-instances, regex, row-types
@@ -191155,7 +191070,6 @@ self: {
        doHaddock = false;
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "generator";
      }) {};