aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAdrien Duclos <adrien.duclos@fretlink.com>2018-11-30 11:36:53 +0100
committerAdrien Duclos <adrien.duclos@fretlink.com>2018-11-30 13:02:49 +0100
commit3db60b162a1e8482bb60f7638347de4cd7dc36f2 (patch)
tree0f1edaa60dd610f506a63df4fd89be68aa7eba8b
parent4dc7c9b2b700d43e6b8550b218b6c67bdf20f565 (diff)
downloadblazeT-3db60b162a1e8482bb60f7638347de4cd7dc36f2.tar.gz
blazeT-3db60b162a1e8482bb60f7638347de4cd7dc36f2.tar.zst
blazeT-3db60b162a1e8482bb60f7638347de4cd7dc36f2.zip
Bump to LTS 12.20
-rw-r--r--Setup.hs3
-rw-r--r--src/Text/BlazeT/Internal.hs12
-rw-r--r--stack.yaml4
3 files changed, 11 insertions, 8 deletions
diff --git a/Setup.hs b/Setup.hs
index 7b0e237..f09d443 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -7,8 +7,7 @@ main = do
7 haddockHoogle = Flag True, 7 haddockHoogle = Flag True,
8 haddockHtml = Flag True, 8 haddockHtml = Flag True,
9 haddockProgramArgs = [("-q",["aliased"])], -- does not seam to do anything 9 haddockProgramArgs = [("-q",["aliased"])], -- does not seam to do anything
10 haddockExecutables = Flag True, 10 haddockExecutables = Flag True
11 haddockHscolour = Flag True
12 } 11 }
13 } 12 }
14 13
diff --git a/src/Text/BlazeT/Internal.hs b/src/Text/BlazeT/Internal.hs
index f6f642a..feaf68f 100644
--- a/src/Text/BlazeT/Internal.hs
+++ b/src/Text/BlazeT/Internal.hs
@@ -188,13 +188,17 @@ wrapMarkup2 :: (Text.Blaze.Markup -> Text.Blaze.Markup) -> Markup2
188wrapMarkup2 = wrapMarkupT2 188wrapMarkup2 = wrapMarkupT2
189{-# INLINE wrapMarkup2 #-} 189{-# INLINE wrapMarkup2 #-}
190 190
191#if MIN_VERSION_base(4,11,0)
192instance (Monad m,Monoid a) => Semigroup (MarkupT m a) where
193 a <> b = do {a' <- a; b >>= return . (mappend a')}
194 {-# INLINE (<>) #-}
195#endif
191 196
192instance (Monad m,Monoid a) => Monoid (MarkupT m a) where 197instance (Functor m, Monad m,Monoid a) => Monoid (MarkupT m a) where
193 mempty = return mempty 198 mempty = return mempty
194 {-# INLINE mempty #-} 199 a `mappend` b = do {a' <- a; fmap (mappend a') b}
195 a `mappend` b = do {a' <- a; b >>= return . (mappend a')}
196 {-# INLINE mappend #-} 200 {-# INLINE mappend #-}
197 201 {-# INLINE mempty #-}
198 202
199instance Monad m => Text.Blaze.Attributable (MarkupT m a) where 203instance Monad m => Text.Blaze.Attributable (MarkupT m a) where
200 h ! a = wrapMarkupT2 (Text.Blaze.! a) h 204 h ! a = wrapMarkupT2 (Text.Blaze.! a) h
diff --git a/stack.yaml b/stack.yaml
index 397b67a..ddbf53b 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -15,7 +15,7 @@
15# resolver: 15# resolver:
16# name: custom-snapshot 16# name: custom-snapshot
17# location: "./custom-snapshot.yaml" 17# location: "./custom-snapshot.yaml"
18resolver: lts-7.15 18resolver: lts-12.20
19 19
20# User packages to be built. 20# User packages to be built.
21# Various formats can be used as shown in the example below. 21# Various formats can be used as shown in the example below.
@@ -63,4 +63,4 @@ extra-package-dbs: []
63# extra-lib-dirs: [/path/to/dir] 63# extra-lib-dirs: [/path/to/dir]
64# 64#
65# Allow a newer minor version of GHC than the snapshot specifies 65# Allow a newer minor version of GHC than the snapshot specifies
66# compiler-check: newer-minor \ No newline at end of file 66# compiler-check: newer-minor