diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 22 |
1 files changed, 6 insertions, 16 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 6ea2db37d21da..f73172e02d38e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -36,6 +36,12 @@ self: super: { unix = null; xhtml = null; + # These are now core libraries in GHC 8.4.x. + mtl = self.mtl_2_2_2; + parsec = self.parsec_3_1_13_0; + stm = self.stm_2_4_5_0; + text = self.text_1_2_3_0; + # Make sure we can still build Cabal 1.x. Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: { prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal"; @@ -50,10 +56,6 @@ self: super: { sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; }); - # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 - vector-algorithms = dontCheck super.vector-algorithms; - - # https://github.com/nominolo/ghc-syb/issues/20 ghc-syb-utils = dontCheck super.ghc-syb-utils; @@ -94,16 +96,4 @@ 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_4; }); - hledger = super.hledger.overrideScope (self: super: { - base-compat = self.base-compat_0_10_4; - aeson = self.aeson_1_4_0_0; - }); - hledger-web = super.hledger-web.overrideScope (self: super: { - base-compat = self.base-compat_0_10_4; - aeson = self.aeson_1_4_0_0; - }); - } |