diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 2b0bb3876b2a9..420c80404ed29 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -61,13 +61,6 @@ in { # 0.30 introduced support for GHC 9.2. cryptonite = doDistribute self.cryptonite_0_30; - cabal2nix = - # cabal2nix depends on foundation, which is broken on aarch64-linux. - # https://github.com/haskell-foundation/foundation/issues/571 - overrideCabal - (drv: { badPlatforms = [ "aarch64-linux" ]; }) - super.cabal2nix; - doctest = self.doctest_0_20_1; # consequences of doctest breakage follow: @@ -78,8 +71,6 @@ in { lucid = jailbreakForCurrentVersion super.lucid "2.11.1"; invariant = jailbreakForCurrentVersion super.invariant "0.5.6"; implicit-hie-cradle = jailbreakForCurrentVersion super.implicit-hie-cradle "0.5.0.0"; - # https://github.com/co-log/co-log-core/pull/22#issuecomment-1294040208 - co-log-core = jailbreakForCurrentVersion super.co-log-core "0.3.1.0"; haskell-src-meta = doJailbreak super.haskell-src-meta; @@ -206,6 +197,11 @@ in { # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260 ghc-check = dontHaddock super.ghc-check; + # 2022-11-06: Override override from common, because Cabal-syntax is included since ghc 9.4. + implicit-hie = super.implicit-hie.override { + Cabal-syntax = null; + }; + # 2022-10-06: plugins disabled for hls 1.8.0.0 based on # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers haskell-language-server = super.haskell-language-server.override { |