Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-shakespeare for openSUSE:Factory
checked in at 2022-02-11 23:09:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-shakespeare (Old)
and /work/SRC/openSUSE:Factory/.ghc-shakespeare.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-shakespeare"
Fri Feb 11 23:09:37 2022 rev:7 rq:953528 version:2.0.25.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-shakespeare/ghc-shakespeare.changes
2021-11-11 21:38:37.084984751 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-shakespeare.new.1956/ghc-shakespeare.changes
2022-02-11 23:11:34.795322617 +0100
@@ -1,0 +2,8 @@
+Thu Dec 23 07:55:11 UTC 2021 - Peter Simons <[email protected]>
+
+- Update shakespeare to version 2.0.25.1.
+ ### 2.0.25.1
+
+ * Support for GHC 9.2 and aeson 2
[#260](https://github.com/yesodweb/shakespeare/pull/260)
+
+-------------------------------------------------------------------
Old:
----
shakespeare-2.0.25.tar.gz
shakespeare.cabal
New:
----
shakespeare-2.0.25.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-shakespeare.spec ++++++
--- /var/tmp/diff_new_pack.2ocQ9P/_old 2022-02-11 23:11:35.295324063 +0100
+++ /var/tmp/diff_new_pack.2ocQ9P/_new 2022-02-11 23:11:35.299324075 +0100
@@ -19,13 +19,12 @@
%global pkg_name shakespeare
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 2.0.25
+Version: 2.0.25.1
Release: 0
Summary: A toolkit for making compile-time interpolated templates
License: MIT
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-blaze-html-devel
@@ -80,7 +79,6 @@
%prep
%autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ shakespeare-2.0.25.tar.gz -> shakespeare-2.0.25.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.25/ChangeLog.md
new/shakespeare-2.0.25.1/ChangeLog.md
--- old/shakespeare-2.0.25/ChangeLog.md 2020-08-28 09:13:14.000000000 +0200
+++ new/shakespeare-2.0.25.1/ChangeLog.md 2021-12-23 08:54:46.000000000
+0100
@@ -1,5 +1,9 @@
# ChangeLog for shakespeare
+### 2.0.25.1
+
+* Support for GHC 9.2 and aeson 2
[#260](https://github.com/yesodweb/shakespeare/pull/260)
+
### 2.0.25
* Support for GHC 9.0 [#254](https://github.com/yesodweb/shakespeare/pull/254)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.25/Text/Hamlet.hs
new/shakespeare-2.0.25.1/Text/Hamlet.hs
--- old/shakespeare-2.0.25/Text/Hamlet.hs 2020-08-28 09:13:14.000000000
+0200
+++ new/shakespeare-2.0.25.1/Text/Hamlet.hs 2021-12-23 08:54:46.000000000
+0100
@@ -139,7 +139,7 @@
return (ListP patterns, concat scopes)
bindingPattern (BindConstr con is) = do
(patterns, scopes) <- fmap unzip $ mapM bindingPattern is
- return (ConP (mkConName con) patterns, concat scopes)
+ return (conP (mkConName con) patterns, concat scopes)
bindingPattern (BindRecord con fields wild) = do
let f (Ident field,b) =
do (p,s) <- bindingPattern b
@@ -157,6 +157,13 @@
conToStr (DCUnqualified (Ident x)) = x
conToStr (DCQualified (Module xs) (Ident x)) = intercalate "." $ xs ++ [x]
+conP :: Name -> [Pat] -> Pat
+#if MIN_VERSION_template_haskell(2,18,0)
+conP name = ConP name []
+#else
+conP = ConP
+#endif
+
-- Wildcards bind all of the unbound fields to variables whose name
-- matches the field name.
--
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.25/Text/Julius.hs
new/shakespeare-2.0.25.1/Text/Julius.hs
--- old/shakespeare-2.0.25/Text/Julius.hs 2020-07-15 04:14:05.000000000
+0200
+++ new/shakespeare-2.0.25.1/Text/Julius.hs 2021-12-23 08:54:46.000000000
+0100
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE FlexibleInstances #-}
@@ -53,6 +54,9 @@
import qualified Data.Text.Lazy as TL
import Text.Shakespeare
import Data.Aeson (Value, toJSON)
+#if MIN_VERSION_aeson(2,0,0)
+import qualified Data.Aeson.KeyMap as KeyMap
+#endif
import Data.Aeson.Types (Value(..))
import Numeric (showHex)
import qualified Data.HashMap.Strict as H
@@ -117,12 +121,18 @@
V.foldr f (singleton ']') (V.unsafeTail v)
where f a z = singleton ',' <> go a <> z
go (Object m) = {-# SCC "go/Object" #-}
- case H.toList m of
+ case fromObject m of
(x:xs) -> singleton '{' <> one x <> foldr f (singleton '}') xs
_ -> "{}"
where f a z = singleton ',' <> one a <> z
one (k,v) = string k <> singleton ':' <> go v
+#if MIN_VERSION_aeson(2,0,0)
+ fromObject = H.toList . KeyMap.toHashMapText
+#else
+ fromObject = H.toList
+#endif
+
string :: T.Text -> Builder
string s = {-# SCC "string" #-} singleton '"' <> quote s <> singleton '"'
where
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.25/Text/MkSizeType.hs
new/shakespeare-2.0.25.1/Text/MkSizeType.hs
--- old/shakespeare-2.0.25/Text/MkSizeType.hs 2020-07-15 04:14:05.000000000
+0200
+++ new/shakespeare-2.0.25.1/Text/MkSizeType.hs 2021-12-23 08:54:46.000000000
+0100
@@ -38,7 +38,7 @@
x = mkName "x"
unit = LitE $ StringL unit'
showDec = FunD (mkName "show") [Clause [showPat] showBody []]
- showPat = ConP name [VarP x]
+ showPat = conP name [VarP x]
showBody = NormalB $ AppE (AppE showSize $ VarE x) unit
numInstanceDec :: Name -> Dec
@@ -65,8 +65,8 @@
binaryFunDec :: Name -> String -> Dec
binaryFunDec name fun' = FunD fun [Clause [pat1, pat2] body []]
- where pat1 = ConP name [VarP v1]
- pat2 = ConP name [VarP v2]
+ where pat1 = conP name [VarP v1]
+ pat2 = conP name [VarP v2]
body = NormalB $ AppE (ConE name) result
result = AppE (AppE (VarE fun) (VarE v1)) (VarE v2)
fun = mkName fun'
@@ -75,7 +75,7 @@
unariFunDec1 :: Name -> String -> Dec
unariFunDec1 name fun' = FunD fun [Clause [pat] body []]
- where pat = ConP name [VarP v]
+ where pat = conP name [VarP v]
body = NormalB $ AppE (ConE name) (AppE (VarE fun) (VarE v))
fun = mkName fun'
v = mkName "v"
@@ -92,3 +92,10 @@
instanceD :: Cxt -> Type -> [Dec] -> Dec
instanceD = InstanceD Nothing
+
+conP :: Name -> [Pat] -> Pat
+#if MIN_VERSION_template_haskell(2,18,0)
+conP name = ConP name []
+#else
+conP = ConP
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.25/Text/Shakespeare/I18N.hs
new/shakespeare-2.0.25.1/Text/Shakespeare/I18N.hs
--- old/shakespeare-2.0.25/Text/Shakespeare/I18N.hs 2020-07-15
04:14:05.000000000 +0200
+++ new/shakespeare-2.0.25.1/Text/Shakespeare/I18N.hs 2021-12-23
08:54:46.000000000 +0100
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE MultiParamTypeClasses #-}
@@ -186,7 +187,7 @@
(pat, bod) <- mkBody dt (prefix ++ constr def) (map fst $ vars def)
(content def)
guard <- fmap NormalG [|$(return $ VarE a) == pack $(lift $ unpack
lang)|]
return $ Clause
- [WildP, ConP (mkName ":") [VarP a, WildP], pat]
+ [WildP, conP (mkName ":") [VarP a, WildP], pat]
(GuardedB [(guard, bod)])
[]
@@ -230,7 +231,7 @@
sToClause prefix dt sdef = do
(pat, bod) <- mkBody dt (prefix ++ sconstr sdef) (map fst $ svars sdef)
(scontent sdef)
return $ Clause
- [WildP, ConP (mkName "[]") [], pat]
+ [WildP, conP (mkName "[]") [], pat]
(NormalB bod)
[]
@@ -241,10 +242,17 @@
d <- newName "msg"
rm <- [|renderMessage|]
return $ Clause
- [VarP a, ConP (mkName ":") [WildP, VarP c], VarP d]
+ [VarP a, conP (mkName ":") [WildP, VarP c], VarP d]
(NormalB $ rm `AppE` VarE a `AppE` VarE c `AppE` VarE d)
[]
+conP :: Name -> [Pat] -> Pat
+#if MIN_VERSION_template_haskell(2,18,0)
+conP name = ConP name []
+#else
+conP = ConP
+#endif
+
toCon :: String -> SDef -> Con
toCon dt (SDef c vs _) =
RecC (mkName $ "Msg" ++ c) $ map go vs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shakespeare-2.0.25/shakespeare.cabal
new/shakespeare-2.0.25.1/shakespeare.cabal
--- old/shakespeare-2.0.25/shakespeare.cabal 2020-08-28 09:13:14.000000000
+0200
+++ new/shakespeare-2.0.25.1/shakespeare.cabal 2021-12-23 08:54:46.000000000
+0100
@@ -1,5 +1,5 @@
name: shakespeare
-version: 2.0.25
+version: 2.0.25.1
license: MIT
license-file: LICENSE
author: Michael Snoyman <[email protected]>
@@ -35,7 +35,7 @@
library
default-language: Haskell2010
- build-depends: base >= 4.9 && < 5
+ build-depends: base >= 4.12 && < 5
, time >= 1
, containers
, template-haskell >= 2.7
@@ -45,7 +45,7 @@
, ghc-prim
, bytestring
, directory >= 1.2
- , aeson
+ , aeson < 3
, blaze-markup
, blaze-html
, exceptions
