diff options
| author | Ryan Trinkle <ryan.trinkle@gmail.com> | 2016-07-26 17:35:13 -0400 |
|---|---|---|
| committer | Ryan Trinkle <ryan.trinkle@gmail.com> | 2016-07-27 12:27:13 -0400 |
| commit | 676a7b698f72c3f426d71d6eed34589a40363b63 (patch) | |
| tree | 41e3a693fc03d8e27f0191bb3aa13735505d8506 /pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | |
| parent | 0905aea14e6dc6462288de63858d27158831b7bc (diff) | |
| download | nixlib-676a7b698f72c3f426d71d6eed34589a40363b63.tar nixlib-676a7b698f72c3f426d71d6eed34589a40363b63.tar.gz nixlib-676a7b698f72c3f426d71d6eed34589a40363b63.tar.bz2 nixlib-676a7b698f72c3f426d71d6eed34589a40363b63.tar.lz nixlib-676a7b698f72c3f426d71d6eed34589a40363b63.tar.xz nixlib-676a7b698f72c3f426d71d6eed34589a40363b63.tar.zst nixlib-676a7b698f72c3f426d71d6eed34589a40363b63.zip | |
ghcjs: fix build
We need to hold back some packages, now that ghc 8 is out
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 |
1 files changed, 3 insertions, 1 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 ab8a091aabe8..10f167dce0a6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -173,7 +173,7 @@ self: super: { hwsl2 = dontCheck super.hwsl2; # https://github.com/haskell/haddock/issues/427 - haddock = dontCheck super.haddock; + haddock = dontCheck self.haddock_2_16_1; # haddock-api >= 2.17 is GHC 8.0 only haddock-api = self.haddock-api_2_16_1; @@ -214,4 +214,6 @@ self: super: { # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; + generic-deriving = self.generic-deriving_1_10_5; + } |