diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 10e1410ff598..4ef1aa562118 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -39,9 +39,6 @@ self: super: { transformers = self.transformers_0_4_3_0; xhtml = self.xhtml_3000_2_1; - # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; }; - # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); @@ -101,6 +98,12 @@ self: super: { lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); distributive = addBuildDepend super.distributive self.semigroups; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; + void = addBuildDepends super.void (with self; [hashable semigroups]); + + # Need a newer version of Cabal to interpret their build instructions. + cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0; + extra = addSetupDepend super.extra self.Cabal_1_24_2_0; + hlint = addSetupDepend super.hlint self.Cabal_1_24_2_0; # Haddock doesn't cope with the new markup. bifunctors = dontHaddock super.bifunctors;