Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-mmorph for openSUSE:Factory checked in at 2021-02-16 22:38:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-mmorph (Old) and /work/SRC/openSUSE:Factory/.ghc-mmorph.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-mmorph" Tue Feb 16 22:38:45 2021 rev:4 rq:870872 version:1.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-mmorph/ghc-mmorph.changes 2020-12-22 11:42:51.049688082 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-mmorph.new.28504/ghc-mmorph.changes 2021-02-16 22:48:36.134564052 +0100 @@ -1,0 +2,14 @@ +Wed Feb 3 20:26:59 UTC 2021 - [email protected] + +- Update mmorph to version 1.1.4 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Tue Feb 2 09:34:21 UTC 2021 - [email protected] + +- Update mmorph to version 1.1.4. + 1.1.4 + + * Fix `MonadFail`-related code to work for GHCJS + +------------------------------------------------------------------- Old: ---- mmorph-1.1.3.tar.gz New: ---- mmorph-1.1.4.tar.gz mmorph.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-mmorph.spec ++++++ --- /var/tmp/diff_new_pack.C1M7QM/_old 2021-02-16 22:48:36.774564551 +0100 +++ /var/tmp/diff_new_pack.C1M7QM/_new 2021-02-16 22:48:36.782564558 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-mmorph # -# 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 @@ -18,12 +18,13 @@ %global pkg_name mmorph Name: ghc-%{pkg_name} -Version: 1.1.3 +Version: 1.1.4 Release: 0 Summary: Monad morphisms 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-mtl-devel BuildRequires: ghc-rpm-macros @@ -47,6 +48,7 @@ %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ mmorph-1.1.3.tar.gz -> mmorph-1.1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mmorph-1.1.3/CHANGELOG.md new/mmorph-1.1.4/CHANGELOG.md --- old/mmorph-1.1.3/CHANGELOG.md 2019-04-30 01:28:36.000000000 +0200 +++ new/mmorph-1.1.4/CHANGELOG.md 2021-01-31 20:49:00.000000000 +0100 @@ -1,3 +1,7 @@ +1.1.4 + +* Fix `MonadFail`-related code to work for GHCJS + 1.1.3 * Add an `MFunctor` instance for `ComposeT` for GHC >= 8.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mmorph-1.1.3/mmorph.cabal new/mmorph-1.1.4/mmorph.cabal --- old/mmorph-1.1.3/mmorph.cabal 2019-04-30 01:28:36.000000000 +0200 +++ new/mmorph-1.1.4/mmorph.cabal 2021-01-31 20:49:00.000000000 +0100 @@ -1,6 +1,6 @@ Name: mmorph -Version: 1.1.3 -Cabal-Version: >= 1.8.0.2 +Version: 1.1.4 +Cabal-Version: >= 1.10 Build-Type: Simple License: BSD3 License-File: LICENSE @@ -24,5 +24,9 @@ mtl >= 2.1 && < 2.3, transformers >= 0.2.0.0 && < 0.6, transformers-compat >= 0.3 && < 0.7 + if impl(ghc < 8.0) + Build-Depends: + fail == 4.9.* Exposed-Modules: Control.Monad.Morph, Control.Monad.Trans.Compose GHC-Options: -O2 + Default-Language: Haskell2010 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mmorph-1.1.3/src/Control/Monad/Trans/Compose.hs new/mmorph-1.1.4/src/Control/Monad/Trans/Compose.hs --- old/mmorph-1.1.3/src/Control/Monad/Trans/Compose.hs 2019-04-30 01:28:36.000000000 +0200 +++ new/mmorph-1.1.4/src/Control/Monad/Trans/Compose.hs 2021-01-31 20:49:00.000000000 +0100 @@ -1,5 +1,6 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE KindSignatures #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE UndecidableInstances #-} @@ -35,9 +36,8 @@ import Data.Traversable (Traversable(traverse, sequenceA, mapM, sequence)) import Prelude hiding (foldr, foldl, foldr1, foldl1, mapM, sequence) -#if __GLASGOW_HASKELL__ >= 800 +#if !MIN_VERSION_base(4,11,0) import Control.Monad.Fail (MonadFail(..)) -import qualified Control.Monad.Fail #endif infixr 9 `ComposeT` @@ -45,7 +45,26 @@ -- | Composition of monad transformers. newtype ComposeT (f :: (* -> *) -> * -> *) (g :: (* -> *) -> * -> *) m a = ComposeT { getComposeT :: f (g m) a } - deriving (Eq, Ord, Read, Show) + deriving + ( Alternative + , Applicative + , Eq + , Foldable + , Functor + , Ord + , Read + , Show + , Monad + , MonadCont + , MonadError e + , MonadFail + , MonadIO + , MonadPlus + , MonadReader r + , MonadRWS r w s + , MonadState s + , MonadWriter w + ) instance (MFunctor f, MonadTrans f, MonadTrans g) => MonadTrans (ComposeT f g) where @@ -57,77 +76,6 @@ hoist f (ComposeT m) = ComposeT (hoist (hoist f) m) #endif -instance Functor (f (g m)) => Functor (ComposeT f g m) where - fmap f (ComposeT m) = ComposeT (fmap f m) - -instance Applicative (f (g m)) => Applicative (ComposeT f g m) where - pure a = ComposeT (pure a) - ComposeT f <*> ComposeT a = ComposeT (f <*> a) - ComposeT a *> ComposeT b = ComposeT (a *> b) - ComposeT a <* ComposeT b = ComposeT (a <* b) - -instance Alternative (f (g m)) => Alternative (ComposeT f g m) where - empty = ComposeT empty - ComposeT a <|> ComposeT b = ComposeT (a <|> b) - -instance Monad (f (g m)) => Monad (ComposeT f g m) where - return a = ComposeT (return a) - m >>= f = ComposeT (getComposeT m >>= \x -> getComposeT (f x)) -#if __GLASGOW_HASKELL__ < 808 - fail e = ComposeT (Prelude.fail e) -#endif - -#if __GLASGOW_HASKELL__ >= 800 -instance MonadFail (f (g m)) => MonadFail (ComposeT f g m) where - fail e = ComposeT (Control.Monad.Fail.fail e) -#endif - -instance MonadPlus (f (g m)) => MonadPlus (ComposeT f g m) where - mzero = ComposeT mzero - ComposeT a `mplus` ComposeT b = ComposeT (a `mplus` b) - -instance MonadIO (f (g m)) => MonadIO (ComposeT f g m) where - liftIO m = ComposeT (liftIO m) - -instance Foldable (f (g m)) => Foldable (ComposeT f g m) where - fold (ComposeT m) = fold m - foldMap f (ComposeT m) = foldMap f m - foldr f a (ComposeT m) = foldr f a m - foldl f a (ComposeT m) = foldl f a m - foldr1 f (ComposeT m) = foldr1 f m - foldl1 f (ComposeT m) = foldl1 f m - -instance Traversable (f (g m)) => Traversable (ComposeT f g m) where - traverse f (ComposeT m) = fmap ComposeT (traverse f m) - sequenceA (ComposeT m) = fmap ComposeT (sequenceA m) - mapM f (ComposeT m) = liftM ComposeT (mapM f m) - sequence (ComposeT m) = liftM ComposeT (sequence m) - -instance MonadCont (f (g m)) => MonadCont (ComposeT f g m) where - callCC f = ComposeT $ callCC $ \c -> getComposeT (f (ComposeT . c)) - -instance MonadError e (f (g m)) => MonadError e (ComposeT f g m) where - throwError = ComposeT . throwError - catchError m h = ComposeT $ catchError (getComposeT m) (getComposeT . h) - -instance MonadRWS r w s (f (g m)) => MonadRWS r w s (ComposeT f g m) - -instance MonadReader r (f (g m)) => MonadReader r (ComposeT f g m) where - ask = ComposeT ask - local = mapComposeT . local - reader = ComposeT . reader - -instance MonadState s (f (g m)) => MonadState s (ComposeT f g m) where - get = ComposeT get - put = ComposeT . put - state = ComposeT . state - -instance MonadWriter w (f (g m)) => MonadWriter w (ComposeT f g m) where - writer = ComposeT . writer - tell = ComposeT . tell - listen = mapComposeT listen - pass = mapComposeT pass - -- | Transform the computation inside a 'ComposeT'. mapComposeT :: (f (g m) a -> p (q n) b) -> ComposeT f g m a -> ComposeT p q n b mapComposeT f = ComposeT . f . getComposeT ++++++ mmorph.cabal ++++++ Name: mmorph Version: 1.1.4 x-revision: 1 Cabal-Version: >= 1.10 Build-Type: Simple License: BSD3 License-File: LICENSE Copyright: 2013 Gabriel Gonzalez Author: Gabriel Gonzalez Maintainer: [email protected] Bug-Reports: https://github.com/Gabriel439/Haskell-MMorph-Library/issues Synopsis: Monad morphisms Description: This library provides monad morphism utilities, most commonly used for manipulating monad transformer stacks. Category: Control Extra-Source-Files: CHANGELOG.md Source-Repository head Type: git Location: https://github.com/Gabriel439/Haskell-MMorph-Library Library Hs-Source-Dirs: src Build-Depends: base >= 4.13 && < 5 , mtl >= 2.1 && < 2.3, transformers >= 0.2.0.0 && < 0.6, transformers-compat >= 0.3 && < 0.7 if impl(ghc < 8.0) Build-Depends: fail == 4.9.* Exposed-Modules: Control.Monad.Morph, Control.Monad.Trans.Compose GHC-Options: -O2 Default-Language: Haskell2010
