public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-language-nix: fix build with GHC 7.6.3

Browse Source
This commit is contained in:
Peter Simons 2017-04-04 14:44:40 +02:00
parent 046c5c57d0
commit fa365c2b9d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
View File

@ -39,9 +39,6 @@ self: super: {
transformers = self.transformers_0_4_3_0; transformers = self.transformers_0_4_3_0;
xhtml = self.xhtml_3000_2_1; 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'. # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); 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]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
distributive = addBuildDepend super.distributive self.semigroups; distributive = addBuildDepend super.distributive self.semigroups;
QuickCheck = addBuildDepend super.QuickCheck 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. # Haddock doesn't cope with the new markup.
bifunctors = dontHaddock super.bifunctors; bifunctors = dontHaddock super.bifunctors;