diff options
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index ce24d9a27f48..1cfbfa879bb6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -94,4 +94,17 @@ self: super: { haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); + # Hledger depends indirectly on different versions of base-compat. The + # override can probably be removed once we update to LTS 12.x. + hledger-lib = super.hledger-lib.overrideScope (self: super: { base-compat = self.base-compat_0_10_1; }); + hledger-ui = super.hledger-ui.overrideScope (self: super: { fsnotify = self.fsnotify_0_3_0_1; }); + hledger = super.hledger.overrideScope (self: super: { + base-compat = self.base-compat_0_10_1; + aeson = self.aeson_1_4_0_0; + }); + hledger-web = super.hledger-web.overrideScope (self: super: { + base-compat = self.base-compat_0_10_1; + aeson = self.aeson_1_4_0_0; + }); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 736be056e0e7..45b0d768a22f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -429,10 +429,4 @@ self: super: { lambdabot-core = appendPatch super.lambdabot-core ./patches/lambdabot-core-ghc-8.4.x-fix.patch; - # Version 1.9.1 excludes base-compat 0.10.x for the benefit of older - # compilers, but ghc 8.4.x works fine with the new version. - hledger-lib = doJailbreak super.hledger-lib; - hledger = doJailbreak super.hledger; - hledger-ui = doJailbreak super.hledger-ui; - } |