aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-12-12 21:21:35 +0000
committerIan Lynagh <igloo@earth.li>2011-12-12 21:21:35 +0000
commitc8301a41d924d83f6e5160778d19016f2f1806ce (patch)
tree1395468120ff4eb54c212892e1cb1bc8f02ee7c9
parent07c816c5e548824bb089442cf32d70682e47200b (diff)
Update dependencies and binaryInterfaceVersion
-rw-r--r--haddock.cabal8
-rw-r--r--src/Haddock/InterfaceFile.hs4
2 files changed, 8 insertions, 4 deletions
diff --git a/haddock.cabal b/haddock.cabal
index 81d64756..a9e14fab 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -80,7 +80,7 @@ executable haddock
default-language: Haskell2010
build-tools: alex >= 2.3, happy >= 1.18
build-depends:
- base >= 4.3 && < 4.5,
+ base >= 4.3 && < 4.6,
filepath,
directory,
pretty,
@@ -88,7 +88,7 @@ executable haddock
array,
xhtml >= 3000.2 && < 3000.3,
Cabal >= 1.10,
- ghc >= 7.2 && < 7.4
+ ghc >= 7.2 && < 7.6
if flag(in-ghc-tree)
cpp-options: -DIN_GHC_TREE
@@ -140,7 +140,7 @@ library
default-language: Haskell2010
build-tools: alex >= 2.3, happy >= 1.18
build-depends:
- base >= 4.3 && < 4.5,
+ base >= 4.3 && < 4.6,
filepath,
directory,
pretty,
@@ -148,7 +148,7 @@ library
array,
xhtml >= 3000.2 && < 3000.3,
Cabal >= 1.10,
- ghc >= 7.2 && < 7.4
+ ghc >= 7.2 && < 7.6
if flag(in-ghc-tree)
cpp-options: -DIN_GHC_TREE
diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs
index 1da46662..52f04f1a 100644
--- a/src/Haddock/InterfaceFile.hs
+++ b/src/Haddock/InterfaceFile.hs
@@ -68,6 +68,10 @@ binaryInterfaceVersion :: Word16
binaryInterfaceVersion = 18
#elif __GLASGOW_HASKELL__ == 703
binaryInterfaceVersion = 18
+#elif __GLASGOW_HASKELL__ == 704
+binaryInterfaceVersion = 18
+#elif __GLASGOW_HASKELL__ == 705
+binaryInterfaceVersion = 18
#else
#error Unknown GHC version
#endif