Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-microstache for openSUSE:Factory
checked in at 2021-11-11 21:36:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-microstache (Old)
and /work/SRC/openSUSE:Factory/.ghc-microstache.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-microstache"
Thu Nov 11 21:36:40 2021 rev:2 rq:930342 version:1.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-microstache/ghc-microstache.changes
2021-05-05 20:40:39.950742661 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-microstache.new.1890/ghc-microstache.changes
2021-11-11 21:36:58.796913067 +0100
@@ -1,0 +2,8 @@
+Sun Oct 10 14:49:10 UTC 2021 - [email protected]
+
+- Update microstache to version 1.0.2.
+ ## microstache 1.0.2
+
+ - Support `aeson-2.0.0.0`
+
+-------------------------------------------------------------------
Old:
----
microstache-1.0.1.2.tar.gz
microstache.cabal
New:
----
microstache-1.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-microstache.spec ++++++
--- /var/tmp/diff_new_pack.sKT3gl/_old 2021-11-11 21:36:59.304913437 +0100
+++ /var/tmp/diff_new_pack.sKT3gl/_new 2021-11-11 21:36:59.308913440 +0100
@@ -19,13 +19,12 @@
%global pkg_name microstache
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.0.1.2
+Version: 1.0.2
Release: 0
Summary: Mustache templates for Haskell
License: BSD-3-Clause
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-containers-devel
@@ -62,7 +61,6 @@
%prep
%autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ microstache-1.0.1.2.tar.gz -> microstache-1.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microstache-1.0.1.2/CHANGELOG.md
new/microstache-1.0.2/CHANGELOG.md
--- old/microstache-1.0.1.2/CHANGELOG.md 2001-09-09 03:46:40.000000000
+0200
+++ new/microstache-1.0.2/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200
@@ -1,3 +1,7 @@
+## microstache 1.0.2
+
+- Support `aeson-2.0.0.0`
+
## microstache 1.0.1.2
- Drop `bytestring` dependency (there weren't direct one)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microstache-1.0.1.2/microstache.cabal
new/microstache-1.0.2/microstache.cabal
--- old/microstache-1.0.1.2/microstache.cabal 2001-09-09 03:46:40.000000000
+0200
+++ new/microstache-1.0.2/microstache.cabal 2001-09-09 03:46:40.000000000
+0200
@@ -1,5 +1,5 @@
name: microstache
-version: 1.0.1.2
+version: 1.0.2
cabal-version: >=1.10
license: BSD3
license-file: LICENSE
@@ -7,8 +7,8 @@
Mark Karpov <[email protected]>, Oleg Grenrus <[email protected]>
maintainer: Oleg Grenrus<[email protected]>
-homepage: https://github.com/phadej/microstache
-bug-reports: https://github.com/phadej/microstache/issues
+homepage: https://github.com/haskellari/microstache
+bug-reports: https://github.com/haskellari/microstache/issues
category: Text
synopsis: Mustache templates for Haskell
build-type: Simple
@@ -37,22 +37,23 @@
|| ==8.2.2
|| ==8.4.4
|| ==8.6.5
- || ==8.8.3
- || ==8.10.1
+ || ==8.8.4
+ || ==8.10.4
+ || ==9.0.1
source-repository head
type: git
- location: https://github.com/phadej/microstache.git
+ location: https://github.com/haskellari/microstache.git
library
build-depends:
- aeson >=0.11 && <1.6
- , base >=4.5 && <4.15
+ aeson >=0.11 && <1.6 || >=2.0.0.0 && <2.1
+ , base >=4.5 && <4.16
, containers >=0.4.2.1 && <0.7
, deepseq >=1.3.0.0 && <1.5
, directory >=1.1.0.2 && <1.4
, filepath >=1.3.0.0 && <1.5
- , parsec >=3.1.11 && <6.0
+ , parsec >=3.1.11 && <3.2
, text >=1.2 && <1.3
, transformers >=0.3.0.0 && <0.6
, unordered-containers >=0.2.5 && <0.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microstache-1.0.1.2/src/Text/Microstache/Render.hs
new/microstache-1.0.2/src/Text/Microstache/Render.hs
--- old/microstache-1.0.1.2/src/Text/Microstache/Render.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/microstache-1.0.2/src/Text/Microstache/Render.hs 2001-09-09
03:46:40.000000000 +0200
@@ -30,7 +30,6 @@
import Data.Word (Word)
import Text.Microstache.Type
-import qualified Data.HashMap.Strict as HM
import qualified Data.List.NonEmpty as NE
import qualified Data.Map as Map
import qualified Data.Text as T
@@ -39,6 +38,13 @@
import qualified Data.Text.Lazy.Encoding as LTE
import qualified Data.Vector as V
+#if MIN_VERSION_aeson(2,0,0)
+import qualified Data.Aeson.KeyMap as KM
+import qualified Data.Aeson.Key as Key
+#else
+import qualified Data.HashMap.Strict as KM
+#endif
+
#if MIN_VERSION_transformers(0,4,0)
import Control.Monad.Trans.State.Strict (State, execState, modify')
#else
@@ -235,7 +241,11 @@
-> Maybe Value -- ^ Looked-up value
simpleLookup _ (Key []) obj = return obj
simpleLookup c (Key (k:ks)) (Object m) =
- case HM.lookup k m of
+#if MIN_VERSION_aeson(2,0,0)
+ case KM.lookup (Key.fromText k) m of
+#else
+ case KM.lookup k m of
+#endif
Nothing -> if c then Just Null else Nothing
Just v -> simpleLookup True (Key ks) v
simpleLookup _ _ _ = Nothing
@@ -280,7 +290,7 @@
isBlank :: Value -> Bool
isBlank Null = True
isBlank (Bool False) = True
-isBlank (Object m) = HM.null m
+isBlank (Object m) = KM.null m
isBlank (Array a) = V.null a
isBlank (String s) = T.null s
isBlank _ = False
