about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2016-05-27 19:18:31 +0200
committerPeter Simons <simons@cryp.to>2016-05-27 19:18:31 +0200
commitaebfb404258d9f2a1f6622fc0d25c1c4c55f8cdc (patch)
tree94b743f778982d4f3cf27a06bda9eaba3c193023
parent8fdcf556a14210e4d3dd0cecf080238ed9d0d932 (diff)
downloadnixlib-aebfb404258d9f2a1f6622fc0d25c1c4c55f8cdc.tar
nixlib-aebfb404258d9f2a1f6622fc0d25c1c4c55f8cdc.tar.gz
nixlib-aebfb404258d9f2a1f6622fc0d25c1c4c55f8cdc.tar.bz2
nixlib-aebfb404258d9f2a1f6622fc0d25c1c4c55f8cdc.tar.lz
nixlib-aebfb404258d9f2a1f6622fc0d25c1c4c55f8cdc.tar.xz
nixlib-aebfb404258d9f2a1f6622fc0d25c1c4c55f8cdc.tar.zst
nixlib-aebfb404258d9f2a1f6622fc0d25c1c4c55f8cdc.zip
Revert "Don't use incompatible haddock-api."
This reverts commit 8fdcf556a14210e4. I accidentally committed to the
wrong branch.
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix3
1 files changed, 0 insertions, 3 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 c497405aa20f..7e82d94e3485 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -181,9 +181,6 @@ self: super: {
   # https://github.com/haskell/haddock/issues/427
   haddock = dontCheck super.haddock;
 
-  # haddock-api >= 2.17 is GHC 8.0 only
-  haddock-api = self.haddock-api_2_16_1;
-
   # The tests in vty-ui do not build, but vty-ui itself builds.
   vty-ui = enableCabalFlag super.vty-ui "no-tests";