diff options
author | Peter Simons <simons@cryp.to> | 2017-04-04 14:44:40 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2017-04-04 16:29:12 +0200 |
commit | fa365c2b9d085d8b913f561f1db559cab7d1a028 (patch) | |
tree | ae5556d50978032c0ded97273921367bf02eecb5 /pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | |
parent | 046c5c57d0f2260b5961b28f62ab0722225a385f (diff) |
haskell-language-nix: fix build with GHC 7.6.3
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 9 |
1 files changed, 6 insertions, 3 deletions
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 10e1410ff5989..4ef1aa562118b 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; |