Hello community,
here is the log from the commit of package ghc-blaze-markup for
openSUSE:Factory checked in at 2018-05-30 12:02:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-blaze-markup (Old)
and /work/SRC/openSUSE:Factory/.ghc-blaze-markup.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-blaze-markup"
Wed May 30 12:02:42 2018 rev:11 rq:607758 version:0.8.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-blaze-markup/ghc-blaze-markup.changes
2017-09-15 21:23:39.847353355 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-blaze-markup.new/ghc-blaze-markup.changes
2018-05-30 12:24:00.716809072 +0200
@@ -1,0 +2,8 @@
+Mon May 14 17:02:11 UTC 2018 - psim...@suse.com
+
+- Update blaze-markup to version 0.8.2.1.
+ * Define `ToMarkup` instance for `Natural`.
+ * Compatibility with Semigroup/Monoid proposal
+ * Switch to `tasty` for running tests
+
+-------------------------------------------------------------------
Old:
----
blaze-markup-0.8.0.0.tar.gz
New:
----
blaze-markup-0.8.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-blaze-markup.spec ++++++
--- /var/tmp/diff_new_pack.5DkTRP/_old 2018-05-30 12:24:01.308790629 +0200
+++ /var/tmp/diff_new_pack.5DkTRP/_new 2018-05-30 12:24:01.312790505 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-blaze-markup
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name blaze-markup
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.8.0.0
+Version: 0.8.2.1
Release: 0
Summary: A blazingly fast markup combinator library for Haskell
License: BSD-3-Clause
@@ -35,9 +35,9 @@
BuildRequires: ghc-HUnit-devel
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-containers-devel
-BuildRequires: ghc-test-framework-devel
-BuildRequires: ghc-test-framework-hunit-devel
-BuildRequires: ghc-test-framework-quickcheck2-devel
+BuildRequires: ghc-tasty-devel
+BuildRequires: ghc-tasty-hunit-devel
+BuildRequires: ghc-tasty-quickcheck-devel
%endif
%description
@@ -75,7 +75,7 @@
%ghc_pkg_recache
%files -f %{name}.files
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
%doc CHANGELOG
++++++ blaze-markup-0.8.0.0.tar.gz -> blaze-markup-0.8.2.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blaze-markup-0.8.0.0/CHANGELOG
new/blaze-markup-0.8.2.1/CHANGELOG
--- old/blaze-markup-0.8.0.0/CHANGELOG 2017-01-30 17:48:00.000000000 +0100
+++ new/blaze-markup-0.8.2.1/CHANGELOG 2018-04-09 15:46:43.000000000 +0200
@@ -1,5 +1,18 @@
# Changelog
+- 0.8.2.1 (2018-04-09)
+ * Bump `QuickCheck` dependency to allow 2.11
+ * Bump `tasty` dependency to allow 1.0
+ * Bump `tasty-hunit` dependency to allow 0.10
+ * Bump `tasty-quickcheck` dependency to allow 0.10
+
+- 0.8.2.0 (2018-01-09)
+ * Define `ToMarkup` instance for `Natural`.
+
+- 0.8.1.0 (2017-09-16)
+ * Compatibility with Semigroup/Monoid proposal
+ * Switch to `tasty` for running tests
+
- 0.8.0.0 (2017-01-30)
* Make `MarkupM` finally adhere to the Monad laws
* Stricten the `IsString` instance to only work with `MarkupM ()` and not
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blaze-markup-0.8.0.0/blaze-markup.cabal
new/blaze-markup-0.8.2.1/blaze-markup.cabal
--- old/blaze-markup-0.8.0.0/blaze-markup.cabal 2017-01-30 17:48:00.000000000
+0100
+++ new/blaze-markup-0.8.2.1/blaze-markup.cabal 2018-04-09 15:46:43.000000000
+0200
@@ -1,5 +1,5 @@
Name: blaze-markup
-Version: 0.8.0.0
+Version: 0.8.2.1
Homepage: http://jaspervdj.be/blaze
Bug-Reports: http://github.com/jaspervdj/blaze-markup/issues
License: BSD3
@@ -17,6 +17,8 @@
Build-type: Simple
Cabal-version: >= 1.8
+Tested-with: GHC == 7.8.4, GHC == 7.10.3,
+ GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1
Extra-source-files:
CHANGELOG
@@ -34,7 +36,7 @@
Text.Blaze.Renderer.Utf8
Build-depends:
- base >= 4 && < 5,
+ base >= 4 && < 4.12,
blaze-builder >= 0.3 && < 0.5,
text >= 0.10 && < 1.3,
bytestring >= 0.9 && < 0.11
@@ -46,18 +48,24 @@
Ghc-options: -Wall
Other-modules:
+ Text.Blaze
+ Text.Blaze.Internal
+ Text.Blaze.Renderer.Pretty
+ Text.Blaze.Renderer.String
+ Text.Blaze.Renderer.Text
+ Text.Blaze.Renderer.Utf8
Text.Blaze.Tests
Text.Blaze.Tests.Util
Build-depends:
- HUnit >= 1.2 && < 1.6,
- QuickCheck >= 2.4 && < 2.10,
- containers >= 0.3 && < 0.6,
- test-framework >= 0.4 && < 0.9,
- test-framework-hunit >= 0.3 && < 0.4,
- test-framework-quickcheck2 >= 0.3 && < 0.4,
+ HUnit >= 1.2 && < 1.7,
+ QuickCheck >= 2.7 && < 2.12,
+ containers >= 0.3 && < 0.6,
+ tasty >= 1.0 && < 1.1,
+ tasty-hunit >= 0.10 && < 0.11,
+ tasty-quickcheck >= 0.10 && < 0.11,
-- Copied from regular dependencies...
- base >= 4 && < 5,
+ base >= 4 && < 4.12,
blaze-builder >= 0.3 && < 0.5,
text >= 0.10 && < 1.3,
bytestring >= 0.9 && < 0.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blaze-markup-0.8.0.0/src/Text/Blaze/Internal.hs
new/blaze-markup-0.8.2.1/src/Text/Blaze/Internal.hs
--- old/blaze-markup-0.8.0.0/src/Text/Blaze/Internal.hs 2017-01-30
17:48:00.000000000 +0100
+++ new/blaze-markup-0.8.2.1/src/Text/Blaze/Internal.hs 2018-04-09
15:46:43.000000000 +0200
@@ -96,7 +96,7 @@
import GHC.Exts (IsString (..))
#if MIN_VERSION_base(4,9,0)
-import Data.Semigroup (Semigroup)
+import Data.Semigroup (Semigroup(..))
#endif
-- | A static string that supports efficient output to all possible backends.
@@ -134,11 +134,19 @@
-- | Empty string
| EmptyChoiceString
+#if MIN_VERSION_base(4,9,0)
+instance Semigroup ChoiceString where
+ (<>) = AppendChoiceString
+ {-# INLINE (<>) #-}
+#endif
+
instance Monoid ChoiceString where
mempty = EmptyChoiceString
{-# INLINE mempty #-}
+#if !(MIN_VERSION_base(4,11,0))
mappend = AppendChoiceString
{-# INLINE mappend #-}
+#endif
instance IsString ChoiceString where
fromString = String
@@ -178,13 +186,19 @@
instance Monoid a => Monoid (MarkupM a) where
mempty = Empty mempty
{-# INLINE mempty #-}
+#if !(MIN_VERSION_base(4,11,0))
mappend x y = Append x y
{-# INLINE mappend #-}
mconcat = foldr Append (Empty mempty)
{-# INLINE mconcat #-}
+#endif
#if MIN_VERSION_base(4,9,0)
instance Monoid a => Semigroup (MarkupM a) where
+ x <> y = Append x y
+ {-# INLINE (<>) #-}
+ sconcat = foldr Append (Empty mempty)
+ {-# INLINE sconcat #-}
#endif
instance Functor MarkupM where
@@ -242,14 +256,25 @@
--
newtype Attribute = Attribute (forall a. MarkupM a -> MarkupM a)
+#if MIN_VERSION_base(4,9,0)
+instance Semigroup Attribute where
+ Attribute f <> Attribute g = Attribute (g . f)
+#endif
+
instance Monoid Attribute where
mempty = Attribute id
+#if !(MIN_VERSION_base(4,11,0))
Attribute f `mappend` Attribute g = Attribute (g . f)
+#endif
-- | The type for the value part of an attribute.
--
newtype AttributeValue = AttributeValue { unAttributeValue :: ChoiceString }
- deriving (IsString, Monoid)
+ deriving (IsString, Monoid
+#if MIN_VERSION_base(4,9,0)
+ ,Semigroup
+#endif
+ )
-- | Create a custom parent element
customParent :: Tag -- ^ Element tag
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blaze-markup-0.8.0.0/src/Text/Blaze.hs
new/blaze-markup-0.8.2.1/src/Text/Blaze.hs
--- old/blaze-markup-0.8.0.0/src/Text/Blaze.hs 2017-01-30 17:48:00.000000000
+0100
+++ new/blaze-markup-0.8.2.1/src/Text/Blaze.hs 2018-04-09 15:46:43.000000000
+0200
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeSynonymInstances #-}
@@ -87,12 +88,15 @@
, contents
) where
-import Data.Int (Int32, Int64)
-import Data.Monoid (mconcat)
-import Data.Word (Word, Word32, Word64)
+import Data.Int (Int32, Int64)
+import Data.Monoid (mconcat)
+import Data.Word (Word, Word32, Word64)
+#if MIN_VERSION_base(4,8,0)
+import Numeric.Natural (Natural)
+#endif
-import Data.Text (Text)
-import qualified Data.Text.Lazy as LT
+import Data.Text (Text)
+import qualified Data.Text.Lazy as LT
import qualified Data.Text.Lazy.Builder as LTB
import Text.Blaze.Internal
@@ -154,6 +158,12 @@
toMarkup = string . show
{-# INLINE toMarkup #-}
+#if MIN_VERSION_base(4,8,0)
+instance ToMarkup Natural where
+ toMarkup = string . show
+ {-# INLINE toMarkup #-}
+#endif
+
instance ToMarkup Char where
toMarkup = string . return
{-# INLINE toMarkup #-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blaze-markup-0.8.0.0/tests/TestSuite.hs
new/blaze-markup-0.8.2.1/tests/TestSuite.hs
--- old/blaze-markup-0.8.0.0/tests/TestSuite.hs 2017-01-30 17:48:00.000000000
+0100
+++ new/blaze-markup-0.8.2.1/tests/TestSuite.hs 2018-04-09 15:46:43.000000000
+0200
@@ -2,11 +2,10 @@
--
module Main where
-import Test.Framework (defaultMain, testGroup)
+import qualified Test.Tasty as Tasty
import qualified Text.Blaze.Tests
main :: IO ()
-main = defaultMain
- [ testGroup "Text.Blaze.Tests" Text.Blaze.Tests.tests
- ]
+main = Tasty.defaultMain $
+ Tasty.testGroup "Text.Blaze.Tests" Text.Blaze.Tests.tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blaze-markup-0.8.0.0/tests/Text/Blaze/Tests/Util.hs
new/blaze-markup-0.8.2.1/tests/Text/Blaze/Tests/Util.hs
--- old/blaze-markup-0.8.0.0/tests/Text/Blaze/Tests/Util.hs 2017-01-30
17:48:00.000000000 +0100
+++ new/blaze-markup-0.8.2.1/tests/Text/Blaze/Tests/Util.hs 2018-04-09
15:46:43.000000000 +0200
@@ -5,8 +5,8 @@
( renderUsingString
, renderUsingText
, renderUsingUtf8
- , p, div, table, img, br, area
- , id, class_, name
+ , p, div, table, img, br, area
+ , id, class_, name
) where
import Prelude hiding (div, id)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blaze-markup-0.8.0.0/tests/Text/Blaze/Tests.hs
new/blaze-markup-0.8.2.1/tests/Text/Blaze/Tests.hs
--- old/blaze-markup-0.8.0.0/tests/Text/Blaze/Tests.hs 2017-01-30
17:48:00.000000000 +0100
+++ new/blaze-markup-0.8.2.1/tests/Text/Blaze/Tests.hs 2018-04-09
15:46:43.000000000 +0200
@@ -14,10 +14,10 @@
import qualified Data.List as List
import qualified Prelude as Prelude
-import Test.Framework (Test)
+import Test.Tasty (TestTree)
import Test.HUnit (Assertion, (@=?))
-import Test.Framework.Providers.HUnit (testCase)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
+import Test.Tasty.HUnit (testCase)
+import Test.Tasty.QuickCheck (testProperty)
import Test.QuickCheck
import qualified Data.ByteString as SB
import qualified Data.ByteString.Lazy as LB
@@ -27,7 +27,7 @@
import Text.Blaze.Internal
import Text.Blaze.Tests.Util
-tests :: [Test]
+tests :: [TestTree]
tests = [ testProperty "left identity Monoid law" monoidLeftIdentity
, testProperty "right identity Monoid law" monoidRightIdentity
, testProperty "associativity Monoid law" monoidAssociativity
