From c8301a41d924d83f6e5160778d19016f2f1806ce Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 12 Dec 2011 21:21:35 +0000 Subject: Update dependencies and binaryInterfaceVersion --- haddock.cabal | 8 ++++---- src/Haddock/InterfaceFile.hs | 4 ++++ 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 -- cgit v1.2.3 From 505df72e9e0962e01cf031f799d8d8940ced73b1 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 18 Dec 2011 12:56:16 +0000 Subject: Fix (untested) building from source tarball without alex/happy haddock's .cabal file was declaring that it needed alex and happy to build, but in the GHC source tarballs it doesn't. --- haddock.cabal | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/haddock.cabal b/haddock.cabal index a9e14fab..63ed5cd8 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -78,7 +78,10 @@ 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.6, filepath, @@ -138,7 +141,10 @@ 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.6, filepath, -- cgit v1.2.3