Hello community, here is the log from the commit of package ghc-binary-tagged for openSUSE:Factory checked in at 2016-04-22 16:24:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-binary-tagged (Old) and /work/SRC/openSUSE:Factory/.ghc-binary-tagged.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-binary-tagged" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-binary-tagged/ghc-binary-tagged.changes 2016-02-17 12:11:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-binary-tagged.new/ghc-binary-tagged.changes 2016-04-22 16:25:19.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 13 09:42:52 UTC 2016 - mimi.vx@gmail.com + +- update to 0.1.4.0 +- add remove_nats.patch +* Add semigroups types +* Add Naturals + +------------------------------------------------------------------- Old: ---- binary-tagged-0.1.3.1.tar.gz New: ---- binary-tagged-0.1.4.0.tar.gz remove_nats.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-binary-tagged.spec ++++++ --- /var/tmp/diff_new_pack.OBfZ0r/_old 2016-04-22 16:25:19.000000000 +0200 +++ /var/tmp/diff_new_pack.OBfZ0r/_new 2016-04-22 16:25:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-binary-tagged # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -20,7 +20,7 @@ %bcond_with tests Name: ghc-binary-tagged -Version: 0.1.3.1 +Version: 0.1.4.0 Release: 0 Summary: Tagged binary serialisation Group: System/Libraries @@ -28,6 +28,8 @@ 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 +# PATCH-FIX-OPENSUSE: remove_nats.patch -- mimi.vx@gmail.com +Patch0: remove_nats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ghc-Cabal-devel @@ -42,6 +44,7 @@ BuildRequires: ghc-generics-sop-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-scientific-devel +BuildRequires: ghc-semigroups-devel BuildRequires: ghc-tagged-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel @@ -74,7 +77,7 @@ %prep %setup -q -n %{pkg_name}-%{version} - +%patch0 -p1 %build %ghc_lib_build ++++++ binary-tagged-0.1.3.1.tar.gz -> binary-tagged-0.1.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binary-tagged-0.1.3.1/CHANGELOG.md new/binary-tagged-0.1.4.0/CHANGELOG.md --- old/binary-tagged-0.1.3.1/CHANGELOG.md 2016-02-10 06:48:26.000000000 +0100 +++ new/binary-tagged-0.1.4.0/CHANGELOG.md 2016-04-12 09:16:53.000000000 +0200 @@ -1,3 +1,6 @@ +- 0.1.4.0 (2016-04-12) + - Add semigroups types + - Add Natural - 0.1.3.1 (2016-02-10) - Support GHC 8.0 - 0.1.3.0 (2015-10-24) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binary-tagged-0.1.3.1/binary-tagged.cabal new/binary-tagged-0.1.4.0/binary-tagged.cabal --- old/binary-tagged-0.1.3.1/binary-tagged.cabal 2016-02-10 06:49:03.000000000 +0100 +++ new/binary-tagged-0.1.4.0/binary-tagged.cabal 2016-04-12 09:16:53.000000000 +0200 @@ -1,9 +1,9 @@ --- This file has been generated from package.yaml by hpack version 0.8.0. +-- This file has been generated from package.yaml by hpack version 0.11.2. -- -- see: https://github.com/sol/hpack name: binary-tagged -version: 0.1.3.1 +version: 0.1.4.0 synopsis: Tagged binary serialisation. description: Check <https://github.com/phadej/binary-tagged#readme README on Github> category: Web @@ -38,8 +38,10 @@ , containers >=0.5 && <0.6 , generics-sop >=0.1 && <0.3 , hashable >=1.2 && <1.3 + , nats >=1 && <1.2 , scientific >=0.3 && <0.4 , SHA >=1.6 && <1.7 + , semigroups >=0.16 && <0.19 , tagged >=0.7 && <0.9 , text >=1.2 && <1.3 , time >=1.4 && <1.7 @@ -64,8 +66,10 @@ , containers >=0.5 && <0.6 , generics-sop >=0.1 && <0.3 , hashable >=1.2 && <1.3 + , nats >=1 && <1.2 , scientific >=0.3 && <0.4 , SHA >=1.6 && <1.7 + , semigroups >=0.16 && <0.19 , tagged >=0.7 && <0.9 , text >=1.2 && <1.3 , time >=1.4 && <1.7 @@ -98,8 +102,10 @@ , containers >=0.5 && <0.6 , generics-sop >=0.1 && <0.3 , hashable >=1.2 && <1.3 + , nats >=1 && <1.2 , scientific >=0.3 && <0.4 , SHA >=1.6 && <1.7 + , semigroups >=0.16 && <0.19 , tagged >=0.7 && <0.9 , text >=1.2 && <1.3 , time >=1.4 && <1.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/binary-tagged-0.1.3.1/src/Data/Binary/Tagged.hs new/binary-tagged-0.1.4.0/src/Data/Binary/Tagged.hs --- old/binary-tagged-0.1.3.1/src/Data/Binary/Tagged.hs 2016-02-10 06:53:27.000000000 +0100 +++ new/binary-tagged-0.1.4.0/src/Data/Binary/Tagged.hs 2016-04-12 09:16:53.000000000 +0200 @@ -124,9 +124,11 @@ import qualified Data.HashSet as HS import qualified Data.IntMap as IntMap import qualified Data.IntSet as IntSet +import qualified Data.List.NonEmpty as NE import qualified Data.Map as Map import qualified Data.Monoid as Monoid import qualified Data.Ratio as Ratio +import qualified Data.Semigroup as Semigroup import qualified Data.Sequence as Seq import qualified Data.Set as Set import qualified Data.Text as S @@ -136,6 +138,7 @@ import qualified Data.Vector.Storable as S import qualified Data.Vector.Unboxed as U import qualified Data.Version as Version +import qualified Numeric.Natural as Natural #ifdef MIN_VERSION_aeson import qualified Data.Aeson as Aeson @@ -280,7 +283,9 @@ structuralInfoSha1ByteStringDigest :: StructuralInfo -> LBS.ByteString structuralInfoSha1ByteStringDigest = bytestringDigest . structuralInfoSha1Digest --- Generic derivation +------------------------------------------------------------------------------- +-- Generics +------------------------------------------------------------------------------- ghcStructuralInfo :: ( GHC.Generic a , All2 HasStructuralInfo (GCode a) @@ -344,7 +349,9 @@ sopStructuralInfo1S :: StructuralInfo -> DatatypeInfo xss -> StructuralInfo sopStructuralInfo1S nsop di = NominalNewtype (datatypeName di) nsop +------------------------------------------------------------------------------- -- SOP helpers +------------------------------------------------------------------------------- datatypeName :: DatatypeInfo xss -> DatatypeName datatypeName (Newtype _ d _) = d @@ -367,7 +374,9 @@ Div2 1 = 0 Div2 n = 1 + Div2 (n - 2) +------------------------------------------------------------------------------- -- Instances +------------------------------------------------------------------------------- instance HasStructuralInfo Bool where structuralInfo = ghcNominalType instance HasStructuralInfo Char where structuralInfo _ = NominalType "Char" @@ -419,12 +428,22 @@ -- | /Since binary-tagged-0.1.3.0/ instance HasSemanticVersion Double --- Recursive types +------------------------------------------------------------------------------- +-- Recursive types: List, NonEmpty +------------------------------------------------------------------------------- + instance HasStructuralInfo a => HasStructuralInfo [a] where structuralInfo = ghcStructuralInfo1 instance HasSemanticVersion a => HasSemanticVersion [a] where type SemanticVersion [a] = SemanticVersion a --- Types from base +instance HasStructuralInfo a => HasStructuralInfo (NE.NonEmpty a) where structuralInfo = ghcStructuralInfo1 +instance HasSemanticVersion a => HasSemanticVersion (NE.NonEmpty a) where + type SemanticVersion (NE.NonEmpty a) = SemanticVersion a + +------------------------------------------------------------------------------- +-- Basic types +------------------------------------------------------------------------------- + instance HasStructuralInfo a => HasStructuralInfo (Maybe a) instance HasSemanticVersion a => HasSemanticVersion (Maybe a) where type SemanticVersion (Maybe a) = SemanticVersion a @@ -438,7 +457,10 @@ instance (HasSemanticVersion a, HasSemanticVersion b, KnownNat (SemanticVersion (Either a b))) => HasSemanticVersion (Either a b) where type SemanticVersion (Either a b) = Interleave (SemanticVersion a) (SemanticVersion b) --- Tuples +------------------------------------------------------------------------------- +-- tuples +------------------------------------------------------------------------------- + instance (HasStructuralInfo a, HasStructuralInfo b) => HasStructuralInfo (a, b) instance (HasStructuralInfo a, HasStructuralInfo b, HasStructuralInfo c) => HasStructuralInfo (a, b, c) instance (HasStructuralInfo a, HasStructuralInfo b, HasStructuralInfo c, HasStructuralInfo d) => HasStructuralInfo (a, b, c, d) @@ -463,7 +485,9 @@ ,KnownNat (SemanticVersion (a, b, c, d))) => HasSemanticVersion (a, b, c, d) where type SemanticVersion (a, b, c, d) = Interleave (SemanticVersion a) (SemanticVersion (b, c, d)) +------------------------------------------------------------------------------- -- Unit +------------------------------------------------------------------------------- -- | /Since binary-tagged-0.1.3.0/ instance HasStructuralInfo () where structuralInfo _ = NominalType "()" @@ -471,7 +495,9 @@ -- | /Since binary-tagged-0.1.3.0/ instance HasSemanticVersion () --- Fixed +------------------------------------------------------------------------------- +-- Data.Fixed +------------------------------------------------------------------------------- -- | /Since binary-tagged-0.1.3.0/ instance HasStructuralInfo a => HasStructuralInfo (Fixed.Fixed a) where @@ -488,7 +514,9 @@ -- | /Since binary-tagged-0.1.3.0/ instance HasSemanticVersion (Fixed.Fixed a) --- Version +------------------------------------------------------------------------------- +-- Data.Version +------------------------------------------------------------------------------- -- | /Since binary-tagged-0.1.3.0/ instance HasStructuralInfo Version.Version where @@ -500,7 +528,10 @@ -- | /Since binary-tagged-0.1.3.0/ instance HasSemanticVersion Version.Version --- Monoid +------------------------------------------------------------------------------- +-- Data.Monoid +------------------------------------------------------------------------------- + instance HasStructuralInfo a => HasStructuralInfo (Monoid.Sum a) instance HasSemanticVersion a => HasSemanticVersion (Monoid.Sum a) where type SemanticVersion (Monoid.Sum a) = SemanticVersion a @@ -509,23 +540,107 @@ instance HasSemanticVersion a => HasSemanticVersion (Monoid.Product a) where type SemanticVersion (Monoid.Product a) = SemanticVersion a --- TODO: add more +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo a => HasStructuralInfo (Monoid.Dual a) +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion a => HasSemanticVersion (Monoid.Dual a) where + type SemanticVersion (Monoid.Dual a) = SemanticVersion a + +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo a => HasStructuralInfo (Monoid.First a) +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion a => HasSemanticVersion (Monoid.First a) where + type SemanticVersion (Monoid.First a) = SemanticVersion a + +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo a => HasStructuralInfo (Monoid.Last a) +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion a => HasSemanticVersion (Monoid.Last a) where + type SemanticVersion (Monoid.Last a) = SemanticVersion a + +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo Monoid.All +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion Monoid.All + +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo Monoid.Any +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion Monoid.Any + +------------------------------------------------------------------------------- +-- semigroups +------------------------------------------------------------------------------- + +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo a => HasStructuralInfo (Semigroup.Min a) +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion a => HasSemanticVersion (Semigroup.Min a) where + type SemanticVersion (Semigroup.Min a) = SemanticVersion a + +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo a => HasStructuralInfo (Semigroup.Max a) +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion a => HasSemanticVersion (Semigroup.Max a) where + type SemanticVersion (Semigroup.Max a) = SemanticVersion a + +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo a => HasStructuralInfo (Semigroup.First a) +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion a => HasSemanticVersion (Semigroup.First a) where + type SemanticVersion (Semigroup.First a) = SemanticVersion a + +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo a => HasStructuralInfo (Semigroup.Last a) +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion a => HasSemanticVersion (Semigroup.Last a) where + type SemanticVersion (Semigroup.Last a) = SemanticVersion a + +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo a => HasStructuralInfo (Semigroup.WrappedMonoid a) +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion a => HasSemanticVersion (Semigroup.WrappedMonoid a) where + type SemanticVersion (Semigroup.WrappedMonoid a) = SemanticVersion a + +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo a => HasStructuralInfo (Semigroup.Option a) +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion a => HasSemanticVersion (Semigroup.Option a) where + type SemanticVersion (Semigroup.Option a) = SemanticVersion a + +------------------------------------------------------------------------------- +-- bytestring +------------------------------------------------------------------------------- --- ByteString instance HasStructuralInfo BS.ByteString where structuralInfo _ = NominalType "ByteString.Strict" instance HasStructuralInfo LBS.ByteString where structuralInfo _ = NominalType "ByteString.Lazy" instance HasSemanticVersion BS.ByteString instance HasSemanticVersion LBS.ByteString --- Text +------------------------------------------------------------------------------- +-- nats +------------------------------------------------------------------------------- + +-- | /Since binary-tagged-0.1.4.0/ +instance HasStructuralInfo Natural.Natural where structuralInfo _ = NominalType "Numeric.Natural" +-- | /Since binary-tagged-0.1.4.0/ +instance HasSemanticVersion Natural.Natural + +------------------------------------------------------------------------------- +-- text +------------------------------------------------------------------------------- + instance HasStructuralInfo S.Text where structuralInfo _ = NominalType "Text.Strict" instance HasStructuralInfo L.Text where structuralInfo _ = NominalType "Text.Lazy" instance HasSemanticVersion S.Text instance HasSemanticVersion L.Text --- Containers +------------------------------------------------------------------------------- +-- containers +------------------------------------------------------------------------------- + instance HasStructuralInfo a => HasStructuralInfo (IntMap.IntMap a) where structuralInfo _ = NominalNewtype "IntMap" $ structuralInfo (Proxy :: Proxy a) instance HasSemanticVersion a => HasSemanticVersion (IntMap.IntMap a) where @@ -550,7 +665,9 @@ instance HasSemanticVersion a => HasSemanticVersion (Set.Set a) where type SemanticVersion (Set.Set a) = SemanticVersion a --- Unordered containers +------------------------------------------------------------------------------- +-- unordered-containers +------------------------------------------------------------------------------- instance (HasStructuralInfo k, HasStructuralInfo v) => HasStructuralInfo (HML.HashMap k v) where structuralInfo _ = StructuralInfo "HashMap" [[ structuralInfo (Proxy :: Proxy k), structuralInfo (Proxy :: Proxy v) ]] @@ -562,7 +679,10 @@ instance HasSemanticVersion a => HasSemanticVersion (HS.HashSet a) where type SemanticVersion (HS.HashSet a) = SemanticVersion a --- Array +------------------------------------------------------------------------------- +-- array +------------------------------------------------------------------------------- + instance (HasStructuralInfo i, HasStructuralInfo e) => HasStructuralInfo (Array.Array i e) where structuralInfo _ = StructuralInfo "Array" [[ structuralInfo (Proxy :: Proxy i), structuralInfo (Proxy :: Proxy e) ]] instance (HasSemanticVersion i, HasSemanticVersion e, KnownNat (SemanticVersion (Array.Array i e))) => HasSemanticVersion (Array.Array i e) where @@ -573,7 +693,9 @@ instance (HasSemanticVersion i, HasSemanticVersion e, KnownNat (SemanticVersion (Array.UArray i e))) => HasSemanticVersion (Array.UArray i e) where type SemanticVersion (Array.UArray i e) = Interleave (SemanticVersion i) (SemanticVersion e) --- Vector +------------------------------------------------------------------------------- +-- vector +------------------------------------------------------------------------------- instance HasStructuralInfo a => HasStructuralInfo (V.Vector a) where structuralInfo _ = NominalNewtype "Vector" $ structuralInfo (Proxy :: Proxy a) @@ -590,7 +712,9 @@ instance HasSemanticVersion a => HasSemanticVersion (S.Vector a) where type SemanticVersion (S.Vector a) = SemanticVersion a --- Time +------------------------------------------------------------------------------- +-- time +------------------------------------------------------------------------------- instance HasStructuralInfo Time.UTCTime where structuralInfo _ = NominalType "UTCTime" instance HasStructuralInfo Time.DiffTime where structuralInfo _ = NominalType "DiffTime" @@ -610,8 +734,11 @@ instance HasSemanticVersion Time.TimeOfDay instance HasSemanticVersion Time.LocalTime +------------------------------------------------------------------------------- +-- aeson +------------------------------------------------------------------------------- + #ifdef MIN_VERSION_aeson --- Value -- TODO: derive sop instance HasStructuralInfo Aeson.Value where structuralInfo _ = NominalType "Aeson.Value" ++++++ remove_nats.patch ++++++ Index: binary-tagged-0.1.4.0/binary-tagged.cabal =================================================================== --- binary-tagged-0.1.4.0.orig/binary-tagged.cabal +++ binary-tagged-0.1.4.0/binary-tagged.cabal @@ -38,7 +38,6 @@ library , containers >=0.5 && <0.6 , generics-sop >=0.1 && <0.3 , hashable >=1.2 && <1.3 - , nats >=1 && <1.2 , scientific >=0.3 && <0.4 , SHA >=1.6 && <1.7 , semigroups >=0.16 && <0.19 @@ -66,7 +65,6 @@ test-suite binary-tagged-test , containers >=0.5 && <0.6 , generics-sop >=0.1 && <0.3 , hashable >=1.2 && <1.3 - , nats >=1 && <1.2 , scientific >=0.3 && <0.4 , SHA >=1.6 && <1.7 , semigroups >=0.16 && <0.19 @@ -102,7 +100,6 @@ benchmark binary-tagged-bench , containers >=0.5 && <0.6 , generics-sop >=0.1 && <0.3 , hashable >=1.2 && <1.3 - , nats >=1 && <1.2 , scientific >=0.3 && <0.4 , SHA >=1.6 && <1.7 , semigroups >=0.16 && <0.19