Patch for ghc-7.4.2 by Christian Andreetta

jaspervdj · Jun 27, 2012 · f82546b · f82546b
1 parent aafe2b4
commit f82546b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/criterion-to-html.cabal b/criterion-to-html.cabal
@@ -1,5 +1,5 @@
 Name:          criterion-to-html
-Version:       0.0.0.2
+Version:       0.0.0.3
 Synopsis:      Convert criterion output to HTML reports
 License:       BSD3
 License-file:  LICENSE
@@ -40,13 +40,16 @@ Source-Repository head
 Executable criterion-to-html
   Hs-source-dirs: src/
   Main-is:        Criterion/ToHtml.hs
+
   Build-depends:
-    base       >= 4   && < 5,
-    blaze-html >= 0.4 && < 0.5,
-    bytestring >= 0.9 && < 0.10,
-    filepath   >= 1.1 && < 1.3,
-    aeson      >= 0.3 && < 0.4,
-    containers >= 0.3 && < 0.5
+    aeson        >= 0.3 && < 0.7,
+    base         >= 4   && < 5,
+    blaze-html   >= 0.5 && < 0.6,
+    blaze-markup >= 0.5 && < 0.6,
+    bytestring   >= 0.9 && < 0.10,
+    containers   >= 0.3 && < 0.6,
+    filepath     >= 1.1 && < 1.4
+
   Other-modules:
     Criterion.ToHtml.Csv,
     Criterion.ToHtml.Html,

diff --git a/src/Criterion/ToHtml.hs b/src/Criterion/ToHtml.hs
@@ -8,7 +8,7 @@ import Control.Applicative ((<$>))
 import System.Environment (getArgs, getProgName)
 import System.FilePath (replaceExtension)
 
-import Text.Blaze.Renderer.Utf8 (renderHtml)
+import Text.Blaze.Html.Renderer.Utf8 (renderHtml)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as BL
 

diff --git a/src/Criterion/ToHtml/Html.hs b/src/Criterion/ToHtml/Html.hs
@@ -10,7 +10,8 @@ import Data.Monoid (mempty)
 
 import Data.Aeson (encode)
 import Data.ByteString (ByteString)
-import Text.Blaze (Html, unsafeLazyByteString, unsafeByteString, (!))
+import Text.Blaze (unsafeLazyByteString, unsafeByteString, (!))
+import Text.Blaze.Html
 import qualified Text.Blaze.Html5 as H
 import qualified Text.Blaze.Html5.Attributes as A