From b558e437533a7177f0fce894fc9f66b738a12d0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 17 May 2018 19:22:19 +0200 Subject: [PATCH] haskell-hspec: use version 2.5.1 for ghc-8.4.x --- .../configuration-ghc-8.4.x.nix | 40 ++----------------- 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 25ac8b2269f..011f307e8a8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -73,41 +73,6 @@ self: super: { doHaddock = false; }); - ## Needs bump to a versioned attribute - hspec = overrideCabal super.hspec_2_5_0 (drv: { - ## Setup: Encountered missing dependencies: - ## hspec-core ==2.4.4, hspec-discover ==2.4.4 - ## - ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: - ## while evaluating the attribute ‘buildInputs’ of the derivation ‘stringbuilder-0.5.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: - ## infinite recursion encountered, at undefined position - ## test suite causes an infinite loop - doCheck = false; - }); - - ## Needs bump to a versioned attribute - hspec-core = overrideCabal super.hspec-core_2_5_0 (drv: { - ## • No instance for (Semigroup Summary) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid Summary’ - ## - ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-core-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: - ## while evaluating the attribute ‘buildInputs’ of the derivation ‘silently-1.2.5’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: - ## while evaluating the attribute ‘buildInputs’ of the derivation ‘temporary-1.2.1.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: - ## while evaluating the attribute ‘buildInputs’ of the derivation ‘base-compat-0.9.3’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: - ## while evaluating the attribute ‘propagatedBuildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11: - ## infinite recursion encountered, at undefined position - doCheck = false; - }); - - ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: - ## hspec-discover ==2.4.8 - hspec-discover = super.hspec-discover_2_5_0; - - # https://github.com/jcristovao/enclosed-exceptions/issues/12 - enclosed-exceptions = dontCheck super.enclosed-exceptions; - ## On Hackage: ## Upstreamed, awaiting a Hackage release @@ -444,17 +409,20 @@ self: super: { }); # Older versions don't compile. + base-compat = self.base-compat_0_10_1; brick = self.brick_0_37; dhall = self.dhall_1_13_0; dhall_1_13_0 = doJailbreak super.dhall_1_13_0; # support ansi-terminal 0.8.x HaTeX = self.HaTeX_3_19_0_0; hpack = self.hpack_0_28_2; + hspec = dontCheck super.hspec_2_5_1; + hspec-core = dontCheck super.hspec-core_2_5_1; + hspec-discover = self.hspec-discover_2_5_1; hspec-smallcheck = self.hspec-smallcheck_0_5_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2_1; pandoc-types = self.pandoc-types_1_17_4_2; wl-pprint-text = self.wl-pprint-text_1_2_0_0; - base-compat = self.base-compat_0_10_1; # https://github.com/xmonad/xmonad/issues/155 xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch