haskellPackages.haskell-language-server: Fix build

3 files changed, 63 insertions, 2 deletions

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 12a5c6e47fd5..0da79cdd7935 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1446,8 +1446,9 @@ self: super: {
   # 1. test requires internet
   # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
   ghcide = doDistribute (unmarkBroken (dontCheck
-    (super.ghcide.override { lsp-test = dontCheck self.lsp-test_0_11_0_7; })
-  ));
+  (super.ghcide_0_7_0_0.override {
+    lsp-test = dontCheck self.lsp-test_0_11_0_7;
+  })));
   refinery = doDistribute super.refinery_0_3_0_0;
   data-tree-print = doJailbreak super.data-tree-print;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7fc88da77938..656299c7bab1 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2695,6 +2695,7 @@ extra-packages:
   - dependent-map == 0.2.4.0            # required by Hasura 1.3.1, 2020-08-20
   - dependent-sum == 0.4                # required by Hasura 1.3.1, 2020-08-20
   - network == 2.6.3.1                  # required by pkgs/games/hedgewars/default.nix, 2020-11-15
+  - ghcide == 0.7.0.0                   # Needed for hls 0.8.0
 
 package-maintainers:
   peti:
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 24ffba078d47..6f145fd4a617 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -100993,6 +100993,65 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghcide_0_7_0_0" = callPackage
+    ({ mkDerivation, aeson, array, async, base, base16-bytestring
+     , binary, bytestring, case-insensitive, containers, cryptohash-sha1
+     , data-default, deepseq, directory, extra, filepath, fingertree
+     , fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check, ghc-paths
+     , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable
+     , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat
+     , hls-plugin-api, hslogger, implicit-hie-cradle, lens, lsp-test
+     , mtl, network-uri, opentelemetry, optparse-applicative, parallel
+     , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck
+     , quickcheck-instances, record-dot-preprocessor, record-hasfield
+     , regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake
+     , shake-bench, sorted-list, stm, syb, tasty, tasty-expected-failure
+     , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time
+     , transformers, unix, unordered-containers, utf8-string, yaml
+     }:
+     mkDerivation {
+       pname = "ghcide";
+       version = "0.7.0.0";
+       sha256 = "165dbwbcpl2r7jqsjk859c42yas8h877mx37d0jnx8vm47fdy484";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array async base base16-bytestring binary bytestring
+         case-insensitive containers cryptohash-sha1 data-default deepseq
+         directory extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th
+         ghc-check ghc-paths Glob haddock-library hashable haskell-lsp
+         haskell-lsp-types heapsize hie-bios hie-compat hls-plugin-api
+         hslogger implicit-hie-cradle lens mtl network-uri opentelemetry
+         parallel prettyprinter prettyprinter-ansi-terminal regex-tdfa
+         rope-utf16-splay safe safe-exceptions shake sorted-list stm syb
+         text time transformers unix unordered-containers utf8-string
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers data-default directory extra
+         filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize
+         hie-bios hls-plugin-api lens lsp-test optparse-applicative process
+         safe-exceptions shake text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers data-default directory
+         extra filepath ghc ghc-typelits-knownnat haddock-library
+         haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test
+         network-uri optparse-applicative process QuickCheck
+         quickcheck-instances record-dot-preprocessor record-hasfield
+         rope-utf16-splay safe safe-exceptions shake tasty
+         tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
+         text
+       ];
+       benchmarkHaskellDepends = [
+         aeson base directory filepath shake shake-bench text yaml
+       ];
+       description = "The core of an IDE";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       broken = true;
+     }) {shake-bench = null;};
+
   "ghcide" = callPackage
     ({ mkDerivation, aeson, array, async, base, base16-bytestring
      , binary, bytestring, case-insensitive, containers, cryptohash-sha1