From cebfd6929a07c26baf57d7f2813758d2174c7dd1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Aug 2020 13:07:06 +0200 Subject: [PATCH] haskell-hspec-core: needs latest QuickCheck to compile tests --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5eb95757d3a..6c9855eaef9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -296,7 +296,6 @@ self: super: { hs2048 = dontCheck super.hs2048; hsbencher = dontCheck super.hsbencher; hsexif = dontCheck super.hsexif; - hspec-core = if pkgs.stdenv.isi686 then dontCheck super.hspec-core else super.hspec-core; # tests rely on `Int` being 64-bit; https://github.com/hspec/hspec/issues/431 hspec-server = dontCheck super.hspec-server; HTF = dontCheck super.HTF; htsn = dontCheck super.htsn; @@ -1437,6 +1436,11 @@ self: super: { doCheck = false; }); + # tests rely on `Int` being 64-bit: https://github.com/hspec/hspec/issues/431 + hspec-core = let hspec-core = super.hspec-core.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_14_1; }); in + if pkgs.stdenv.isi686 then dontCheck hspec-core else hspec-core; + QuickCheck_2_14_1 = super.QuickCheck_2_14_1.override { splitmix = dontCheck super.splitmix_0_1_0_1; }; + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let