b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
maralorn 2023-08-22 01:50:52 +02:00
parent 044214a6ee
commit 7dfb3949da
No known key found for this signature in database
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -2749,12 +2749,7 @@ self: super: {
# Tests fail due to the newly-build fourmolu not being in PATH
# https://github.com/fourmolu/fourmolu/issues/231
fourmolu_0_13_1_0 = dontCheck (super.fourmolu_0_13_1_0.overrideScope (lself: lsuper: {
Cabal-syntax = lself.Cabal-syntax_3_10_1_0;
ghc-lib-parser = lself.ghc-lib-parser_9_6_2_20230523;
parsec = lself.parsec_3_1_16_1;
text = lself.text_2_0_2;
}));
fourmolu_0_13_1_0 = dontCheck super.fourmolu_0_13_1_0;
# Merged upstream, but never released. Allows both intel and aarch64 darwin to build.
# https://github.com/vincenthz/hs-gauge/pull/106

25
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View file

@ -75,6 +75,10 @@ self: super: {
base-compat = doDistribute self.base-compat_0_13_0;
base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0;
# Because we bumped the version of th-abstraction above.^
aeson = doJailbreak super.aeson;
free = doJailbreak super.free;
# Too strict upper bound on template-haskell
# https://github.com/mokus0/th-extras/pull/21
th-extras = doJailbreak super.th-extras;
@ -164,23 +168,14 @@ self: super: {
# 2023-04-03: plugins disabled for hls 1.10.0.0 based on
#
haskell-language-server =
let
# TODO: HLS-2.0.0.0 added support for the foumolu plugin for ghc-9.6.
# However, putting together all the overrides to get the latest
# version of fourmolu compiling together with ghc-9.6 and HLS is a
# little annoying, so currently fourmolu has been disabled. We should
# try to enable this at some point in the future.
hlsWithFlags = disableCabalFlag "fourmolu" super.haskell-language-server;
in
hlsWithFlags.override {
hls-ormolu-plugin = null;
haskell-language-server = super.haskell-language-server.override {
hls-floskell-plugin = null;
hls-fourmolu-plugin = null;
hls-hlint-plugin = null;
hls-stylish-haskell-plugin = null;
};
fourmolu = super.fourmolu_0_13_1_0;
ormolu = super.ormolu_0_7_1_0;
stylish-haskell = super.stylish-haskell_0_14_5_0;
# Newer version of servant required for GHC 9.6
servant = self.servant_0_20;
servant-server = self.servant-server_0_20;
@ -216,6 +211,8 @@ self: super: {
HUnit Diff data-default extra fail free ghc-paths ordered-containers silently syb
]) super.ghc-exactprint_1_7_0_1);
hlint = super.hlint_3_6_1;
inherit (pkgs.lib.mapAttrs (_: doJailbreak ) super)
hls-cabal-plugin
algebraic-graphs