Hello community, here is the log from the commit of package ghc-exceptions for openSUSE:Factory checked in at 2019-08-29 17:20:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-exceptions (Old) and /work/SRC/openSUSE:Factory/.ghc-exceptions.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-exceptions" Thu Aug 29 17:20:56 2019 rev:15 rq:726809 version:0.10.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-exceptions/ghc-exceptions.changes 2019-05-12 11:35:10.846182931 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-exceptions.new.7948/ghc-exceptions.changes 2019-08-29 17:20:57.883333002 +0200 @@ -1,0 +2,8 @@ +Wed Aug 28 02:02:31 UTC 2019 - [email protected] + +- Update exceptions to version 0.10.3. + 0.10.3 [2019.08.27] + ------------------- + * `MonadThrow` instance for the strict `ST` monad. + +------------------------------------------------------------------- Old: ---- exceptions-0.10.2.tar.gz New: ---- exceptions-0.10.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-exceptions.spec ++++++ --- /var/tmp/diff_new_pack.oB5Q1l/_old 2019-08-29 17:20:58.335332927 +0200 +++ /var/tmp/diff_new_pack.oB5Q1l/_new 2019-08-29 17:20:58.335332927 +0200 @@ -19,7 +19,7 @@ %global pkg_name exceptions %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.10.2 +Version: 0.10.3 Release: 0 Summary: Extensible optionally-pure exceptions License: BSD-3-Clause ++++++ exceptions-0.10.2.tar.gz -> exceptions-0.10.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/exceptions-0.10.2/.travis.yml new/exceptions-0.10.3/.travis.yml --- old/exceptions-0.10.2/.travis.yml 2001-09-09 03:46:40.000000000 +0200 +++ new/exceptions-0.10.3/.travis.yml 2001-09-09 03:46:40.000000000 +0200 @@ -4,7 +4,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.3.20190425 +# version: 0.3.20190815 # language: c dist: xenial @@ -35,7 +35,6 @@ include: - compiler: ghc-8.8.1 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}} - env: GHCHEAD=true - compiler: ghc-8.6.5 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}} - compiler: ghc-8.4.4 @@ -58,7 +57,6 @@ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.0.4","cabal-install-2.4"]}} - compiler: ghc-head addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-head","cabal-install-head"]}} - env: GHCHEAD=true allow_failures: - compiler: ghc-head - compiler: ghc-7.0.4 @@ -66,13 +64,14 @@ - compiler: ghc-8.8.1 before_install: - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//') + - WITHCOMPILER="-w $HC" - HCPKG="$HC-pkg" - unset CC - CABAL=/opt/ghc/bin/cabal - CABALHOME=$HOME/.cabal - export PATH="$CABALHOME/bin:$PATH" - TOP=$(pwd) - - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) + - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')" - echo $HCNUMVER - CABAL="$CABAL -vnormal+nowrap+markoutput" - set -o pipefail @@ -99,11 +98,13 @@ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - TEST=--enable-tests - BENCH=--enable-benchmarks - - GHCHEAD=${GHCHEAD-false} + - HEADHACKAGE=false + - if [ $HCNUMVER -ge 80800 ] ; then HEADHACKAGE=true ; fi - rm -f $CABALHOME/config - | echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config echo "remote-build-reporting: anonymous" >> $CABALHOME/config + echo "write-ghc-environment-files: always" >> $CABALHOME/config echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config echo "world-file: $CABALHOME/world" >> $CABALHOME/config @@ -117,15 +118,14 @@ echo "repository hackage.haskell.org" >> $CABALHOME/config echo " url: http://hackage.haskell.org/"; >> $CABALHOME/config - | - if $GHCHEAD; then + if $HEADHACKAGE; then echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config - - echo "repository head.hackage" >> $CABALHOME/config - echo " url: http://head.hackage.haskell.org/"; >> $CABALHOME/config + echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config + echo " url: https://ghc.gitlab.haskell.org/head.hackage/"; >> $CABALHOME/config echo " secure: True" >> $CABALHOME/config - echo " root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config - echo " 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config - echo " 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config + echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config + echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config + echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config echo " key-threshold: 3" >> $CABALHOME/config fi - cat $CABALHOME/config @@ -135,17 +135,16 @@ - rm -rf cabal.project cabal.project.local cabal.project.freeze - touch cabal.project - | - echo 'packages: "."' >> cabal.project + echo "packages: ." >> cabal.project - | - echo "write-ghc-environment-files: always" >> cabal.project - - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(exceptions)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(exceptions)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true - cat cabal.project.local || true - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi - - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output + - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" - rm cabal.project.freeze - - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output script: - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) # Packaging... @@ -153,26 +152,27 @@ # Unpacking... - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - cd ${DISTDIR} || false - - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; + - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \; + - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \; + - PKGDIR_exceptions="$(find . -maxdepth 1 -type d -regex '.*/exceptions-[0-9.]*')" # Generate cabal.project - rm -rf cabal.project cabal.project.local cabal.project.freeze - touch cabal.project - | - echo 'packages: "exceptions-*/*.cabal"' >> cabal.project + echo "packages: ${PKGDIR_exceptions}" >> cabal.project - | - echo "write-ghc-environment-files: always" >> cabal.project - - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(exceptions)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(exceptions)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true - cat cabal.project.local || true # Building with tests and benchmarks... # build & run tests, build benchmarks - - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output # Testing... - - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output + - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output # cabal check... - - (cd exceptions-* && ${CABAL} -vnormal check) + - (cd ${PKGDIR_exceptions} && ${CABAL} -vnormal check) # haddock... - - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output + - ${CABAL} v2-haddock $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output # REGENDATA ["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"] # EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/exceptions-0.10.2/CHANGELOG.markdown new/exceptions-0.10.3/CHANGELOG.markdown --- old/exceptions-0.10.2/CHANGELOG.markdown 2001-09-09 03:46:40.000000000 +0200 +++ new/exceptions-0.10.3/CHANGELOG.markdown 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,7 @@ +0.10.3 [2019.08.27] +------------------- +* `MonadThrow` instance for the strict `ST` monad. + 0.10.2 [2019.05.02] ------------------- * Allow building with `base-4.13`/`template-haskell-2.15`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/exceptions-0.10.2/exceptions.cabal new/exceptions-0.10.3/exceptions.cabal --- old/exceptions-0.10.2/exceptions.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/exceptions-0.10.3/exceptions.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ name: exceptions category: Control, Exceptions, Monad -version: 0.10.2 +version: 0.10.3 cabal-version: >= 1.8 license: BSD3 license-file: LICENSE @@ -62,15 +62,13 @@ test-suite exceptions-tests main-is: Tests.hs - other-modules: - Control.Monad.Catch - Control.Monad.Catch.Pure - Control.Monad.Catch.Tests - hs-source-dirs: src, tests + other-modules: Control.Monad.Catch.Tests + hs-source-dirs: tests ghc-options: -Wall -fwarn-tabs type: exitcode-stdio-1.0 build-depends: base, + exceptions, stm, template-haskell, transformers, @@ -80,5 +78,3 @@ test-framework-hunit >= 0.3 && < 0.4, test-framework-quickcheck2 >= 0.3 && < 0.4, QuickCheck >= 2.5 && < 2.14 - if !impl(ghc >= 8.0) - build-depends: fail == 4.9.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/exceptions-0.10.2/src/Control/Monad/Catch.hs new/exceptions-0.10.3/src/Control/Monad/Catch.hs --- old/exceptions-0.10.2/src/Control/Monad/Catch.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/exceptions-0.10.3/src/Control/Monad/Catch.hs 2001-09-09 03:46:40.000000000 +0200 @@ -86,6 +86,7 @@ import qualified Control.Monad.Trans.State.Strict as StrictS import qualified Control.Monad.Trans.Writer.Lazy as LazyW import qualified Control.Monad.Trans.Writer.Strict as StrictW +import Control.Monad.ST (ST) import Control.Monad.STM (STM) import Control.Monad.Trans.List (ListT(..), runListT) import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT) @@ -97,6 +98,12 @@ import Language.Haskell.TH.Syntax (Q) +#if MIN_VERSION_base(4,4,0) +import Control.Monad.ST.Unsafe (unsafeIOToST) +#else +import Control.Monad.ST (unsafeIOToST) +#endif + #if __GLASGOW_HASKELL__ < 706 import Prelude hiding (catch, foldr) import Data.Foldable @@ -335,6 +342,9 @@ c <- release resource (ExitCaseSuccess b) return (b, c) +instance MonadThrow (ST s) where + throwM = unsafeIOToST . ControlException.throwIO + instance MonadThrow STM where throwM = STM.throwSTM instance MonadCatch STM where
