diff options
author | Malte Brandy <malte.brandy@maralorn.de> | 2020-11-10 22:07:19 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2020-11-13 21:37:56 +0100 |
commit | bf29c147c3fc616267868da67b28c3253e78b0c8 (patch) | |
tree | 2d181abfd9b0e92e124231f9a9e1ad6f8f98f8e4 /pkgs/development/haskell-modules/non-hackage-packages.nix | |
parent | becd5f5bc3c040b6220f1c8f1299ea5ff05c3a6a (diff) | |
download | nixlib-bf29c147c3fc616267868da67b28c3253e78b0c8.tar nixlib-bf29c147c3fc616267868da67b28c3253e78b0c8.tar.gz nixlib-bf29c147c3fc616267868da67b28c3253e78b0c8.tar.bz2 nixlib-bf29c147c3fc616267868da67b28c3253e78b0c8.tar.lz nixlib-bf29c147c3fc616267868da67b28c3253e78b0c8.tar.xz nixlib-bf29c147c3fc616267868da67b28c3253e78b0c8.tar.zst nixlib-bf29c147c3fc616267868da67b28c3253e78b0c8.zip |
haskellPackages.haskell-language-server: Fix build
In preparation of the upcoming 0.6.0 release I wanted to fix hls. It introduces two new plugin packages, which are not on hackage yet. I remove apply-refact overrides, because current apply-refact versions are compatible with all ghcs we support, according to their changelog. I override more of the hls dependencies globally on the whole package set, to avoid a lot of duplicate compilations. And because @peti changed my mind about this being a good practice. hls now uses a released version of ghcide
Diffstat (limited to 'pkgs/development/haskell-modules/non-hackage-packages.nix')
-rw-r--r-- | pkgs/development/haskell-modules/non-hackage-packages.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 52a2737ebb74..c79673a28646 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -22,8 +22,9 @@ self: super: { # 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 { }; hls-brittany = self.callPackage ../tools/haskell/haskell-language-server/hls-brittany.nix { }; + hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { }; + hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { }; nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; |