Hello community,
here is the log from the commit of package ghc-shakespeare for openSUSE:Factory
checked in at 2020-09-07 21:32:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-shakespeare (Old)
and /work/SRC/openSUSE:Factory/.ghc-shakespeare.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-shakespeare"
Mon Sep 7 21:32:29 2020 rev:4 rq:832319 version:2.0.25
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-shakespeare/ghc-shakespeare.changes
2020-08-28 21:38:05.612800990 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-shakespeare.new.3399/ghc-shakespeare.changes
2020-09-07 21:32:30.569302129 +0200
@@ -1,0 +2,8 @@
+Fri Aug 28 11:38:38 UTC 2020 - [email protected]
+
+- Update shakespeare to version 2.0.25.
+ ### 2.0.25
+
+ * Support for GHC 9.0
[#254](https://github.com/yesodweb/shakespeare/pull/254)
+
+-------------------------------------------------------------------
Old:
----
shakespeare-2.0.24.1.tar.gz
New:
----
shakespeare-2.0.25.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-shakespeare.spec ++++++
--- /var/tmp/diff_new_pack.BZ7lUY/_old 2020-09-07 21:32:32.421302978 +0200
+++ /var/tmp/diff_new_pack.BZ7lUY/_new 2020-09-07 21:32:32.425302980 +0200
@@ -19,7 +19,7 @@
%global pkg_name shakespeare
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 2.0.24.1
+Version: 2.0.25
Release: 0
Summary: A toolkit for making compile-time interpolated templates
License: MIT
++++++ shakespeare-2.0.24.1.tar.gz -> shakespeare-2.0.25.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.24.1/ChangeLog.md
new/shakespeare-2.0.25/ChangeLog.md
--- old/shakespeare-2.0.24.1/ChangeLog.md 2020-06-18 13:43:03.000000000
+0200
+++ new/shakespeare-2.0.25/ChangeLog.md 2020-08-28 09:13:14.000000000 +0200
@@ -1,5 +1,9 @@
# ChangeLog for shakespeare
+### 2.0.25
+
+* Support for GHC 9.0 [#254](https://github.com/yesodweb/shakespeare/pull/254)
+
### 2.0.24.1
* Derive Lift instances wherever possible
[#252](https://github.com/yesodweb/shakespeare/pull/252)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.24.1/Text/Hamlet/Parse.hs
new/shakespeare-2.0.25/Text/Hamlet/Parse.hs
--- old/shakespeare-2.0.24.1/Text/Hamlet/Parse.hs 2020-06-18
13:42:45.000000000 +0200
+++ new/shakespeare-2.0.25/Text/Hamlet/Parse.hs 2020-08-28 09:13:14.000000000
+0200
@@ -625,7 +625,9 @@
instance Lift (String -> CloseStyle) where
lift _ = [|\s -> htmlCloseStyle s|]
-#if MIN_VERSION_template_haskell(2,16,0)
+#if MIN_VERSION_template_haskell(2,17,0)
+ liftTyped = unsafeCodeCoerce . lift
+#elif MIN_VERSION_template_haskell(2,16,0)
liftTyped = unsafeTExpCoerce . lift
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.24.1/Text/Hamlet.hs
new/shakespeare-2.0.25/Text/Hamlet.hs
--- old/shakespeare-2.0.24.1/Text/Hamlet.hs 2020-06-18 13:42:45.000000000
+0200
+++ new/shakespeare-2.0.25/Text/Hamlet.hs 2020-08-28 09:13:14.000000000
+0200
@@ -110,7 +110,11 @@
case exps of
[] -> [|return ()|]
[x] -> return x
- _ -> return $ DoE $ map NoBindS exps
+ _ -> return $ DoE
+#if MIN_VERSION_template_haskell(2,17,0)
+ Nothing
+#endif
+ $ map NoBindS exps
unIdent :: Ident -> String
unIdent (Ident s) = s
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.24.1/Text/Internal/Css.hs
new/shakespeare-2.0.25/Text/Internal/Css.hs
--- old/shakespeare-2.0.24.1/Text/Internal/Css.hs 2020-06-18
13:42:45.000000000 +0200
+++ new/shakespeare-2.0.25/Text/Internal/Css.hs 2020-08-28 09:13:14.000000000
+0200
@@ -270,7 +270,7 @@
where
cs = either error mconcat $ mapM (contentToBuilderRT cd render') cs'
goTop scope (TopBlock b:rest) =
- map TopBlock (either error ($[]) $ blockRuntime (addScope scope)
render' b) ++
+ map TopBlock (either error ($ []) $ blockRuntime (addScope scope)
render' b) ++
goTop scope rest
goTop scope (TopAtBlock name s' b:rest) =
TopAtBlock name s (foldr (either error id . blockRuntime (addScope
scope) render') [] b) :
@@ -516,16 +516,24 @@
deriving instance Lift (Attr Unresolved)
instance Lift (Attr Resolved) where
lift (Attr k v) = [|Attr $(liftBuilder k) $(liftBuilder v) :: Attr
Resolved |]
-#if MIN_VERSION_template_haskell(2,16,0)
+#if MIN_VERSION_template_haskell(2,17,0)
+ liftTyped = unsafeCodeCoerce . lift
+#elif MIN_VERSION_template_haskell(2,16,0)
liftTyped = unsafeTExpCoerce . lift
#endif
+#if MIN_VERSION_template_haskell(2,17,0)
+liftBuilder :: Quote m => Builder -> m Exp
+#else
liftBuilder :: Builder -> Q Exp
+#endif
liftBuilder b = [|fromText $ pack $(lift $ TL.unpack $ toLazyText b)|]
deriving instance Lift (Block Unresolved)
instance Lift (Block Resolved) where
lift (Block a b () ()) = [|Block $(liftBuilder a) b () ()|]
-#if MIN_VERSION_template_haskell(2,16,0)
+#if MIN_VERSION_template_haskell(2,17,0)
+ liftTyped = unsafeCodeCoerce . lift
+#elif MIN_VERSION_template_haskell(2,16,0)
liftTyped = unsafeTExpCoerce . lift
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.24.1/Text/Lucius.hs
new/shakespeare-2.0.25/Text/Lucius.hs
--- old/shakespeare-2.0.24.1/Text/Lucius.hs 2020-06-18 13:42:45.000000000
+0200
+++ new/shakespeare-2.0.25/Text/Lucius.hs 2020-08-28 09:13:14.000000000
+0200
@@ -334,7 +334,7 @@
-> Block Unresolved
-> Either String [Block Resolved]
goBlock scope =
- either Left (Right . ($[])) . blockRuntime scope' (error "luciusRT has
no URLs")
+ either Left (Right . ($ [])) . blockRuntime scope' (error "luciusRT
has no URLs")
where
scope' = map goScope scope
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.24.1/Text/Shakespeare.hs
new/shakespeare-2.0.25/Text/Shakespeare.hs
--- old/shakespeare-2.0.24.1/Text/Shakespeare.hs 2020-06-18
13:42:45.000000000 +0200
+++ new/shakespeare-2.0.25/Text/Shakespeare.hs 2020-08-28 09:13:14.000000000
+0200
@@ -152,7 +152,9 @@
liftExp _ = error "liftExp only supports VarE and ConE"
liftMExp Nothing = [|Nothing|]
liftMExp (Just e) = [|Just|] `appE` liftExp e
-#if MIN_VERSION_template_haskell(2,16,0)
+#if MIN_VERSION_template_haskell(2,17,0)
+ liftTyped = unsafeCodeCoerce . lift
+#elif MIN_VERSION_template_haskell(2,16,0)
liftTyped = unsafeTExpCoerce . lift
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.24.1/shakespeare.cabal
new/shakespeare-2.0.25/shakespeare.cabal
--- old/shakespeare-2.0.24.1/shakespeare.cabal 2020-06-18 13:48:15.000000000
+0200
+++ new/shakespeare-2.0.25/shakespeare.cabal 2020-08-28 09:13:14.000000000
+0200
@@ -1,5 +1,5 @@
name: shakespeare
-version: 2.0.24.1
+version: 2.0.25
license: MIT
license-file: LICENSE
author: Michael Snoyman <[email protected]>
