From 1422b80e213967d68a0772defb4c7b9aee97de03 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 16 Aug 2023 14:53:01 +0200 Subject: [PATCH] haskell.packages.ghc8107.hspec_2_7_10: correct hspec-meta version Unfortunately hspec 2.7 no longer compiles with GHC >= 9.4, so we hide it in the Hydra jobset. It is preserved nonetheless, as it is used by ghcjs (which still uses hspec 2.7 and GHC 8.10.7). --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 67799d989210..2fa4ad3e19b6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1641,7 +1641,6 @@ self: super: { # Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x. # So let's not go there and just disable the tests altogether. hspec-core = dontCheck super.hspec-core; - hspec-core_2_7_10 = doDistribute (dontCheck super.hspec-core_2_7_10); # tests seem to require a different version of hspec-core hspec-contrib = dontCheck super.hspec-contrib; @@ -1735,6 +1734,10 @@ self: super: { hspec-discover = self.hspec-discover_2_7_10; hspec-core = self.hspec-core_2_7_10; }; + hspec-discover_2_7_10 = super.hspec-discover_2_7_10.override { + hspec-meta = self.hspec-meta_2_7_8; + }; + hspec-core_2_7_10 = doJailbreak (dontCheck super.hspec-core_2_7_10); # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;