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-04-03 16:27:33 +02:00
parent 5ddf8ec5a8
commit f8ca8c031b
2 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -176,6 +176,20 @@ self: super: {
relative = "plugins/hls-stylish-haskell-plugin";
hash = "sha256-GtN9t5zMOROCDSLiscLZ5GmqDV+ql9R2z/+W++C2h2Q=";
}) super.hls-stylish-haskell-plugin) else super.hls-stylish-haskell-plugin;
hie-compat = if lib.versionAtLeast super.ghc.version "9.6" then overrideCabal
(drv: {
prePatch = drv.prePatch or "" + ''
"${pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal
'';
})
(appendPatch (fetchpatch {
name = "hie-compat-9.6-compat.patch";
url = "https://github.com/haskell/haskell-language-server/commit/191bda61fef34696a793503e639a53003ff70660.patch";
relative = "hie-compat";
hash = "sha256-z81+fwxwZ8BQWGRqTnh3XlQ6AG7EiaahdKjT+0lFu1Q=";
}) super.hie-compat) else super.hie-compat;
# For -f-auto see cabal.project in haskell-language-server.
ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex);

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

@ -125,4 +125,46 @@ self: super: {
# Test suite doesn't compile with base-4.18 / GHC 9.6
# https://github.com/dreixel/syb/issues/40
syb = dontCheck super.syb;
# 2023-04-03: plugins disabled for hls 1.10.0.0 based on
#
haskell-language-server = super.haskell-language-server.override {
hls-ormolu-plugin = null;
hls-floskell-plugin = null;
hls-fourmolu-plugin = null;
hls-hlint-plugin = null;
hls-stylish-haskell-plugin = null;
};
MonadRandom = super.MonadRandom_0_6;
unix-compat = super.unix-compat_0_7;
lifted-base = dontCheck super.lifted-base;
hw-fingertree = dontCheck super.hw-fingertree;
hw-prim = dontCheck (doJailbreak super.hw-prim);
stm-containers = dontCheck super.stm-containers;
regex-tdfa = dontCheck super.regex-tdfa;
rebase = doJailbreak super.rebase_1_20;
rerebase = doJailbreak super.rerebase_1_20;
hiedb = dontCheck super.hiedb;
lucid = doJailbreak (dontCheck super.lucid);
retrie = dontCheck (super.retrie);
ghc-exactprint = unmarkBroken (addBuildDepends (with self.ghc-exactprint.scope; [
HUnit Diff data-default extra fail free ghc-paths ordered-containers silently syb
]) super.ghc-exactprint_1_7_0_0);
inherit (pkgs.lib.mapAttrs (_: doJailbreak ) super)
hls-cabal-plugin
algebraic-graphs
co-log-core
lens
cryptohash-sha1
cryptohash-md5
ghc-trace-events
tasty-hspec
constraints-extras
tree-diff
implicit-hie-cradle
focus
hie-compat;
}