summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorMalte Brandy <malte.brandy@maralorn.de>2020-07-14 23:05:38 +0200
committerPeter Simons <simons@cryp.to>2020-07-24 13:02:55 +0200
commit5e756f5f31e2cdf557ba6d7864306b66c067acb4 (patch)
tree472aec02f655ad43584b719e1de2e88bd6fe04f4 /pkgs/development/haskell-modules/configuration-common.nix
parent18121c65f36aba81e67b20a601087d35958cd1be (diff)
downloadnixpkgs-5e756f5f31e2cdf557ba6d7864306b66c067acb4.tar
nixpkgs-5e756f5f31e2cdf557ba6d7864306b66c067acb4.tar.gz
nixpkgs-5e756f5f31e2cdf557ba6d7864306b66c067acb4.tar.bz2
nixpkgs-5e756f5f31e2cdf557ba6d7864306b66c067acb4.tar.lz
nixpkgs-5e756f5f31e2cdf557ba6d7864306b66c067acb4.tar.xz
nixpkgs-5e756f5f31e2cdf557ba6d7864306b66c067acb4.tar.zst
nixpkgs-5e756f5f31e2cdf557ba6d7864306b66c067acb4.zip
haskellPackages.haskell-language-server: 0.1.0.0 -> 0.2.0.0
generated by
pkgs/development/tools/haskell/haskell-language-server/update.sh

with some manual tweaks
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0b5081306d3..eda66ac0049 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1358,15 +1358,18 @@ self: super: {
   # 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 (
+    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
           '';
-        })
-    );
+        })).override {
+          # we are faster than stack here
+          hie-bios = dontCheck self.hie-bios_0_6_1;
+          lsp-test = dontCheck self.lsp-test_0_11_0_2;
+        });
 
   haskell-language-server = (overrideCabal super.haskell-language-server
     (old: {
@@ -1381,8 +1384,9 @@ self: super: {
     })).override {
       # use a fork of ghcide
       ghcide = self.hls-ghcide;
-      # use specific version
-      ormolu = super.ormolu_0_0_5_0;
+      # we are faster than stack here
+      hie-bios = dontCheck self.hie-bios_0_6_1;
+      lsp-test = dontCheck self.lsp-test_0_11_0_2;
     };
 
   # https://github.com/kowainik/policeman/issues/57