summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
diff options
context:
space:
mode:
authormaralorn <mail@maralorn.de>2022-12-30 17:21:48 +0100
committermaralorn <mail@maralorn.de>2022-12-30 17:21:48 +0100
commit3b14e60bab118d7935c56e0173e6fecfb0544980 (patch)
tree1a8691873ca8a2670b382da6e9c96c57fb037745 /pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
parent0c761f74f0f0abc7c4fec12a68956964a658d72d (diff)
downloadnixpkgs-3b14e60bab118d7935c56e0173e6fecfb0544980.tar
nixpkgs-3b14e60bab118d7935c56e0173e6fecfb0544980.tar.gz
nixpkgs-3b14e60bab118d7935c56e0173e6fecfb0544980.tar.bz2
nixpkgs-3b14e60bab118d7935c56e0173e6fecfb0544980.tar.lz
nixpkgs-3b14e60bab118d7935c56e0173e6fecfb0544980.tar.xz
nixpkgs-3b14e60bab118d7935c56e0173e6fecfb0544980.tar.zst
nixpkgs-3b14e60bab118d7935c56e0173e6fecfb0544980.zip
haskell-language-server: Fix build for 1.9.0.0 for all ghc versions
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix15
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index f9426d97110..aac4e0f8801 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -113,7 +113,7 @@ self: super: {
     additionalDeps = with self.haskell-language-server.scope; [
       hls-haddock-comments-plugin
       (unmarkBroken hls-splice-plugin)
-      (unmarkBroken hls-tactics-plugin)
+      hls-tactics-plugin
     ];
   in addBuildDepends additionalDeps (super.haskell-language-server.overrideScope (lself: lsuper: {
     # Needed for modern ormolu and fourmolu.
@@ -127,6 +127,12 @@ self: super: {
     ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lsp-types unordered-containers
   ]) super.hls-haddock-comments-plugin);
 
+  hls-tactics-plugin = unmarkBroken (addBuildDepends (with self.hls-tactics-plugin.scope; [
+    aeson extra fingertree generic-lens ghc-exactprint ghc-source-gen ghcide
+    hls-graph hls-plugin-api hls-refactor-plugin hyphenation lens lsp megaparsec
+    parser-combinators prettyprinter refinery retrie syb unagi-chan unordered-containers
+  ]) super.hls-tactics-plugin);
+
   # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
   unordered-containers = dontCheck super.unordered-containers;
 
@@ -174,8 +180,15 @@ self: super: {
 
   # Later versions only support GHC >= 9.2
   ghc-exactprint = self.ghc-exactprint_0_6_4;
+
+  retrie = dontCheck self.retrie_1_1_0_0; 
+
   apply-refact = self.apply-refact_0_9_3_0;
 
+  hls-hlint-plugin = super.hls-hlint-plugin.override {
+    inherit (self) apply-refact;
+  };
+
   # Needs OneTuple for ghc < 9.2
   binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans;
 }