Hello community, here is the log from the commit of package ghc-text-postgresql for openSUSE:Factory checked in at 2017-01-18 21:44:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-text-postgresql (Old) and /work/SRC/openSUSE:Factory/.ghc-text-postgresql.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-text-postgresql" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-text-postgresql/ghc-text-postgresql.changes 2016-11-02 12:44:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-text-postgresql.new/ghc-text-postgresql.changes 2017-01-18 21:44:28.277969563 +0100 @@ -1,0 +2,5 @@ +Sun Jan 8 21:13:20 UTC 2017 - psimons@suse.com + +- Update to version 0.0.2.2 with cabal2obs. + +------------------------------------------------------------------- Old: ---- text-postgresql-0.0.2.1.tar.gz New: ---- text-postgresql-0.0.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-text-postgresql.spec ++++++ --- /var/tmp/diff_new_pack.vFGZCv/_old 2017-01-18 21:44:28.681912427 +0100 +++ /var/tmp/diff_new_pack.vFGZCv/_new 2017-01-18 21:44:28.681912427 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-text-postgresql # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,24 +19,23 @@ %global pkg_name text-postgresql %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.0.2.1 +Version: 0.0.2.2 Release: 0 Summary: Parser and Printer of PostgreSQL extended types License: BSD-3-Clause -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-dlist-devel BuildRequires: ghc-rpm-macros +BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-quickcheck-simple-devel %endif -# End cabal-rpm deps %description This package involves parser and printer for text expressions of PostgreSQL @@ -57,20 +56,14 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache ++++++ text-postgresql-0.0.2.1.tar.gz -> text-postgresql-0.0.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/text-postgresql-0.0.2.1/src/Control/Monad/Either/Plus.hs new/text-postgresql-0.0.2.2/src/Control/Monad/Either/Plus.hs --- old/text-postgresql-0.0.2.1/src/Control/Monad/Either/Plus.hs 2016-06-19 08:18:10.000000000 +0200 +++ new/text-postgresql-0.0.2.2/src/Control/Monad/Either/Plus.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -{-# OPTIONS_GHC -fno-warn-orphans #-} - -module Control.Monad.Either.Plus - ( EitherP (..) - , eitherP, emap - , leftP, rightP - ) where - -import Control.Applicative ((<$>), Applicative (..), Alternative (..)) -import Control.Monad (MonadPlus (..)) -import Data.Monoid (Monoid (..), (<>)) - - -newtype EitherP e a = EitherP { unEitherP :: Either e a } - -eitherP :: (a -> c) -> (b -> c) -> EitherP a b -> c -eitherP f g = either f g . unEitherP - -emap :: (e0 -> e1) -> EitherP e0 a -> EitherP e1 a -emap f = EitherP . eitherP (Left . f) Right - -leftP :: e -> EitherP e a -leftP = EitherP . Left - -rightP :: a -> EitherP e a -rightP = EitherP . Right - -instance Functor (EitherP e) where - fmap f (EitherP e) = EitherP $ f <$> e - -instance Applicative (EitherP e) where - pure = EitherP . pure - EitherP a <*> EitherP b = EitherP $ a <*> b - -instance Monad (EitherP e) where - (EitherP e) >>= f = EitherP (e >>= unEitherP . f) - return = EitherP . return - -instance Monoid e => Alternative (EitherP e) where - empty = EitherP $ Left mempty - EitherP a <|> EitherP b = EitherP $ a `plus` b where - x@(Right _) `plus` _ = x - Left _ `plus` y@(Right _) = y - Left e1 `plus` Left e2 = Left $ e1 <> e2 - -instance Monoid e => MonadPlus (EitherP e) where - mzero = empty - mplus = (<|>) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/text-postgresql-0.0.2.1/src/Text/Parser/List.hs new/text-postgresql-0.0.2.2/src/Text/Parser/List.hs --- old/text-postgresql-0.0.2.1/src/Text/Parser/List.hs 2016-06-19 08:18:10.000000000 +0200 +++ new/text-postgresql-0.0.2.2/src/Text/Parser/List.hs 2017-01-05 09:58:46.000000000 +0100 @@ -8,27 +8,26 @@ import Control.Applicative (pure) import Control.Monad (guard) import Control.Monad.Trans.State.Strict (StateT (..), evalStateT, get, put) +import Control.Monad.Trans.Except (Except, runExcept, withExcept, throwE) import Data.Monoid (Last (..)) import Data.Maybe (fromMaybe) -import Control.Monad.Either.Plus (EitherP (..), emap, leftP) - type Error = Last String unError :: String -> Error -> String unError s = fromMaybe s . getLast -type Parser t = StateT [t] (EitherP Error) +type Parser t = StateT [t] (Except Error) runParser :: Parser t a -> [t] -> Either String (a, [t]) -runParser p = unEitherP . emap (unError "runParser: parse error.") . runStateT p +runParser p = runExcept . withExcept (unError "runParser: parse error.") . runStateT p evalParser :: Parser t a -> [t] -> Either String a -evalParser p = unEitherP . emap (unError "evalParser: parse error.") . evalStateT p +evalParser p = runExcept . withExcept (unError "evalParser: parse error.") . evalStateT p -errorE :: String -> EitherP Error a -errorE = leftP . Last . Just +errorE :: String -> Except Error a +errorE = throwE . Last . Just errorP :: String -> Parser t a errorP = StateT . const . errorE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/text-postgresql-0.0.2.1/text-postgresql.cabal new/text-postgresql-0.0.2.2/text-postgresql.cabal --- old/text-postgresql-0.0.2.1/text-postgresql.cabal 2016-06-19 08:18:10.000000000 +0200 +++ new/text-postgresql-0.0.2.2/text-postgresql.cabal 2017-01-05 09:58:46.000000000 +0100 @@ -1,5 +1,5 @@ name: text-postgresql -version: 0.0.2.1 +version: 0.0.2.2 synopsis: Parser and Printer of PostgreSQL extended types description: This package involves parser and printer for text expressions of PostgreSQL extended types. @@ -26,12 +26,12 @@ Database.PostgreSQL.Parser Database.PostgreSQL.Printer other-modules: - Control.Monad.Either.Plus Text.Parser.List Text.Printer.List build-depends: base <5 , transformers + , transformers-compat , dlist hs-source-dirs: src default-language: Haskell2010