colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell.packages.ghc810.haskell-language-server: Fix build

Browse Source
This commit is contained in:
maralorn 2023-08-22 01:51:25 +02:00
parent f39536498c
commit 3ced05d8b7
No known key found for this signature in database
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View File

@ -103,7 +103,6 @@ self: super: {
# These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported.
# See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope`
additionalDeps = with self.haskell-language-server.scope; [
hls-brittany-plugin
hls-haddock-comments-plugin
(unmarkBroken hls-splice-plugin)
hls-tactics-plugin
@ -112,7 +111,7 @@ self: super: {
Cabal = lself.Cabal_3_6_3_0;
aeson = lself.aeson_1_5_6_0;
lens-aeson = doJailbreak lself.lens-aeson_1_1_3;
lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0
lsp-types = dontCheck (doJailbreak lsuper.lsp-types); # Checks require aeson >= 2.0
hls-overloaded-record-dot-plugin = null;
}));
@ -123,6 +122,10 @@ self: super: {
mod = super.mod_0_1_2_2;
path-io = doJailbreak super.path-io;
hls-cabal-plugin = super.hls-cabal-plugin.override {
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
};
ormolu = self.ormolu_0_5_0_1;
fourmolu = dontCheck self.fourmolu_0_9_0_0;
hlint = self.hlint_3_4_1;
@ -134,15 +137,6 @@ self: super: {
parser-combinators prettyprinter refinery retrie syb unagi-chan unordered-containers
]) super.hls-tactics-plugin);
hls-brittany-plugin = unmarkBroken (addBuildDepends (with self.hls-brittany-plugin.scope; [
brittany czipwith extra ghc-exactprint ghcide hls-plugin-api hls-test-utils lens lsp-types
]) (super.hls-brittany-plugin.overrideScope (lself: lsuper: {
brittany = doJailbreak (unmarkBroken lself.brittany_0_13_1_2);
aeson = lself.aeson_1_5_6_0;
multistate = unmarkBroken (dontCheck lsuper.multistate);
lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0
})));
# This package is marked as unbuildable on GHC 9.2, so hackage2nix doesn't include any dependencies.
# See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope`
hls-haddock-comments-plugin = unmarkBroken (addBuildDepends (with self.hls-haddock-comments-plugin.scope; [