Merge ../ghc/utils/haddock

haddock.cabal

@@ -78,9 +78,12 @@ flag test
 
 executable haddock
   default-language:     Haskell2010
-  build-tools: alex >= 2.3, happy >= 1.18
+  -- In a GHC tree - in particular, in a source tarball - we don't
+  -- require alex or happy
+  if !flag(in-ghc-tree)
+    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 +91,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
@@ -137,9 +140,12 @@ executable haddock
    
 library
   default-language:     Haskell2010
-  build-tools: alex >= 2.3, happy >= 1.18
+  -- In a GHC tree - in particular, in a source tarball - we don't
+  -- require alex or happy
+  if !flag(in-ghc-tree)
+    build-tools: alex >= 2.3, happy >= 1.18
   build-depends:
-    base >= 4.3 && < 4.5,
+    base >= 4.3 && < 4.6,
     filepath,
     directory,
     pretty,
@@ -147,7 +153,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

src/Haddock/InterfaceFile.hs

@@ -68,6 +68,10 @@ binaryInterfaceVersion :: Word16
 binaryInterfaceVersion = 19
 #elif __GLASGOW_HASKELL__ == 703
 binaryInterfaceVersion = 19
+#elif __GLASGOW_HASKELL__ == 704
+binaryInterfaceVersion = 19
+#elif __GLASGOW_HASKELL__ == 705
+binaryInterfaceVersion = 19
 #else
 #error Unknown GHC version
 #endif