summary refs log tree commit diff
diff options
context:
space:
mode:
authorMalte Brandy <malte.brandy@maralorn.de>2021-05-08 01:04:00 +0200
committerMalte Brandy <malte.brandy@maralorn.de>2021-05-08 01:05:37 +0200
commit58f8338e61c2cfe8ef0e15c0dbb95df0d5c49897 (patch)
treee318166a6783cc9aefb422aa1958cd54672430c9
parente4633b8a6808d8ecfd03d5f566ff05188f775ba0 (diff)
downloadnixpkgs-58f8338e61c2cfe8ef0e15c0dbb95df0d5c49897.tar
nixpkgs-58f8338e61c2cfe8ef0e15c0dbb95df0d5c49897.tar.gz
nixpkgs-58f8338e61c2cfe8ef0e15c0dbb95df0d5c49897.tar.bz2
nixpkgs-58f8338e61c2cfe8ef0e15c0dbb95df0d5c49897.tar.lz
nixpkgs-58f8338e61c2cfe8ef0e15c0dbb95df0d5c49897.tar.xz
nixpkgs-58f8338e61c2cfe8ef0e15c0dbb95df0d5c49897.tar.zst
nixpkgs-58f8338e61c2cfe8ef0e15c0dbb95df0d5c49897.zip
haskell-language-server: Fix build of multiple plugins
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix6
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix26
2 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2ddce1a5514..24dc90365b8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1424,6 +1424,12 @@ self: super: {
   # https://github.com/haskell/haskell-language-server/issues/611
   haskell-language-server = dontCheck super.haskell-language-server;
 
+  # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1808
+  hls-splice-plugin = dontCheck super.hls-splice-plugin;
+
+  # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809
+  hls-eval-plugin = dontCheck super.hls-eval-plugin;
+
   # 2021-03-19: Too restrictive upper bound on optparse-applicative
   stylish-haskell = doJailbreak super.stylish-haskell;
 
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index a463401a8a8..3979c464ad9 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -872,4 +872,30 @@ self: super: builtins.intersectAttrs super {
   hsignal = overrideCabal super.hsignal {
     platforms = pkgs.lib.platforms.x86;
   };
+
+  hls-brittany-plugin = overrideCabal super.hls-brittany-plugin (drv: {
+    testToolDepends = [ pkgs.git ];
+    preCheck = ''
+      export HOME=$TMPDIR/home
+    '';
+  });
+  hls-class-plugin = overrideCabal super.hls-class-plugin (drv: {
+    testToolDepends = [ pkgs.git ];
+    preCheck = ''
+      export HOME=$TMPDIR/home
+    '';
+  });
+  # Tests have file permissions expections that don‘t work with the nix store.
+  hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;
+  hls-haddock-comments-plugin = overrideCabal super.hls-haddock-comments-plugin (drv: {
+    testToolDepends = [ pkgs.git ];
+    preCheck = ''
+      export HOME=$TMPDIR/home
+    '';
+  });
+  hls-eval-plugin = overrideCabal super.hls-eval-plugin (drv: {
+    preCheck = ''
+      export HOME=$TMPDIR/home
+    '';
+  });
 }