Hello community, here is the log from the commit of package ghc-concurrent-extra for openSUSE:Factory checked in at 2017-06-22 10:37:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-concurrent-extra (Old) and /work/SRC/openSUSE:Factory/.ghc-concurrent-extra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-concurrent-extra" Thu Jun 22 10:37:13 2017 rev:2 rq:504062 version:0.7.0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-concurrent-extra/ghc-concurrent-extra.changes 2016-09-25 14:39:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-concurrent-extra.new/ghc-concurrent-extra.changes 2017-06-22 10:37:15.668114979 +0200 @@ -1,0 +2,5 @@ +Sat May 27 12:27:54 UTC 2017 - psim...@suse.com + +- Update to version 0.7.0.11. + +------------------------------------------------------------------- Old: ---- concurrent-extra-0.7.0.10.tar.gz New: ---- concurrent-extra-0.7.0.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-concurrent-extra.spec ++++++ --- /var/tmp/diff_new_pack.PnUD6z/_old 2017-06-22 10:37:16.164045065 +0200 +++ /var/tmp/diff_new_pack.PnUD6z/_new 2017-06-22 10:37:16.164045065 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-concurrent-extra # -# 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,16 +19,15 @@ %global pkg_name concurrent-extra %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.7.0.10 +Version: 0.7.0.11 Release: 0 Summary: Extra concurrency primitives 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 BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-stm-devel BuildRequires: ghc-unbounded-delays-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,7 +38,6 @@ BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel %endif -# End cabal-rpm deps %description The 'concurrent-extra' package offers among other things the following @@ -81,20 +79,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 ++++++ concurrent-extra-0.7.0.10.tar.gz -> concurrent-extra-0.7.0.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/concurrent-extra-0.7.0.10/Control/Concurrent/Event.hs new/concurrent-extra-0.7.0.11/Control/Concurrent/Event.hs --- old/concurrent-extra-0.7.0.10/Control/Concurrent/Event.hs 2015-12-16 10:24:13.000000000 +0100 +++ new/concurrent-extra-0.7.0.11/Control/Concurrent/Event.hs 2017-05-23 12:36:23.000000000 +0200 @@ -68,7 +68,7 @@ import Data.Maybe ( isJust ) import Data.Typeable ( Typeable ) -#ifdef __HADDOCK__ +#ifdef __HADDOCK_VERSION__ import Control.Exception ( mask ) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/concurrent-extra-0.7.0.10/Control/Concurrent/Lock.hs new/concurrent-extra-0.7.0.11/Control/Concurrent/Lock.hs --- old/concurrent-extra-0.7.0.10/Control/Concurrent/Lock.hs 2015-12-16 10:24:13.000000000 +0100 +++ new/concurrent-extra-0.7.0.11/Control/Concurrent/Lock.hs 2017-05-23 12:36:23.000000000 +0200 @@ -63,13 +63,12 @@ import Control.Applicative ( liftA2 ) import Control.Concurrent.MVar ( MVar, newMVar, newEmptyMVar , takeMVar, tryTakeMVar - , putMVar, tryPutMVar - , isEmptyMVar + , tryPutMVar, readMVar, isEmptyMVar ) import Control.Exception ( bracket_, onException ) -import Control.Monad ( return, (>>), when ) +import Control.Monad ( return, when ) import Data.Bool ( Bool, not ) -#ifdef __HADDOCK__ +#ifdef __HADDOCK_VERSION__ import Data.Bool ( Bool(False, True) ) #endif import Data.Eq ( Eq ) @@ -85,7 +84,7 @@ #endif -- from concurrent-extra (this package): -import Utils ( mask, mask_ ) +import Utils ( mask ) -------------------------------------------------------------------------------- @@ -198,16 +197,15 @@ * When the state is \"locked\", @wait@ /blocks/ until a call to 'release' in another thread changes it to \"unlocked\". +* @wait@ is multiple-wakeup, so when multiple waiters are blocked on a @Lock@, + all of them are woken up at the same time. + * When the state is \"unlocked\" @wait@ returns immediately. @wait@ does not alter the state of the lock. - -Note that @wait@ is just a convenience function we can be defined as: - -@wait l = 'block' '$' 'acquire' l '>>' 'release' l@ -} wait :: Lock -> IO () -wait (Lock mv) = mask_ $ takeMVar mv >> putMVar mv () +wait (Lock mv) = readMVar mv -------------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/concurrent-extra-0.7.0.10/Control/Concurrent/ReadWriteVar.hs new/concurrent-extra-0.7.0.11/Control/Concurrent/ReadWriteVar.hs --- old/concurrent-extra-0.7.0.10/Control/Concurrent/ReadWriteVar.hs 2015-12-16 10:24:13.000000000 +0100 +++ new/concurrent-extra-0.7.0.11/Control/Concurrent/ReadWriteVar.hs 2017-05-23 12:36:23.000000000 +0200 @@ -76,7 +76,7 @@ import Data.IORef ( IORef, newIORef, readIORef ) import Data.Typeable ( Typeable ) import System.IO ( IO ) -#ifdef __HADDOCK__ +#ifdef __HADDOCK_VERSION__ import Data.Function ( const ) import Prelude ( undefined ) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/concurrent-extra-0.7.0.10/Control/Concurrent/STM/Lock.hs new/concurrent-extra-0.7.0.11/Control/Concurrent/STM/Lock.hs --- old/concurrent-extra-0.7.0.10/Control/Concurrent/STM/Lock.hs 2015-12-16 10:24:13.000000000 +0100 +++ new/concurrent-extra-0.7.0.11/Control/Concurrent/STM/Lock.hs 2017-05-23 12:36:23.000000000 +0200 @@ -1,6 +1,8 @@ {-# LANGUAGE CPP, DeriveDataTypeable, NoImplicitPrelude #-} -#if __GLASGOW_HASKELL__ >= 704 +#if __GLASGOW_HASKELL__ >= 800 +{-# LANGUAGE Safe #-} +#elif __GLASGOW_HASKELL__ >= 704 {-# LANGUAGE Trustworthy #-} #endif @@ -52,10 +54,10 @@ -- from base: import Control.Applicative ( liftA2 ) import Control.Exception ( bracket_, onException ) -import Control.Monad ( return, (>>), when ) +import Control.Monad ( return, when ) import Data.Bool ( Bool, not ) -#ifdef __HADDOCK__ +#ifdef __HADDOCK_VERSION__ import Data.Bool ( Bool(False, True) ) #endif @@ -78,14 +80,13 @@ -- from stm: import Control.Concurrent.STM ( STM, atomically ) -#ifdef __HADDOCK__ +#ifdef __HADDOCK_VERSION__ import Control.Concurrent.STM ( retry ) #endif import Control.Concurrent.STM.TMVar ( TMVar, newTMVar, newEmptyTMVar , takeTMVar, tryTakeTMVar - , putTMVar, tryPutTMVar - , isEmptyTMVar + , tryPutTMVar, readTMVar, isEmptyTMVar ) -- from concurrent-extra (this package): @@ -189,7 +190,7 @@ @wait l = 'acquire' l '>>' 'release' l@ -} wait :: Lock -> STM () -wait (Lock tmv) = takeTMVar tmv >> putTMVar tmv () +wait (Lock tmv) = readTMVar tmv -------------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/concurrent-extra-0.7.0.10/Setup.hs new/concurrent-extra-0.7.0.11/Setup.hs --- old/concurrent-extra-0.7.0.10/Setup.hs 2015-12-16 10:24:13.000000000 +0100 +++ new/concurrent-extra-0.7.0.11/Setup.hs 2017-05-23 12:36:23.000000000 +0200 @@ -1,41 +1,2 @@ -#! /usr/bin/env runhaskell - -{-# LANGUAGE NoImplicitPrelude #-} - -module Main (main) where - - -------------------------------------------------------------------------------- --- Imports -------------------------------------------------------------------------------- - --- from base -import System.IO ( IO ) - --- from cabal -import Distribution.Simple ( defaultMainWithHooks - , simpleUserHooks - , UserHooks(haddockHook) - ) - -import Distribution.Simple.LocalBuildInfo ( LocalBuildInfo(..) ) -import Distribution.Simple.Program ( userSpecifyArgs ) -import Distribution.Simple.Setup ( HaddockFlags ) -import Distribution.PackageDescription ( PackageDescription(..) ) - - -------------------------------------------------------------------------------- --- Cabal setup program which sets the CPP define '__HADDOCK __' when haddock is run. -------------------------------------------------------------------------------- - -main :: IO () -main = defaultMainWithHooks hooks - where - hooks = simpleUserHooks { haddockHook = haddockHook' } - --- Define __HADDOCK__ for CPP when running haddock. -haddockHook' :: PackageDescription -> LocalBuildInfo -> UserHooks -> HaddockFlags -> IO () -haddockHook' pkg lbi = - haddockHook simpleUserHooks pkg (lbi { withPrograms = p }) - where - p = userSpecifyArgs "haddock" ["--optghc=-D__HADDOCK__"] (withPrograms lbi) +import Distribution.Simple +main = defaultMain diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/concurrent-extra-0.7.0.10/concurrent-extra.cabal new/concurrent-extra-0.7.0.11/concurrent-extra.cabal --- old/concurrent-extra-0.7.0.10/concurrent-extra.cabal 2015-12-16 10:24:13.000000000 +0100 +++ new/concurrent-extra-0.7.0.11/concurrent-extra.cabal 2017-05-23 12:36:23.000000000 +0200 @@ -1,7 +1,7 @@ name: concurrent-extra -version: 0.7.0.10 +version: 0.7.0.11 cabal-version: >= 1.8 -build-type: Custom +build-type: Simple stability: experimental author: Bas van Dijk <v.dijk....@gmail.com> Roel van Dijk <vandijk.r...@gmail.com> @@ -82,10 +82,10 @@ build-depends: base >= 3 && < 5 , stm >= 2.1.2.1 && < 2.5 , unbounded-delays >= 0.1 && < 0.2 - , HUnit >= 1.2.2 && < 1.4 + , HUnit >= 1.2.2 && < 1.7 , random >= 1.0 && < 1.2 , test-framework >= 0.2.4 && < 0.9 , test-framework-hunit >= 0.2.4 && < 0.4 - , async >= 2.0 && < 2.1 + , async >= 2.0 && < 2.2 -------------------------------------------------------------------------------