From 95528bfdcb0919a36805b03fb206a1c651621c6b Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 30 Jul 2016 12:44:57 +0200 Subject: [PATCH] haskellPackages.cereal: fix for pre-GHC 8.0 --- .../haskell-modules/configuration-ghc-7.10.x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 10f167dce0a..66f7d4763b4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -181,8 +181,6 @@ self: super: { # lens-family-th >= 0.5.0.0 is GHC 8.0 only lens-family-th = self.lens-family-th_0_4_1_0; - # cereal must have `fail` in pre-ghc-8.0.x versions - cereal = addBuildDepend super.cereal self.fail; # The tests in vty-ui do not build, but vty-ui itself builds. vty-ui = enableCabalFlag super.vty-ui "no-tests"; @@ -210,6 +208,10 @@ self: super: { intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); Glob_0_7_9 = addBuildDepends super.Glob_0_7_9 (with self; [semigroups]); Glob = addBuildDepends super.Glob (with self; [semigroups]); + # cereal must have `fail` in pre-ghc-8.0.x versions + # also tests require bytestring>=0.10.8.1 + cereal = dontCheck (addBuildDepend super.cereal self.fail); + cereal_0_5_2_0 = dontCheck (addBuildDepend super.cereal_0_5_2_0 self.fail); # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; };