Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-invariant for openSUSE:Factory checked in at 2021-11-11 21:36:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-invariant (Old) and /work/SRC/openSUSE:Factory/.ghc-invariant.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-invariant" Thu Nov 11 21:36:37 2021 rev:12 rq:930338 version:0.5.5 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-invariant/ghc-invariant.changes 2020-12-22 11:41:34.313625487 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-invariant.new.1890/ghc-invariant.changes 2021-11-11 21:36:53.508909210 +0100 @@ -1,0 +2,8 @@ +Mon Nov 1 12:27:07 UTC 2021 - [email protected] + +- Update invariant to version 0.5.5. + # 0.5.5 [2021.11.01] + * Allow building with GHC 9.2. + * Allow building with `transformers-0.6.*`. + +------------------------------------------------------------------- Old: ---- invariant-0.5.4.tar.gz New: ---- invariant-0.5.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-invariant.spec ++++++ --- /var/tmp/diff_new_pack.bEJkV7/_old 2021-11-11 21:36:54.008909575 +0100 +++ /var/tmp/diff_new_pack.bEJkV7/_new 2021-11-11 21:36:54.008909575 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-invariant # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # 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 invariant %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.5.4 +Version: 0.5.5 Release: 0 Summary: Haskell98 invariant functors License: BSD-2-Clause ++++++ invariant-0.5.4.tar.gz -> invariant-0.5.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/invariant-0.5.4/CHANGELOG.md new/invariant-0.5.5/CHANGELOG.md --- old/invariant-0.5.4/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/invariant-0.5.5/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,7 @@ +# 0.5.5 [2021.11.01] +* Allow building with GHC 9.2. +* Allow building with `transformers-0.6.*`. + # 0.5.4 [2020.10.01] * Fix a bug in which `deriveInvariant2` would fail on certain data types with three or parameters if the first two parameters had phantom roles. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/invariant-0.5.4/README.md new/invariant-0.5.5/README.md --- old/invariant-0.5.4/README.md 2001-09-09 03:46:40.000000000 +0200 +++ new/invariant-0.5.5/README.md 2001-09-09 03:46:40.000000000 +0200 @@ -3,7 +3,7 @@ [](http://packdeps.haskellers.com/reverse/invariant) [][Haskell.org] [][tl;dr Legal: BSD3] -[](https://travis-ci.org/nfrisby/invariant-functors) +[](https://github.com/nfrisby/invariant-functors/actions?query=workflow%3AHaskell-CI) [Hackage: invariant]: http://hackage.haskell.org/package/invariant diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/invariant-0.5.4/invariant.cabal new/invariant-0.5.5/invariant.cabal --- old/invariant-0.5.4/invariant.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/invariant-0.5.5/invariant.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ name: invariant -version: 0.5.4 +version: 0.5.5 synopsis: Haskell98 invariant functors description: Haskell98 invariant functors (also known as exponential functors). . @@ -26,8 +26,10 @@ , GHC == 8.2.2 , GHC == 8.4.4 , GHC == 8.6.5 - , GHC == 8.8.3 - , GHC == 8.10.1 + , GHC == 8.8.4 + , GHC == 8.10.7 + , GHC == 9.0.1 + , GHC == 9.2.1 extra-source-files: CHANGELOG.md, README.md source-repository head @@ -52,9 +54,9 @@ , StateVar >= 1.1 && < 2 , stm >= 2.2 && < 3 , tagged >= 0.7.3 && < 1 - , template-haskell >= 2.4 && < 2.18 + , template-haskell >= 2.4 && < 2.19 , th-abstraction >= 0.4 && < 0.5 - , transformers >= 0.2 && < 0.6 + , transformers >= 0.2 && < 0.7 , transformers-compat >= 0.3 && < 1 , unordered-containers >= 0.2.4 && < 0.3 ghc-options: -Wall @@ -73,7 +75,7 @@ , hspec >= 1.8 , invariant , QuickCheck >= 2.11 && < 3 - , template-haskell >= 2.4 && < 2.18 + , template-haskell >= 2.4 && < 2.19 build-tool-depends: hspec-discover:hspec-discover ghc-options: -Wall if impl(ghc >= 8.6) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/invariant-0.5.4/src/Data/Functor/Invariant/TH/Internal.hs new/invariant-0.5.5/src/Data/Functor/Invariant/TH/Internal.hs --- old/invariant-0.5.4/src/Data/Functor/Invariant/TH/Internal.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/invariant-0.5.5/src/Data/Functor/Invariant/TH/Internal.hs 2001-09-09 03:46:40.000000000 +0200 @@ -13,7 +13,7 @@ import Data.Foldable (foldr') import Data.Functor.Invariant () -- To import the instances -import Data.List +import qualified Data.List as List import qualified Data.Map as Map (singleton) import Data.Map (Map) import Data.Maybe (fromMaybe, mapMaybe) @@ -324,7 +324,7 @@ -- | Construct a type via curried application. applyTy :: Type -> [Type] -> Type -applyTy = foldl' AppT +applyTy = List.foldl' AppT -- | Fully applies a type constructor to its type variables. applyTyCon :: Name -> [Type] -> Type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/invariant-0.5.4/src/Data/Functor/Invariant/TH.hs new/invariant-0.5.5/src/Data/Functor/Invariant/TH.hs --- old/invariant-0.5.4/src/Data/Functor/Invariant/TH.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/invariant-0.5.5/src/Data/Functor/Invariant/TH.hs 2001-09-09 03:46:40.000000000 +0200 @@ -36,7 +36,7 @@ import Control.Monad (unless, when) import Data.Functor.Invariant.TH.Internal -import Data.List +import qualified Data.List as List import qualified Data.Map as Map ((!), fromList, keys, lookup, member, size) import Data.Maybe @@ -325,7 +325,7 @@ let mapFuns = zip covMaps contraMaps lastTyVars = map varTToName $ drop (length instTys - numNbs) instTys tvMap = Map.fromList $ zip lastTyVars mapFuns - argNames = concat (transpose [covMaps, contraMaps]) ++ [value] + argNames = concat (List.transpose [covMaps, contraMaps]) ++ [value] lamE (map varP argNames) . appsE $ [ varE $ invmapConstName iClass @@ -507,7 +507,7 @@ -- instance C (Fam [Char]) remainingTysOrigSubst :: [Type] remainingTysOrigSubst = - map (substNamesWithKindStar (union droppedKindVarNames kvNames')) + map (substNamesWithKindStar (List.union droppedKindVarNames kvNames')) $ take remainingLength varTysOrig isDataFamily :: Bool @@ -866,7 +866,11 @@ -> Q Match mkSimpleConMatch fold conName insides = do varsNeeded <- newNameList "_arg" $ length insides - let pat = ConP conName (map VarP varsNeeded) + let pat = ConP conName +#if MIN_VERSION_template_haskell(2,18,0) + [] +#endif + (map VarP varsNeeded) rhs <- fold conName (zipWith (\i v -> i $ VarE v) insides varsNeeded) return $ Match pat (NormalB rhs) [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/invariant-0.5.4/src/Data/Functor/Invariant.hs new/invariant-0.5.5/src/Data/Functor/Invariant.hs --- old/invariant-0.5.4/src/Data/Functor/Invariant.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/invariant-0.5.5/src/Data/Functor/Invariant.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,8 @@ {-# LANGUAGE CPP #-} + +#if !(MIN_VERSION_base(4,16,0)) || !(MIN_VERSION_transformers(0,6,0)) {-# OPTIONS_GHC -fno-warn-deprecations #-} +#endif #define GHC_GENERICS_OK __GLASGOW_HASKELL__ >= 702 @@ -75,7 +78,10 @@ #endif import Data.Monoid (Dual(..), Endo(..)) import Data.Proxy (Proxy(..)) -import qualified Data.Semigroup as Semigroup (First(..), Last(..), Option(..)) +import qualified Data.Semigroup as Semigroup (First(..), Last(..)) +#if !(MIN_VERSION_base(4,16,0)) +import qualified Data.Semigroup as Semigroup (Option(..)) +#endif import Data.Semigroup (Min(..), Max(..), Arg(..)) import qualified Data.Traversable as T (Traversable(..)) #if GHC_GENERICS_OK @@ -143,10 +149,8 @@ import Control.Applicative.Backwards (Backwards(..)) import Control.Applicative.Lift (Lift(..)) import Control.Monad.Trans.Cont (ContT) -import Control.Monad.Trans.Error (ErrorT(..)) import Control.Monad.Trans.Except (ExceptT(..), runExceptT) import Control.Monad.Trans.Identity (IdentityT, mapIdentityT) -import Control.Monad.Trans.List (ListT, mapListT) import Control.Monad.Trans.Maybe (MaybeT, mapMaybeT) import qualified Control.Monad.Trans.RWS.Lazy as Lazy (RWST(..)) import qualified Control.Monad.Trans.RWS.Strict as Strict (RWST(..)) @@ -155,6 +159,10 @@ import qualified Control.Monad.Trans.State.Strict as Strict (StateT(..)) import qualified Control.Monad.Trans.Writer.Lazy as Lazy (WriterT, mapWriterT) import qualified Control.Monad.Trans.Writer.Strict as Strict (WriterT, mapWriterT) +#if !(MIN_VERSION_transformers(0,6,0)) +import Control.Monad.Trans.Error (ErrorT(..)) +import Control.Monad.Trans.List (ListT, mapListT) +#endif import Data.Functor.Constant (Constant(..)) import Data.Functor.Reverse (Reverse(..)) @@ -303,11 +311,13 @@ instance Invariant Semigroup.Last where invmap = invmapFunctor -- | from "Data.Semigroup" -instance Invariant Semigroup.Option where +instance Invariant (Arg a) where invmap = invmapFunctor +#if !(MIN_VERSION_base(4,16,0)) -- | from "Data.Semigroup" -instance Invariant (Arg a) where +instance Invariant Semigroup.Option where invmap = invmapFunctor +#endif -- | from "System.Console.GetOpt" instance Invariant ArgDescr where @@ -472,9 +482,6 @@ -- | from the @transformers@ package instance Invariant (ContT r m) where invmap = invmapFunctor --- -- | from the @transformers@ package -instance Invariant m => Invariant (ErrorT e m) where - invmap f g = ErrorT . invmap (invmap f g) (invmap g f) . runErrorT -- | from the @transformers@ package instance Invariant m => Invariant (ExceptT e m) where invmap f g = ExceptT . invmap (invmap f g) (invmap g f) . runExceptT @@ -482,9 +489,6 @@ instance Invariant m => Invariant (IdentityT m) where invmap f g = mapIdentityT (invmap f g) -- | from the @transformers@ package -instance Invariant m => Invariant (ListT m) where - invmap f g = mapListT $ invmap (invmap f g) (invmap g f) --- | from the @transformers@ package instance Invariant m => Invariant (MaybeT m) where invmap f g = mapMaybeT $ invmap (invmap f g) (invmap g f) -- | from the @transformers@ package @@ -530,6 +534,14 @@ -- | from the @transformers@ package instance Invariant f => Invariant (Reverse f) where invmap f g (Reverse a) = Reverse (invmap f g a) +#if !(MIN_VERSION_transformers(0,6,0)) +-- | from the @transformers@ package +instance Invariant m => Invariant (ErrorT e m) where + invmap f g = ErrorT . invmap (invmap f g) (invmap g f) . runErrorT +-- | from the @transformers@ package +instance Invariant m => Invariant (ListT m) where + invmap f g = mapListT $ invmap (invmap f g) (invmap g f) +#endif -- | from the @unordered-containers@ package instance Invariant (HashMap k) where @@ -563,9 +575,11 @@ many = WrapFunctor . many . unwrapFunctor instance Monad m => Monad (WrappedFunctor m) where - return = WrapFunctor . return WrapFunctor x >>= f = WrapFunctor (x >>= unwrapFunctor . f) +#if !(MIN_VERSION_base(4,11,0)) + return = WrapFunctor . return WrapFunctor a >> WrapFunctor b = WrapFunctor (a >> b) +#endif instance MonadPlus m => MonadPlus (WrappedFunctor m) where mzero = WrapFunctor mzero diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/invariant-0.5.4/test/THSpec.hs new/invariant-0.5.5/test/THSpec.hs --- old/invariant-0.5.4/test/THSpec.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/invariant-0.5.5/test/THSpec.hs 2001-09-09 03:46:40.000000000 +0200 @@ -226,12 +226,12 @@ -- | Verifies that @invmap id id = id@ (the other 'invmap' law follows -- as a free theorem: -- https://www.fpcomplete.com/user/edwardk/snippets/fmap). -prop_invmapLaws :: (Eq (f a), Invariant f) => f a -> Bool -prop_invmapLaws x = invmap id id x == x +prop_invmapLaws :: (Eq (f a), Show (f a), Invariant f) => f a -> Expectation +prop_invmapLaws x = invmap id id x `shouldBe` x -- | Verifies that @invmap2 id id id id = id@. -prop_invmap2Laws :: (Eq (f a b), Invariant2 f) => f a b -> Bool -prop_invmap2Laws x = invmap2 id id id id x == x +prop_invmap2Laws :: (Eq (f a b), Show (f a b), Invariant2 f) => f a b -> Expectation +prop_invmap2Laws x = invmap2 id id id id x `shouldBe` x ------------------------------------------------------------------------------- @@ -241,10 +241,10 @@ spec :: Spec spec = do describe "Compose Maybe Either Int Int" $ do - prop "satisfies the invmap laws" (prop_invmapLaws :: Compose Maybe Either Int Int -> Bool) - prop "satisfies the invmap2 laws" (prop_invmap2Laws :: Compose Maybe Either Int Int -> Bool) + prop "satisfies the invmap laws" (prop_invmapLaws :: Compose Maybe Either Int Int -> Expectation) + prop "satisfies the invmap2 laws" (prop_invmap2Laws :: Compose Maybe Either Int Int -> Expectation) #if MIN_VERSION_template_haskell(2,7,0) describe "ComposeFam Maybe Either Int Int" $ do - prop "satisfies the invmap laws" (prop_invmapLaws :: ComposeFam Maybe Either Int Int -> Bool) - prop "satisfies the invmap2 laws" (prop_invmap2Laws :: ComposeFam Maybe Either Int Int -> Bool) + prop "satisfies the invmap laws" (prop_invmapLaws :: ComposeFam Maybe Either Int Int -> Expectation) + prop "satisfies the invmap2 laws" (prop_invmap2Laws :: ComposeFam Maybe Either Int Int -> Expectation) #endif
