persistent 0.9.0.2 → 0.9.0.3

raw patch · 2 files changed

+21/−2 lines, 2 filesdep +blaze-markupdep ~blaze-html

Dependencies added: blaze-markup

Dependency ranges changed: blaze-html

Files

• Database/Persist/Store.hs +8/−0
• persistent.cabal +13/−2

@@ -60,8 +60,16 @@ import Data.Typeable (Typeable) import Data.Int (Int8, Int16, Int32, Int64) import Data.Word (Word8, Word16, Word32, Word64)++#if MIN_VERSION_blaze_html(0,5,0)+import Text.Blaze.Html+import Text.Blaze.Internal (preEscapedText)+import Text.Blaze.Html.Renderer.Text (renderHtml)+#else import Text.Blaze (Html, preEscapedText) import Text.Blaze.Renderer.Text (renderHtml)+#endif+ import qualified Data.Text as T import qualified Data.Text.Lazy as TL import qualified Data.ByteString.Lazy as L

@@ -1,5 +1,5 @@ name:            persistent-version:         0.9.0.2+version:         0.9.0.3 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -18,6 +18,10 @@     default: False     description: test out our assumption that OverlappingInstances is just for String +flag blaze_html_0_5+    description: use blaze-html 0.5 and blaze-markup 0.5+    default: False+ library     if flag(nooverlap)         cpp-options: -DNO_OVERLAP@@ -33,7 +37,6 @@                    , monad-control            >= 0.3     && < 0.4                    , lifted-base              >= 0.1     && < 0.2                    , pool-conduit             >= 0.1     && < 0.2-                   , blaze-html               >= 0.4     && < 0.5                    , path-pieces              >= 0.1     && < 0.2                    , aeson                    >= 0.5     && < 0.7                    , transformers-base@@ -41,6 +44,14 @@                    , unordered-containers                    , vector                    , attoparsec++    if flag(blaze_html_0_5)+        build-depends:+                     blaze-html               >= 0.5     && < 0.6+                   , blaze-markup             >= 0.5.1   && < 0.6+    else+        build-depends:+                     blaze-html               >= 0.4     && < 0.5      exposed-modules: Database.Persist                      Database.Persist.EntityDef