[Pkg-haskell-commits] darcs: ghc: Refresh ./patches/haddock-no-library

[Joachim Breitner]

Wed Dec 21 18:52:10 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh ./patches/haddock-no-library
  Ignore-this: b181e4c388f21910ad05b85de1dbab93

    M ./patches/haddock-no-library -7 +10

Wed Dec 21 18:52:10 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh ./patches/haddock-no-library
  Ignore-this: b181e4c388f21910ad05b85de1dbab93
diff -rN -u old-ghc//patches/haddock-no-library new-ghc//patches/haddock-no-library
--- old-ghc//patches/haddock-no-library	2012-02-03 16:39:47.299248725 +0000
+++ new-ghc//patches/haddock-no-library	2012-02-03 16:39:48.087253474 +0000
@@ -1,16 +1,20 @@
-Index: ghc-7.2.2/utils/haddock/haddock.cabal
+Index: ghc-7.4.0.20111219/utils/haddock/haddock.cabal
 ===================================================================
---- ghc-7.2.2.orig/utils/haddock/haddock.cabal	2011-11-19 18:25:55.000000000 +0100
-+++ ghc-7.2.2/utils/haddock/haddock.cabal	2011-11-19 18:26:59.000000000 +0100
-@@ -133,71 +133,6 @@
+--- ghc-7.4.0.20111219.orig/utils/haddock/haddock.cabal	2011-12-21 19:46:02.000000000 +0100
++++ ghc-7.4.0.20111219/utils/haddock/haddock.cabal	2011-12-21 19:52:05.000000000 +0100
+@@ -136,74 +136,6 @@
      Haddock.Options
      Haddock.GhcUtils
      Haddock.Convert
 -   
 -library
 -  default-language:     Haskell2010
+-  -- 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,
@@ -18,7 +22,7 @@
 -    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
@@ -42,7 +46,6 @@
 -    Haddock.Interface.Create
 -    Haddock.Interface.ExtractFnArgDocs
 -    Haddock.Interface.AttachInstances
--    Haddock.Interface.Rn
 -    Haddock.Interface.LexParseRn
 -    Haddock.Interface.ParseModuleHeader
 -    Haddock.Lex