diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 73661b29bef99..9094f1f8e9eaf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -4,6 +4,8 @@ with haskellLib; let inherit (pkgs.stdenv.hostPlatform) isDarwin; + + disableParallelBuilding = haskellLib.overrideCabal (drv: { enableParallelBuilding = false; }); in self: super: { @@ -63,15 +65,16 @@ self: super: { attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; xmonad = doDistribute self.xmonad_0_18_0; apply-refact = self.apply-refact_0_14_0_0; - ormolu = self.ormolu_0_7_7_0; - fourmolu = self.fourmolu_0_16_2_0; + ormolu = self.ormolu_0_7_4_0; + fourmolu = self.fourmolu_0_15_0_0; stylish-haskell = self.stylish-haskell_0_14_6_0; hlint = self.hlint_3_8; - ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0; + ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_12_0; websockets = self.websockets_0_13_0_0; th-desugar = doJailbreak self.th-desugar_1_16; # th-abstraction >=0.6 && <0.7 singletons-th = self.singletons-th_3_3; singletons-base = self.singletons-base_3_3; + ghc-tags = self.ghc-tags_1_8; # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = self.ghc-exactprint_1_8_0_0; @@ -133,15 +136,6 @@ self: super: { # A factor of 100 is insufficent, 200 seems seems to work. hip = appendConfigureFlag "--ghc-options=-fsimpl-tick-factor=200" super.hip; - # Fix build with text-2.x. - libmpd = appendPatch - (pkgs.fetchpatch { - name = "138.patch"; # https://github.com/vimus/libmpd-haskell/pull/138 - url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...f1cbf247261641565a3937b90721f7955d254c5e.patch"; - sha256 = "Q4fA2J/Tq+WernBo+UIMdj604ILOMlIYkG4Pr046DfM="; - }) - super.libmpd; - # Loosen bounds patch = appendPatch (pkgs.fetchpatch { url = "https://github.com/reflex-frp/patch/commit/91fed138483a7bf2b098d45b9e5cc36191776320.patch"; @@ -152,4 +146,7 @@ self: super: { sha256 = "sha256-umjwgdSKebJdRrXjwHhsi8HBqotx1vFibY9ttLkyT/0="; }) super.reflex; + # https://gitlab.haskell.org/ghc/ghc/-/issues/23392 + gi-gtk = disableParallelBuilding super.gi-gtk; + } |