From 58f8338e61c2cfe8ef0e15c0dbb95df0d5c49897 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 8 May 2021 01:04:00 +0200 Subject: [PATCH] haskell-language-server: Fix build of multiple plugins --- .../haskell-modules/configuration-common.nix | 6 +++++ .../haskell-modules/configuration-nix.nix | 26 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2ddce1a55145..24dc90365b8b 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 a463401a8a8f..3979c464ad9b 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 + ''; + }); }