diff options
author | maralorn <mail@maralorn.de> | 2024-03-17 13:36:19 +0100 |
---|---|---|
committer | maralorn <mail@maralorn.de> | 2024-03-17 13:36:19 +0100 |
commit | 013cdb0c0bb651567d2adb8f99d5f5aa3b4b2d16 (patch) | |
tree | eaf1be77f992846d165a166f9810775cfd91e5d4 /pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | |
parent | e2ec64eff0b072473f4e6eedbfb85ba9fd10acc4 (diff) |
haskellPackages: Remove obsolete overrides for hls dependencies
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 23 |
1 files changed, 3 insertions, 20 deletions
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 59e8d0f0894e2..f23e2046187a9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -65,27 +65,13 @@ self: super: { algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1; }); - hls-cabal-plugin = super.hls-cabal-plugin.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; - - ormolu = self.ormolu_0_5_2_0.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; - - stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0; - - haskell-language-server = lib.pipe (super.haskell-language-server.override { - hls-ormolu-plugin = null; - hls-stylish-haskell-plugin = null; - hls-fourmolu-plugin = null; - # Not buildable if GHC > 9.2.3, so we ship no compatible GHC - hls-stan-plugin = null; - }) [ + + haskell-language-server = lib.pipe super.haskell-language-server [ (disableCabalFlag "fourmolu") (disableCabalFlag "ormolu") (disableCabalFlag "stylishHaskell") ]; + # For GHC < 9.4, some packages need data-array-byte as an extra dependency hashable = addBuildDepends [ self.data-array-byte ] super.hashable; primitive = addBuildDepends [ self.data-array-byte ] super.primitive; @@ -118,9 +104,6 @@ self: super: { # https://github.com/clash-lang/clash-compiler/blob/f0f6275e19b8c672f042026c478484c5fd45191d/README.md#ghc-compatibility clash-prelude = dontDistribute (markBroken super.clash-prelude); - # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 - hiedb = dontCheck super.hiedb; - # Too strict upper bound on bytestring, relevant for GHC 9.2.6 specifically # https://github.com/protolude/protolude/issues/127#issuecomment-1428807874 protolude = doJailbreak super.protolude; |