Bump to LTS 12.20

diff --git a/Setup.hs b/Setup.hs
index 7b0e23703ad1b3b5501fed3df7339f3b98f9b4fc..f09d44373a69d60092f012a09d9f6bae284ca1fe 100644 (file)
--- a/Setup.hs
+++ b/Setup.hs
@@ -7,8 +7,7 @@ main = do
         haddockHoogle       = Flag True,
         haddockHtml         = Flag True,
         haddockProgramArgs  = [("-q",["aliased"])], -- does not seam to do anything
-        haddockExecutables  = Flag True,
-        haddockHscolour     = Flag True
+        haddockExecutables  = Flag True
         }
     }
 

diff --git a/src/Text/BlazeT/Internal.hs b/src/Text/BlazeT/Internal.hs
index f6f642a488e242592e451fd3c928333eb7b1ab50..feaf68f129aef306a60f486076a2e858a157f7fb 100644 (file)
--- a/src/Text/BlazeT/Internal.hs
+++ b/src/Text/BlazeT/Internal.hs
@@ -188,13 +188,17 @@ wrapMarkup2 :: (Text.Blaze.Markup -> Text.Blaze.Markup) -> Markup2
 wrapMarkup2 = wrapMarkupT2
 {-# INLINE wrapMarkup2 #-}
 
+#if MIN_VERSION_base(4,11,0)
+instance (Monad m,Monoid a) => Semigroup (MarkupT m a) where
+  a <> b = do {a' <- a; b >>= return . (mappend a')}
+  {-# INLINE (<>) #-}
+#endif
 
-instance (Monad m,Monoid a) => Monoid (MarkupT m a) where
+instance (Functor m, Monad m,Monoid a) => Monoid (MarkupT m a) where
   mempty = return mempty
-  {-# INLINE mempty #-}
-  a `mappend` b = do {a' <- a; b >>= return . (mappend a')}
+  a `mappend` b = do {a' <- a; fmap (mappend a') b}
   {-# INLINE mappend #-}
-
+  {-# INLINE mempty #-}
 
 instance Monad m => Text.Blaze.Attributable (MarkupT m a) where
   h ! a = wrapMarkupT2 (Text.Blaze.! a) h

diff --git a/stack.yaml b/stack.yaml
index 397b67a60a6acf92471f70b85a17a33b91f0d61f..ddbf53b54a38b70261be909a8835c226ce1c46e8 100644 (file)
--- a/stack.yaml
+++ b/stack.yaml
@@ -15,7 +15,7 @@
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-7.15
+resolver: lts-12.20
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -63,4 +63,4 @@ extra-package-dbs: []
 # extra-lib-dirs: [/path/to/dir]
 #
 # Allow a newer minor version of GHC than the snapshot specifies
-# compiler-check: newer-minor
\ No newline at end of file
+# compiler-check: newer-minor