From f705ee21f6a18c10cff4679142d3d0dc95415daa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2018 21:13:11 +0200 Subject: [PATCH] Update overrides for ghc-8.6.x. --- .../configuration-ghc-8.6.x.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 9ab8e7b9557..b49b9cea60b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -44,9 +44,16 @@ self: super: { # Use to be a core-library, but no longer is since GHC 8.4.x. hoopl = self.hoopl_3_10_2_2; - # lts-12.x versions do not compile. + # LTS-12.x versions do not compile. + contravariant = self.contravariant_1_5; + doctest = self.doctest_0_16_0_1; + hspec-core = self.hspec-core_2_5_7; + hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; }); + hspec-meta = self.hspec-meta_2_5_6; + hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; }); primitive = self.primitive_0_6_4_0; tagged = self.tagged_0_8_6; + unordered-containers = dontCheck super.unordered-containers; # Over-specified constraints. async = doJailbreak super.async; # base >=4.3 && <4.12, stm >=2.2 && <2.5 @@ -54,14 +61,9 @@ self: super: { hashable = doJailbreak super.hashable; # base >=4.4 && <4.1 hashable-time = doJailbreak super.hashable-time; # base >=4.7 && <4.12 integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12 + optparse-applicative = doJailbreak super.optparse-applicative; # https://github.com/pcapriotti/optparse-applicative/issues/319 + polyparse = markBrokenVersion "1.12" super.polyparse; # version 1.12 fails to compile tar = doJailbreak super.tar; # containers >=0.2 && <0.6 test-framework = doJailbreak super.test-framework; # containers >=0.1 && <0.6 - # Older versions don't work with ghc 8.6.1: - hspec-core = self.hspec-core_2_5_7; - hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; }); - hspec-meta = self.hspec-meta_2_5_6; - optparse-applicative = doJailbreak super.optparse-applicative; - unordered-containers = dontCheck super.unordered-containers; - }