haddock 2.9.0 → 2.9.1
raw patch · 9 files changed
+29/−21 lines, 9 filesdep ~Cabaldep ~base
Dependency ranges changed: Cabal, base
Files
- CHANGES +6/−0
- dist/build/haddock/haddock-tmp/Haddock/Lex.hs +1/−1
- dist/build/haddock/haddock-tmp/Haddock/Parse.hs +1/−1
- doc/haddock.xml +2/−2
- haddock.cabal +10/−8
- haddock.spec +1/−1
- src/Haddock/Lex.x +1/−1
- src/Haddock/Parse.y +1/−1
- src/Main.hs +6/−6
CHANGES view
@@ -1,3 +1,9 @@+Changes in version 2.9.1++ * Fix build in GHC tree++ * Improve .cabal file+ Changes in version 2.9.0 * Drop support for ghc < 7
dist/build/haddock/haddock-tmp/Haddock/Lex.hs view
@@ -1,7 +1,7 @@ {-# OPTIONS -fglasgow-exts -cpp #-} {-# LINE 10 "src/Haddock/Lex.x" #-} -{-# LANGUAGE BangPatterns #-}+{-# LANGUAGE BangPatterns #-} -- Generated by Alex {-# OPTIONS -Wwarn -w #-} -- The above warning supression flag is a temporary kludge. -- While working on this module you are encouraged to remove it and fix
dist/build/haddock/haddock-tmp/Haddock/Parse.hs view
@@ -1,6 +1,6 @@ {-# OPTIONS_GHC -fno-warn-overlapping-patterns #-} {-# OPTIONS -fglasgow-exts -cpp #-}-{-# LANGUAGE BangPatterns #-}+{-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6 {-# OPTIONS -Wwarn -w #-} -- The above warning supression flag is a temporary kludge. -- While working on this module you are encouraged to remove it and fix
doc/haddock.xml view
@@ -21,7 +21,7 @@ <holder>Simon Marlow, David Waern</holder> </copyright> <abstract>- <para>This document describes Haddock version 2.9.0, a Haskell+ <para>This document describes Haddock version 2.9.1, a Haskell documentation tool.</para> </abstract> </bookinfo>@@ -1580,7 +1580,7 @@ <title>Special characters</title> <para>The following characters have special meanings in- documentation comments: <literal>/</literal>,+ documentation comments: <literal>\</literal>, <literal>/</literal>, <literal>'</literal>, <literal>`</literal>, <literal>"</literal>, <literal>@</literal>, <literal><</literal>. To insert a literal occurrence of
haddock.cabal view
@@ -1,6 +1,6 @@ name: haddock-version: 2.9.0-cabal-version: >= 1.6+version: 2.9.1+cabal-version: >= 1.10 license: BSD3 build-type: Simple license-file: LICENSE@@ -73,15 +73,16 @@ manual: True executable haddock+ default-language: Haskell2010 build-depends:- base >= 4.0.0.0 && < 4.4.0.0,+ base == 4.3.*, filepath, directory, pretty, containers, array, xhtml >= 3000.2 && < 3000.3,- Cabal >= 1.5,+ Cabal >= 1.10, ghc >= 7.0 && < 7.2 if flag(in-ghc-tree)@@ -95,7 +96,7 @@ main-is: Main.hs hs-source-dirs: src- extensions: CPP, DeriveDataTypeable,+ default-extensions: CPP, DeriveDataTypeable, ScopedTypeVariables, MagicHash ghc-options: -funbox-strict-fields -O2 -Wall -fwarn-tabs @@ -132,15 +133,16 @@ Haddock.Convert library+ default-language: Haskell2010 build-depends:- base >= 4.0.0.0 && < 4.4.0.0,+ base == 4.3.*, filepath, directory, pretty, containers, array, xhtml >= 3000.2 && < 3000.3,- Cabal >= 1.5,+ Cabal >= 1.10, ghc >= 7.0 && < 7.2 if flag(in-ghc-tree)@@ -153,7 +155,7 @@ build-depends: QuickCheck >= 2.1 && < 3 hs-source-dirs: src- extensions: CPP, DeriveDataTypeable,+ default-extensions: CPP, DeriveDataTypeable, ScopedTypeVariables, MagicHash ghc-options: -funbox-strict-fields -O2 -Wall -fwarn-tabs
haddock.spec view
@@ -17,7 +17,7 @@ # version label of your release tarball. %define name haddock-%define version 2.9.0+%define version 2.9.1 %define release 1 Name: %{name}
src/Haddock/Lex.x view
@@ -8,7 +8,7 @@ -- {-{-# LANGUAGE BangPatterns #-}+{-# LANGUAGE BangPatterns #-} -- Generated by Alex {-# OPTIONS -Wwarn -w #-} -- The above warning supression flag is a temporary kludge. -- While working on this module you are encouraged to remove it and fix
src/Haddock/Parse.y view
@@ -1,5 +1,5 @@ {-{-# LANGUAGE BangPatterns #-}+{-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6 {-# OPTIONS -Wwarn -w #-} -- The above warning supression flag is a temporary kludge. -- While working on this module you are encouraged to remove it and fix
src/Main.hs view
@@ -403,14 +403,14 @@ #ifdef IN_GHC_TREE getInTreeLibDir :: IO String-getInTreeLibDir =- do m <- getExecDir- case m of- Nothing -> error "No GhcLibDir found"+getInTreeLibDir = do+ m <- getExecDir+ case m of+ Nothing -> error "No GhcLibDir found" #ifdef NEW_GHC_LAYOUT- Just d -> return (d </> ".." </> "lib")+ Just d -> return (d </> ".." </> "lib") #else- Just d -> return (d </> "..")+ Just d -> return (d </> "..") #endif