diff options
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 951af07d7c16..15498c52d32b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -193,6 +193,21 @@ self: super: { # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149 orbits = dontCheck super.orbits; + # Fixes the build if Cabal >= 3.10.2 is used for Setup.hs, as it got stricter + # about c- vs. cxx-sources: https://github.com/haskell/double-conversion/issues/43 + double-conversion = overrideCabal (drv: { + patches = drv.patches or [ ] ++ [ + (pkgs.fetchpatch { + name = "double-conversion-c-to-cxx-sources.patch"; + url = "https://github.com/haskell/double-conversion/pull/44/commits/d480fb057c5387251b8cfdeb3666b24087811219.patch"; + sha256 = "0jw2i2cybmv190bhab0afhz2v3zva2chazhmngh884fsq2p3j1cv"; + }) + ]; + prePatch = drv.prePatch or "" + '' + ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal + ''; + }) super.double-conversion; + # Allow aeson == 2.1.* # https://github.com/hdgarrood/aeson-better-errors/issues/23 aeson-better-errors = doJailbreak super.aeson-better-errors; |