From 5f9645ef2ee26da85f4c9b3c1d88fdb6a1c0ac07 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 23 Aug 2017 14:30:10 +0200 Subject: [PATCH] haskell-semigroups: fix build with ghc-7.10.x and earlier --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 2 +- 2 files changed, 2 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 7375072647d..9e3f16a47a3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -196,7 +196,7 @@ self: super: { lens = addBuildDepend super.lens self.generic-deriving; optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; - semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); + semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]); texmath = addBuildDepend super.texmath self.network-uri; yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); # cereal must have `fail` in pre-ghc-8.0.x versions diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index ca9597de48d..0247a5ad1be 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -144,7 +144,7 @@ self: super: { unordered-containers = dontCheck super.unordered-containers; # Needs additional inputs on old compilers. - semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]); + semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [nats tagged unordered-containers]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); distributive = addBuildDepend (dontCheck super.distributive) self.semigroups; QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);