From a711d4342f9928f0616010bc42ffa8142ad0f7f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jul 2018 01:23:50 +0200 Subject: Update Haskell overrides for lts-12.x. --- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix') 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 6ea2db37d21d..86d5988a5649 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; -- cgit 1.4.1