Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-mustache for openSUSE:Factory
checked in at 2022-02-11 23:09:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-mustache (Old)
and /work/SRC/openSUSE:Factory/.ghc-mustache.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-mustache"
Fri Feb 11 23:09:22 2022 rev:15 rq:953501 version:2.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-mustache/ghc-mustache.changes
2021-11-11 21:36:59.476913563 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-mustache.new.1956/ghc-mustache.changes
2022-02-11 23:11:16.811270602 +0100
@@ -1,0 +2,12 @@
+Sun Jan 30 19:32:49 UTC 2022 - Peter Simons <psim...@suse.com>
+
+- Update mustache to version 2.4.0.
+ ## v2.4.0
+
+ - Support for aeson 2
+
+ ## v2.3.2
+
+ - Added support for GHC 9.0.1
+
+-------------------------------------------------------------------
Old:
----
mustache-2.3.1.tar.gz
mustache.cabal
New:
----
mustache-2.4.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-mustache.spec ++++++
--- /var/tmp/diff_new_pack.wPxjCc/_old 2022-02-11 23:11:17.255271886 +0100
+++ /var/tmp/diff_new_pack.wPxjCc/_new 2022-02-11 23:11:17.259271898 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-mustache
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,12 @@
%global pkg_name mustache
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 2.3.1
+Version: 2.4.0
Release: 0
Summary: A mustache template parser library
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: chrpath
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-aeson-devel
@@ -33,7 +32,6 @@
BuildRequires: ghc-cmdargs-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-directory-devel
-BuildRequires: ghc-either-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-parsec-devel
@@ -77,7 +75,6 @@
%prep
%autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ mustache-2.3.1.tar.gz -> mustache-2.4.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mustache-2.3.1/CHANGELOG.md
new/mustache-2.4.0/CHANGELOG.md
--- old/mustache-2.3.1/CHANGELOG.md 2017-11-24 12:10:22.000000000 +0100
+++ new/mustache-2.4.0/CHANGELOG.md 2022-01-30 20:28:24.000000000 +0100
@@ -1,5 +1,13 @@
# Mustache library changelog
+## v2.4.0
+
+- Support for aeson 2
+
+## v2.3.2
+
+- Added support for GHC 9.0.1
+
## v2.3.0
- Changed `EitherT` to `ExceptT` (deprecation)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mustache-2.3.1/app/Main.hs
new/mustache-2.4.0/app/Main.hs
--- old/mustache-2.3.1/app/Main.hs 2017-11-08 12:54:18.000000000 +0100
+++ new/mustache-2.4.0/app/Main.hs 2021-11-23 15:31:36.000000000 +0100
@@ -4,11 +4,12 @@
import Data.Aeson (Value, eitherDecode)
+import Data.Bifunctor (first)
import qualified Data.ByteString as B (readFile)
import qualified Data.ByteString.Lazy as BS (readFile)
import Data.Foldable (for_)
import qualified Data.Text.IO as TIO (putStrLn)
-import Data.Yaml (decodeEither)
+import Data.Yaml (decodeEither')
import System.Console.CmdArgs.Implicit (Data, Typeable, argPos, args,
cmdArgs, def, help, summary,
@@ -44,7 +45,7 @@
readYAML :: FilePath -> IO (Either String Value)
-readYAML = fmap decodeEither . B.readFile
+readYAML = fmap (first show . decodeEither') . B.readFile
main :: IO ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mustache-2.3.1/mustache.cabal
new/mustache-2.4.0/mustache.cabal
--- old/mustache-2.3.1/mustache.cabal 2019-12-17 13:00:08.000000000 +0100
+++ new/mustache-2.4.0/mustache.cabal 2022-01-30 20:32:20.000000000 +0100
@@ -1,13 +1,11 @@
cabal-version: 1.12
--- This file has been generated from package.yaml by hpack version 0.31.2.
+-- This file has been generated from package.yaml by hpack version 0.34.4.
--
-- see: https://github.com/sol/hpack
---
--- hash: 8ffde004ee64f5b057ed66f76bbc72cbb71cdc81dcebe9e822563fdb11a8b338
name: mustache
-version: 2.3.1
+version: 2.4.0
synopsis: A mustache template parser library.
description: Allows parsing and rendering template files with mustache
markup. See the
mustache <http://mustache.github.io/mustache.5.html language
reference>.
@@ -20,11 +18,12 @@
bug-reports: https://github.com/JustusAdam/mustache/issues
author: Justus Adam
maintainer: dev@justus.science
-copyright: (c) 2015 - 2019 Justus Adam
+copyright: (c) 2015 - 2022 Justus Adam
license: BSD3
license-file: LICENSE
-tested-with: GHC>=7.8 && <=7.10.2
build-type: Simple
+tested-with:
+ GHC>=7.8 && <=7.10.2
extra-source-files:
README.md
CHANGELOG.md
@@ -37,10 +36,28 @@
location: git://github.com/JustusAdam/mustache.git
library
+ exposed-modules:
+ Text.Mustache
+ Text.Mustache.Types
+ Text.Mustache.Parser
+ Text.Mustache.Compile
+ Text.Mustache.Render
+ other-modules:
+ Text.Mustache.Internal
+ Text.Mustache.Internal.Types
+ Paths_mustache
hs-source-dirs:
src
- default-extensions: LambdaCase TupleSections
- other-extensions: NamedFieldPuns OverloadedStrings LambdaCase TupleSections
TemplateHaskell QuasiQuotes
+ default-extensions:
+ LambdaCase
+ TupleSections
+ other-extensions:
+ NamedFieldPuns
+ OverloadedStrings
+ LambdaCase
+ TupleSections
+ TemplateHaskell
+ QuasiQuotes
ghc-options: -Wall
build-depends:
aeson
@@ -48,7 +65,6 @@
, bytestring
, containers
, directory
- , either
, filepath
, mtl >=2.2.1
, parsec
@@ -58,16 +74,6 @@
, th-lift
, unordered-containers
, vector
- exposed-modules:
- Text.Mustache
- Text.Mustache.Types
- Text.Mustache.Parser
- Text.Mustache.Compile
- Text.Mustache.Render
- other-modules:
- Text.Mustache.Internal
- Text.Mustache.Internal.Types
- Paths_mustache
default-language: Haskell2010
executable haskell-mustache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mustache-2.3.1/src/Text/Mustache/Internal/Types.hs
new/mustache-2.4.0/src/Text/Mustache/Internal/Types.hs
--- old/mustache-2.3.1/src/Text/Mustache/Internal/Types.hs 2019-12-17
12:57:11.000000000 +0100
+++ new/mustache-2.4.0/src/Text/Mustache/Internal/Types.hs 2022-01-30
20:26:33.000000000 +0100
@@ -12,6 +12,10 @@
import Control.Arrow
import Control.Monad.RWS hiding (lift)
import qualified Data.Aeson as Aeson
+#if MIN_VERSION_aeson(2,0,0)
+import qualified Data.Aeson.KeyMap as KM
+#endif
+import Data.Int (Int8, Int16, Int32, Int64)
import Data.Foldable (toList)
import qualified Data.HashMap.Strict as HM
import qualified Data.HashSet as HS
@@ -22,7 +26,10 @@
import Data.Text
import qualified Data.Text.Lazy as LT
import qualified Data.Vector as V
-import Language.Haskell.TH.Lift (Lift (lift), deriveLift)
+import Data.Word (Word8, Word16, Word32, Word64)
+import Language.Haskell.TH.Lift (deriveLift)
+import Language.Haskell.TH.Syntax
+import Numeric.Natural (Natural)
-- | Type of errors we may encounter during substitution.
@@ -143,6 +150,8 @@
listToMustache' :: ToMustache ?? => [??] -> Value
listToMustache' = Array . V.fromList . fmap toMustache
+integralToMustache :: Integral ?? => ?? -> Value
+integralToMustache = toMustache . toInteger
-- | Conversion class
class ToMustache ?? where
@@ -159,8 +168,38 @@
instance ToMustache Integer where
toMustache = Number . fromInteger
+instance ToMustache Natural where
+ toMustache = integralToMustache
+
instance ToMustache Int where
- toMustache = toMustache . toInteger
+ toMustache = integralToMustache
+
+instance ToMustache Word where
+ toMustache = integralToMustache
+
+instance ToMustache Int8 where
+ toMustache = integralToMustache
+
+instance ToMustache Int16 where
+ toMustache = integralToMustache
+
+instance ToMustache Int32 where
+ toMustache = integralToMustache
+
+instance ToMustache Int64 where
+ toMustache = integralToMustache
+
+instance ToMustache Word8 where
+ toMustache = integralToMustache
+
+instance ToMustache Word16 where
+ toMustache = integralToMustache
+
+instance ToMustache Word32 where
+ toMustache = integralToMustache
+
+instance ToMustache Word64 where
+ toMustache = integralToMustache
instance ToMustache Char where
toMustache = toMustache . (:[])
@@ -233,7 +272,12 @@
toMustache = Lambda
instance ToMustache Aeson.Value where
- toMustache (Aeson.Object o) = Object $ fmap toMustache o
+ toMustache (Aeson.Object o) = Object $ fmap toMustache
+#if MIN_VERSION_aeson(2,0,0)
+ (KM.toHashMapText o)
+#else
+ o
+#endif
toMustache (Aeson.Array a) = Array $ fmap toMustache a
toMustache (Aeson.Number n) = Number n
toMustache (Aeson.String s) = String s
@@ -345,8 +389,17 @@
, partials :: TemplateCache
} deriving (Show)
+
+deriveLift ''DataIdentifier
+deriveLift ''Node
+deriveLift ''Template
+
instance Lift TemplateCache where
+#if MIN_VERSION_template_haskell(2,16,0)
+ liftTyped m = [|| HM.fromList $$(liftTyped $ HM.toList m) ||]
+#else
lift m = [| HM.fromList $(lift $ HM.toList m) |]
+#endif
--Data.Text 1.2.4.0 introduces its own Lift Text instance
#if !MIN_VERSION_text(1,2,4)
@@ -354,7 +407,3 @@
lift = lift . unpack
#endif
-deriveLift ''DataIdentifier
-deriveLift ''Node
-deriveLift ''Template
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mustache-2.3.1/src/Text/Mustache/Types.hs
new/mustache-2.4.0/src/Text/Mustache/Types.hs
--- old/mustache-2.3.1/src/Text/Mustache/Types.hs 2017-11-08
12:54:18.000000000 +0100
+++ new/mustache-2.4.0/src/Text/Mustache/Types.hs 2021-11-23
15:31:36.000000000 +0100
@@ -22,7 +22,7 @@
-- ** Converting
, object
, (~>), (???), (~=), (???)
- , ToMustache, toMustache, mFromJSON
+ , ToMustache, toMustache, mFromJSON, integralToMustache
-- ** Representation
, Array, Object, Pair
, SubM, askContext, askPartials
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mustache-2.3.1/src/Text/Mustache.hs
new/mustache-2.4.0/src/Text/Mustache.hs
--- old/mustache-2.3.1/src/Text/Mustache.hs 2017-11-08 12:54:18.000000000
+0100
+++ new/mustache-2.4.0/src/Text/Mustache.hs 2021-11-23 15:31:36.000000000
+0100
@@ -176,7 +176,7 @@
, substituteNode, substituteAST, catchSubstitute
-- * Data Conversion
- , ToMustache, toMustache, object, (~>), (~=)
+ , ToMustache, toMustache, integralToMustache, object, (~>), (~=)
-- ** Utilities for lambdas
