servant-lucid 0.4.4.7 → 0.5
raw patch · 5 files changed
+21/−19 lines, 5 filesdep ~servantsetup-changedPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: servant
API changes (from Hackage documentation)
Files
- LICENSE +1/−1
- Setup.hs +1/−1
- include/overlapping-compat.h +8/−0
- servant-lucid.cabal +7/−6
- src/Servant/HTML/Lucid.hs +4/−11
LICENSE view
@@ -1,4 +1,4 @@-Copyright (c) 2015, Julian K. Arni+Copyright (c) 2015-2016, Servant Contributors All rights reserved.
Setup.hs view
@@ -1,2 +1,2 @@-import Distribution.Simple+import Distribution.Simple main = defaultMain
+ include/overlapping-compat.h view
@@ -0,0 +1,8 @@+#if __GLASGOW_HASKELL__ >= 710+#define OVERLAPPABLE_ {-# OVERLAPPABLE #-}+#define OVERLAPPING_ {-# OVERLAPPING #-}+#else+{-# LANGUAGE OverlappingInstances #-}+#define OVERLAPPABLE_+#define OVERLAPPING_+#endif
servant-lucid.cabal view
@@ -2,18 +2,18 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: servant-lucid-version: 0.4.4.7+version: 0.5 synopsis: Servant support for lucid -- description: homepage: http://haskell-servant.github.io/ license: BSD3 license-file: LICENSE-author: Julian K. Arni-maintainer: jkarni@gmail.com--- copyright:+author: Servant Contributors+maintainer: haskell-servant-maintainers@googlegroups.com+copyright: 2015-2016 Servant Contributors category: Web build-type: Simple--- extra-source-files:+extra-source-files: include/*.h cabal-version: >=1.10 bug-reports: http://github.com/haskell-servant/servant/issues source-repository head@@ -27,6 +27,7 @@ build-depends: base >=4.7 && <5 , http-media , lucid- , servant == 0.4.*+ , servant == 0.5.* hs-source-dirs: src default-language: Haskell2010+ include-dirs: include
src/Servant/HTML/Lucid.hs view
@@ -3,10 +3,9 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-}-#if !MIN_VERSION_base(4,8,0)-{-# LANGUAGE OverlappingInstances #-}-#endif +#include "overlapping-compat.h"+ -- | An @HTML@ empty data type with `MimeRender` instances for @lucid@'s -- `ToHtml` class and `Html` datatype. -- You should only need to import this module for it's instances and the@@ -28,16 +27,10 @@ instance Accept HTML where contentType _ = "text" M.// "html" M./: ("charset", "utf-8") -instance-#if MIN_VERSION_base(4,8,0)- {-# OVERLAPPABLE #-}-#endif+instance OVERLAPPABLE_ ToHtml a => MimeRender HTML a where mimeRender _ = renderBS . toHtml -instance-#if MIN_VERSION_base(4,8,0)- {-# OVERLAPPING #-}-#endif+instance OVERLAPPING_ MimeRender HTML (Html a) where mimeRender _ = renderBS