Merge pull request #91279 from GuillaumeDesforges/haskell-language-server

haskell-language-server: init at 0.1.0.0

pkgs/development/haskell-modules/configuration-common.nix

@@ -1415,6 +1415,46 @@ self: super: {
   # 2020-06-24: Tests are broken in hackage distribution.
   # See: https://github.com/robstewart57/rdf4h/issues/39
   rdf4h = dontCheck super.rdf4h;
+  
+  # hasn't bumped upper bounds
+  # test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)"
+  # https://github.com/ennocramer/floskell/issues/48
+  floskell = dontCheck (doJailbreak super.floskell);
+
+  # hasn't bumped upper bounds
+  # test fails because of a "Warning: Unused LANGUAGE pragma"
+  # https://github.com/ennocramer/monad-dijkstra/issues/4
+  monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra);
+
+  # haskell-language-server uses its own fork of ghcide
+  # Test disabled: it seems to freeze (is it just that it takes a long time ?)
+  hls-ghcide = 
+    dontCheck (
+      overrideCabal super.hls-ghcide
+        (old: {
+          # The integration test run by lsp-test requires the executable to be in the PATH
+          preCheck = ''
+            export PATH=$PATH:dist/build/ghcide
+          '';
+        })
+    );
+
+  haskell-language-server = (overrideCabal super.haskell-language-server
+    (old: {
+      # The integration test run by lsp-test requires the executable to be in the PATH
+      preCheck = ''
+        export PATH=$PATH:dist/build/haskell-language-server
+      '';
+
+      # test needs the git tool
+      testToolDepends = old.testToolDepends
+        ++ [ pkgs.git ];
+    })).override {
+      # use a fork of ghcide
+      ghcide = self.hls-ghcide;
+      # use specific version
+      ormolu = super.ormolu_0_0_5_0;
+    };
 
   # https://github.com/kowainik/policeman/issues/57
   policeman = doJailbreak super.policeman;

pkgs/development/haskell-modules/configuration-hackage2nix.yaml

@@ -2586,6 +2586,7 @@ extra-packages:
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
   - network == 3.0.*                    # required by network-bsd, HTTP, and many others (2019-04-30)
+  - ormolu == 0.0.5.0                   # required by haskell-language-server
   - pantry == 0.2.0.0                   # required by stack-2.1.3.1
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
   - patience ^>= 0.1                    # required by chell-0.4.x
@@ -4988,7 +4989,6 @@ broken-packages:
   - flite
   - float-binstring
   - floating-bits
-  - floskell
   - flow-er
   - flow2dot
   - flowdock
@@ -7698,7 +7698,6 @@ broken-packages:
   - monad-atom
   - monad-atom-simple
   - monad-branch
-  - monad-dijkstra
   - monad-exception
   - monad-finally
   - monad-fork

pkgs/development/haskell-modules/hackage-packages.nix

@@ -89273,8 +89273,6 @@ self: {
        ];
        description = "A flexible Haskell source code pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flow" = callPackage
@@ -169531,8 +169529,6 @@ self: {
        testHaskellDepends = [ base hlint tasty tasty-hspec ];
        description = "A monad transformer for weighted graph searches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-exception" = callPackage
@@ -184992,6 +184988,34 @@ self: {
        broken = true;
      }) {};
 
+  "ormolu_0_0_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dlist, exceptions
+     , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl
+     , optparse-applicative, path, path-io, syb, text
+     }:
+     mkDerivation {
+       pname = "ormolu";
+       version = "0.0.5.0";
+       sha256 = "1sf22silpj89sldd7wanlr34nsv77bq0cf4i0q1x2r20pz7s4w4m";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers dlist exceptions ghc-lib-parser mtl syb
+         text
+       ];
+       executableHaskellDepends = [
+         base ghc-lib-parser gitrev optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base containers filepath hspec path path-io text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A formatter for Haskell source code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ormolu" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, exceptions
      , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl

pkgs/development/haskell-modules/non-hackage-packages.nix

@@ -16,4 +16,9 @@ self: super: {
   # spago is not released to Hackage.
   # https://github.com/spacchetti/spago/issues/512
   spago = self.callPackage ../tools/purescript/spago/spago.nix { };
+
+  # HLS and its fork of ghcide that it uses
+  # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh
+  haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { };
+  hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { };
 }