Hello community, here is the log from the commit of package ghc-rethinkdb for openSUSE:Factory checked in at 2016-11-24 21:24:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-rethinkdb (Old) and /work/SRC/openSUSE:Factory/.ghc-rethinkdb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-rethinkdb" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-rethinkdb/ghc-rethinkdb.changes 2016-11-15 17:58:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-rethinkdb.new/ghc-rethinkdb.changes 2016-11-24 21:24:33.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Oct 1 17:18:05 UTC 2016 - [email protected] + +- Update to version 2.2.0.7 with cabal2obs. + +------------------------------------------------------------------- Old: ---- rethinkdb-2.2.0.6.tar.gz New: ---- rethinkdb-2.2.0.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rethinkdb.spec ++++++ --- /var/tmp/diff_new_pack.RNpoYN/_old 2016-11-24 21:24:34.000000000 +0100 +++ /var/tmp/diff_new_pack.RNpoYN/_new 2016-11-24 21:24:34.000000000 +0100 @@ -19,11 +19,11 @@ %global pkg_name rethinkdb %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.2.0.6 +Version: 2.2.0.7 Release: 0 Summary: A driver for RethinkDB 2.2 License: Apache-2.0 -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 @@ -64,19 +64,15 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check %cabal_test - %post devel %ghc_pkg_recache ++++++ rethinkdb-2.2.0.6.tar.gz -> rethinkdb-2.2.0.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rethinkdb-2.2.0.6/Database/RethinkDB/Driver.hs new/rethinkdb-2.2.0.7/Database/RethinkDB/Driver.hs --- old/rethinkdb-2.2.0.6/Database/RethinkDB/Driver.hs 2016-05-27 22:44:05.000000000 +0200 +++ new/rethinkdb-2.2.0.7/Database/RethinkDB/Driver.hs 2016-09-29 21:14:27.000000000 +0200 @@ -6,6 +6,8 @@ Result(..), runOpts, RunFlag(..), + Durability(..), + durability, WriteResponse(..), Change(..) ) where @@ -60,6 +62,14 @@ data Durability = Hard | Soft +instance Expr Durability where + expr Hard = "hard" + expr Soft = "soft" + +-- | Optional argument for soft durability writes +durability :: Durability -> Attribute a +durability d = "durability" := d + renderOption :: RunFlag -> (Text, Datum) renderOption UseOutdated = "read_mode" .= ("outdated" :: String) renderOption (ReadMode Majority) = "read_mode" .= ("majority" :: String) @@ -115,7 +125,7 @@ instance FromDatum a => Result (Cursor a) where convertResult r = do - c <- makeCursor r + c <- makeCursor r return c { cursorMap = unsafeFromDatum } unsafeFromDatum :: FromDatum a => Datum -> IO a @@ -144,7 +154,7 @@ Error a -> return $ Left $ RethinkDBError ErrorUnexpectedResponse (Datum Null) a [] instance FromDatum a => Result (Maybe a) where - convertResult v = do + convertResult v = do ed <- convertResult v case ed of Left _ -> return Nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rethinkdb-2.2.0.6/Database/RethinkDB/Functions.hs new/rethinkdb-2.2.0.7/Database/RethinkDB/Functions.hs --- old/rethinkdb-2.2.0.6/Database/RethinkDB/Functions.hs 2016-05-30 15:45:15.000000000 +0200 +++ new/rethinkdb-2.2.0.7/Database/RethinkDB/Functions.hs 2016-09-29 21:14:27.000000000 +0200 @@ -350,6 +350,13 @@ slice :: (Expr a, Expr b, Expr c) => a -> b -> c -> ReQL slice n m s = op SLICE (s, n, m) +-- | Get nth element of a sequence +-- +-- >>> run h $ nth 2 [1, 2, 3, 4, 5] +-- 3 +nth :: (Expr a, Expr seq) => a -> seq -> ReQL +nth a s = op NTH (s, a) + -- | Reduce a sequence to a single value -- -- >>> run h $ reduce0 (+) 0 [1, 2, 3] @@ -1029,16 +1036,6 @@ includeInitial :: Attribute a includeInitial = "include_initial" := P.True -data Durability = Hard | Soft - -instance Expr Durability where - expr Hard = "hard" - expr Soft = "soft" - --- | Optional argument for soft durability writes -durability :: Durability -> Attribute a -durability d = "durability" := d - -- | Optional argument for non-atomic writes -- -- >>> run' h $ table "users" # get "sabrina" # update (merge ["lucky_number" := random]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rethinkdb-2.2.0.6/Database/RethinkDB/Network.hs new/rethinkdb-2.2.0.7/Database/RethinkDB/Network.hs --- old/rethinkdb-2.2.0.6/Database/RethinkDB/Network.hs 2016-05-30 15:45:15.000000000 +0200 +++ new/rethinkdb-2.2.0.7/Database/RethinkDB/Network.hs 2016-09-29 21:14:27.000000000 +0200 @@ -29,7 +29,7 @@ import Data.Typeable (Typeable) import Network (HostName) import Network.Socket ( - socket, Family(AF_INET, AF_INET6), SocketType(Stream), sClose, setSocketOption, + socket, Family(AF_INET, AF_INET6), SocketType(Stream), setSocketOption, SocketOption(NoDelay, KeepAlive), Socket, AddrInfo(AddrInfo, addrAddress, addrFamily)) import qualified Network.Socket as Socket import Network.BSD (getProtocolNumber) @@ -120,7 +120,7 @@ let addrI = head h let addrF = getAddrFamily addrI proto <- getProtocolNumber "tcp" - bracketOnError (socket addrF Stream proto) sClose $ \sock -> do + bracketOnError (socket addrF Stream proto) Socket.close $ \sock -> do Socket.connect sock (addrAddress addrI) setSocketOption sock NoDelay 1 setSocketOption sock KeepAlive 1 @@ -333,7 +333,7 @@ tid <- myThreadId let h = h' tid let handler e@SomeException{} = do - sClose $ rdbSocket h + Socket.close $ rdbSocket h modifyMVar (rdbWriteLock h) $ \_ -> return (Just e, ()) writeIORef (rdbWait h) M.empty flip catch handler $ forever $ readSingleResponse h @@ -384,7 +384,7 @@ close h@RethinkDBHandle{ rdbSocket, rdbThread } = do noReplyWait h killThread rdbThread - sClose rdbSocket + Socket.close rdbSocket closeToken :: RethinkDBHandle -> Token -> IO () closeToken h tok = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rethinkdb-2.2.0.6/Database/RethinkDB/ReQL.hs new/rethinkdb-2.2.0.7/Database/RethinkDB/ReQL.hs --- old/rethinkdb-2.2.0.6/Database/RethinkDB/ReQL.hs 2016-05-27 22:44:05.000000000 +0200 +++ new/rethinkdb-2.2.0.7/Database/RethinkDB/ReQL.hs 2016-09-29 21:14:27.000000000 +0200 @@ -37,7 +37,11 @@ ) where import qualified Data.Aeson as J +#if MIN_VERSION_aeson(1,0,0) +import qualified Data.Aeson.Text as J +#else import qualified Data.Aeson.Encode as J +#endif import qualified Data.Text.Lazy as LT import qualified Data.Text.Lazy.Builder as LT import Data.Aeson (Value) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rethinkdb-2.2.0.6/Database/RethinkDB.hs new/rethinkdb-2.2.0.7/Database/RethinkDB.hs --- old/rethinkdb-2.2.0.6/Database/RethinkDB.hs 2015-12-17 13:24:45.000000000 +0100 +++ new/rethinkdb-2.2.0.7/Database/RethinkDB.hs 2016-09-29 21:14:27.000000000 +0200 @@ -74,7 +74,7 @@ map, zipWith, zipWithN, withFields, concatMap, orderBy, asc, desc, - skip, limit, slice, + skip, limit, slice, nth, indexesOf, isEmpty, union, sample, -- * Aggregation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rethinkdb-2.2.0.6/rethinkdb.cabal new/rethinkdb-2.2.0.7/rethinkdb.cabal --- old/rethinkdb-2.2.0.6/rethinkdb.cabal 2016-07-13 14:32:57.000000000 +0200 +++ new/rethinkdb-2.2.0.7/rethinkdb.cabal 2016-09-29 21:14:27.000000000 +0200 @@ -1,5 +1,5 @@ name: rethinkdb -version: 2.2.0.6 +version: 2.2.0.7 cabal-version: >=1.8 build-type: Simple license: Apache @@ -31,7 +31,7 @@ base >=4 && <4.10, unordered-containers ==0.2.*, text >=0.11 && <1.3, - aeson >=0.7 && <0.12, + aeson >=0.7 && <1.1, bytestring ==0.10.*, containers ==0.5.*, data-default >=0.5 && <0.8,
