diff options
| author | maralorn <mail@maralorn.de> | 2022-09-21 06:06:28 +0200 |
|---|---|---|
| committer | maralorn <mail@maralorn.de> | 2022-09-21 06:12:47 +0200 |
| commit | 352da0ce3117965dc5b2c460ceddd520549b99d2 (patch) | |
| tree | 047f30ad5242ae899b0fea4ec2167b93399b9d48 /pkgs | |
| parent | 89c97c03edb3b645b0604ea9415bb4a06eb40921 (diff) | |
haskellPackages.hlint: Fix plugin and ghc924 jobs
Diffstat (limited to 'pkgs')
3 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6761be0d34d89..9dee611953eda 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1526,11 +1526,17 @@ self: super: { dontCheck (disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways … ]).overrideScope (lself: lsuper: { + ormolu = doJailbreak lself.ormolu_0_5_0_1; + fourmolu = doJailbreak lself.fourmolu_0_8_2_0; + hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; + ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729; + }); + + hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: { # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - ormolu = doJailbreak lself.ormolu_0_5_0_1; - fourmolu = doJailbreak lself.fourmolu_0_8_2_0; ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 05585b885650e..071cdeaa50302 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -153,6 +153,13 @@ self: super: { lsp-types = doJailbreak lsuper.lsp-types; })); + hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: { + # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 + hlint = lself.hlint_3_2_8; + ghc-lib-parser = lself.ghc-lib-parser_8_10_7_20220219; + ghc-lib-parser-ex = addBuildDepend lself.ghc-lib-parser lself.ghc-lib-parser-ex_8_10_0_24; + }); + hls-brittany-plugin = super.hls-brittany-plugin.overrideScope (lself: lsuper: { brittany = doJailbreak lself.brittany_0_13_1_2; aeson = lself.aeson_1_5_6_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index db27788eeae5c..0cebab8f4b8c9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -194,9 +194,9 @@ self: super: { stylish-haskell = enableCabalFlag "ghc-lib" super.stylish-haskell; # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 - hlint = enableCabalFlag "ghc-lib" (super.hlint_3_4_1.override { + hlint = doDistribute (enableCabalFlag "ghc-lib" (super.hlint_3_4_1.override { ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - }); + })); # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; |