From b06f53900dadb9cfc6034361f185bee96ddd78c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Dec 2013 13:01:34 +0100 Subject: [PATCH] haskell-defaults.nix: ensure that hspec-expectations uses the same version of HUnit as quickcheck-io --- pkgs/top-level/haskell-defaults.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index d26d8bf6978b..ed97281b9bdb 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -71,6 +71,9 @@ HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; }; + hspecExpectations = self.hspecExpectations.override { + HUnit = self.HUnit_1_2_5_2; + }; }; ghc703Prefs = @@ -88,6 +91,9 @@ HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; }; + hspecExpectations = self.hspecExpectations.override { + HUnit = self.HUnit_1_2_5_2; + }; }; ghc702Prefs = ghc701Prefs; @@ -107,6 +113,9 @@ HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; }; + hspecExpectations = self.hspecExpectations.override { + HUnit = self.HUnit_1_2_5_2; + }; }; ghc6123Prefs = ghc6122Prefs; @@ -130,6 +139,9 @@ HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; }; + hspecExpectations = self.hspecExpectations.override { + HUnit = self.HUnit_1_2_5_2; + }; }; ghc6121Prefs = @@ -153,6 +165,9 @@ HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; }; + hspecExpectations = self.hspecExpectations.override { + HUnit = self.HUnit_1_2_5_2; + }; }; ghc6104Prefs =