Hello community, here is the log from the commit of package ghc-protolude for openSUSE:Factory checked in at 2016-11-02 12:47:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-protolude (Old) and /work/SRC/openSUSE:Factory/.ghc-protolude.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-protolude" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-protolude/ghc-protolude.changes 2016-10-22 13:18:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-protolude.new/ghc-protolude.changes 2016-11-02 12:47:26.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Aug 21 17:18:39 UTC 2016 - [email protected] + +- Update to version 0.1.7 revision 0 with cabal2obs. + +------------------------------------------------------------------- Old: ---- protolude-0.1.6.tar.gz New: ---- protolude-0.1.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-protolude.spec ++++++ --- /var/tmp/diff_new_pack.EPuzbv/_old 2016-11-02 12:47:27.000000000 +0100 +++ /var/tmp/diff_new_pack.EPuzbv/_new 2016-11-02 12:47:27.000000000 +0100 @@ -18,15 +18,14 @@ %global pkg_name protolude Name: ghc-%{pkg_name} -Version: 0.1.6 +Version: 0.1.7 Release: 0 Summary: A sensible set of defaults for writing custom Preludes License: MIT -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-async-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel @@ -38,7 +37,6 @@ BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description A sensible set of defaults for writing custom Preludes. @@ -57,15 +55,12 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %post devel %ghc_pkg_recache ++++++ protolude-0.1.6.tar.gz -> protolude-0.1.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protolude-0.1.6/protolude.cabal new/protolude-0.1.7/protolude.cabal --- old/protolude-0.1.6/protolude.cabal 2016-07-02 19:30:42.000000000 +0200 +++ new/protolude-0.1.7/protolude.cabal 2016-08-15 14:55:57.000000000 +0200 @@ -1,5 +1,5 @@ name: protolude -version: 0.1.6 +version: 0.1.7 synopsis: A sensible set of defaults for writing custom Preludes. description: A sensible set of defaults for writing custom Preludes. homepage: https://github.com/sdiehl/protolude diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protolude-0.1.6/src/Debug.hs new/protolude-0.1.7/src/Debug.hs --- old/protolude-0.1.6/src/Debug.hs 2016-07-02 19:30:42.000000000 +0200 +++ new/protolude-0.1.7/src/Debug.hs 2016-08-15 14:55:57.000000000 +0200 @@ -6,8 +6,10 @@ error, trace, traceM, + traceId, traceIO, traceShow, + traceShowId, traceShowM, notImplemented, ) where @@ -16,31 +18,45 @@ import Control.Monad (Monad, return) import qualified Base as P -import qualified Debug.Trace as T +import Show (Print, putStrLn) + +import System.IO.Unsafe (unsafePerformIO) + +{-# WARNING trace "'trace' remains in code" #-} +trace :: Print b => b -> a -> a +trace string expr = unsafePerformIO (do + putStrLn string + return expr) + +{-# WARNING traceIO "'traceIO' remains in code" #-} +traceIO :: Print b => b -> a -> P.IO a +traceIO string expr = do + putStrLn string + return expr {-# WARNING error "'error' remains in code" #-} error :: Text -> a error s = P.error (unpack s) -{-# WARNING trace "'trace' remains in code" #-} -trace :: Text -> a -> a -trace s = T.trace (unpack s) - {-# WARNING traceShow "'traceShow' remains in code" #-} traceShow :: P.Show a => a -> b -> b -traceShow a b = T.trace (P.show a) b +traceShow a b = trace (P.show a) b + +{-# WARNING traceShowId "'traceShowId' remains in code" #-} +traceShowId :: P.Show a => a -> a +traceShowId a = trace (P.show a) a {-# WARNING traceShowM "'traceShowM' remains in code" #-} traceShowM :: (P.Show a, Monad m) => a -> m () -traceShowM a = T.trace (P.show a) (return ()) +traceShowM a = trace (P.show a) (return ()) {-# WARNING traceM "'traceM' remains in code" #-} traceM :: (Monad m) => Text -> m () -traceM s = T.trace (unpack s) (return ()) +traceM s = trace (unpack s) (return ()) -{-# WARNING traceIO "'traceIO' remains in code" #-} -traceIO :: Text -> P.IO () -traceIO s = T.traceIO (unpack s) +{-# WARNING traceId "'traceM' remains in code" #-} +traceId :: Text -> Text +traceId s = trace s s notImplemented :: a notImplemented = P.error "Not implemented" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protolude-0.1.6/src/Monad.hs new/protolude-0.1.7/src/Monad.hs --- old/protolude-0.1.6/src/Monad.hs 2016-07-02 19:30:42.000000000 +0200 +++ new/protolude-0.1.7/src/Monad.hs 2016-08-15 14:55:57.000000000 +0200 @@ -9,6 +9,7 @@ , (=<<) , (>=>) , (<=<) + , (>>) , forever , join diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protolude-0.1.6/src/Protolude.hs new/protolude-0.1.7/src/Protolude.hs --- old/protolude-0.1.6/src/Protolude.hs 2016-07-02 19:30:42.000000000 +0200 +++ new/protolude-0.1.7/src/Protolude.hs 2016-08-15 14:55:57.000000000 +0200 @@ -15,6 +15,8 @@ unsnoc, applyN, print, + throwIO, + throwTo, show, LText, @@ -196,6 +198,7 @@ , get , gets , modify + , state , withState , runState @@ -214,6 +217,7 @@ , ask , asks , local + , reader , runReader , runReaderT ) @@ -326,12 +330,19 @@ -- Concurrency and Parallelism import Control.Exception as X hiding ( - throw + throw -- Impure throw is forbidden. + , throwIO + , throwTo , assert , displayException ) + +import qualified Control.Exception + import Control.Monad.STM as X -import Control.Concurrent as X +import Control.Concurrent as X hiding ( + throwTo + ) import Control.Concurrent.Async as X import Foreign.Storable as X (Storable) @@ -376,6 +387,12 @@ print :: (X.MonadIO m, PBase.Show a) => a -> m () print = liftIO . PBase.print +throwIO :: (X.MonadIO m, Exception e) => e -> m a +throwIO = liftIO . Control.Exception.throwIO + +throwTo :: (X.MonadIO m, Exception e) => ThreadId -> e -> m () +throwTo tid e = liftIO (Control.Exception.throwTo tid e) + show :: (Show a, StringConv String b) => a -> b show x = toS (PBase.show x) {-# SPECIALIZE show :: Show a => a -> Text #-}
