From a36931ccf2c4a5d146c5617708ad199276e2547a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 3 Nov 2025 09:22:01 +0100 Subject: [PATCH 1/2] haskell.packages.ghc96.haskell-language-server: fix build This dependency is only needed for the "plugin-tutorial" executable. This is only built with GHC 9.6 and 9.8, but the expression is created with GHC 9.10. Thus add the missing dependency. It would be better to just disable that tutorial, but I didn't find a quick way of doing that - toggling the related flag did not work. This only fixed the build for GHC 9.6 for me, GHC 9.8 failed with a different error right after. --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 1 + pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 987897276982..5c2be32d1d5e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -220,6 +220,7 @@ in haskell-language-server = addBuildDepends [ self.retrie self.floskell + self.markdown-unlit ] super.haskell-language-server; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 58e801c64ba9..01f9d43a269f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -124,6 +124,7 @@ in haskell-language-server = addBuildDepends [ self.retrie self.floskell + self.markdown-unlit ] super.haskell-language-server; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; From 7f8ab22df9c6e9ffb088e3e6b2edd387df9a9b10 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 3 Nov 2025 09:24:10 +0100 Subject: [PATCH 2/2] haskell.packages.ghc98.haskell-language-server: fix build It was complaining about different versions of some regex dependency in the closure, the differing one introduced by hls-plugin-api. GHC 9.6 didn't fail that way, but I figured such a change can't hurt either, for consistency. --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 ++ pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 5c2be32d1d5e..41b81b6ba15f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -222,6 +222,7 @@ in self.floskell self.markdown-unlit ] super.haskell-language-server; + hls-plugin-api = super.hls-plugin-api; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; retrie = doJailbreak (unmarkBroken super.retrie); @@ -232,6 +233,7 @@ in floskell fourmolu haskell-language-server + hls-plugin-api hlint ormolu retrie diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 01f9d43a269f..8b430b143451 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -126,6 +126,7 @@ in self.floskell self.markdown-unlit ] super.haskell-language-server; + hls-plugin-api = super.hls-plugin-api; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; retrie = doJailbreak (unmarkBroken super.retrie); @@ -136,6 +137,7 @@ in floskell fourmolu haskell-language-server + hls-plugin-api hlint ormolu retrie