Hello community,
here is the log from the commit of package ghc-exceptions for
openSUSE:Leap:15.2 checked in at 2020-02-19 18:38:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/ghc-exceptions (Old)
and /work/SRC/openSUSE:Leap:15.2/.ghc-exceptions.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-exceptions"
Wed Feb 19 18:38:53 2020 rev:11 rq:771304 version:0.10.4
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/ghc-exceptions/ghc-exceptions.changes
2020-01-15 15:02:01.349797499 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.ghc-exceptions.new.26092/ghc-exceptions.changes
2020-02-19 18:38:54.210004909 +0100
@@ -1,0 +2,39 @@
+Sun Dec 29 10:27:19 UTC 2019 - [email protected]
+
+- Update exceptions to version 0.10.4.
+ 0.10.4 [2019.12.26]
+ -------------------
+ * Allow building with `template-haskell-2.16.*`.
+ * Only depend on `transformers-compat` on old versions of GHC.
+
+-------------------------------------------------------------------
+Fri Nov 8 16:13:42 UTC 2019 - Peter Simons <[email protected]>
+
+- Drop obsolete group attributes.
+
+-------------------------------------------------------------------
+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.
+
+-------------------------------------------------------------------
+Fri May 3 02:03:13 UTC 2019 - [email protected]
+
+- Update exceptions to version 0.10.2.
+ 0.10.2 [2019.05.02]
+ -------------------
+ * Allow building with `base-4.13`/`template-haskell-2.15`.
+
+-------------------------------------------------------------------
+Wed Mar 27 13:42:56 UTC 2019 - [email protected]
+
+- Update exceptions to version 0.10.1.
+ 0.10.1 [2019.03.26]
+ -------------------
+ * Define a `MonadFail` instance for `CatchT`.
+ * Allow `QuickCheck-2.13` in the test suite.
+
+-------------------------------------------------------------------
Old:
----
exceptions-0.10.0.tar.gz
exceptions.cabal
New:
----
exceptions-0.10.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-exceptions.spec ++++++
--- /var/tmp/diff_new_pack.QFALtW/_old 2020-02-19 18:38:54.498005512 +0100
+++ /var/tmp/diff_new_pack.QFALtW/_new 2020-02-19 18:38:54.498005512 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-exceptions
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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,20 +19,17 @@
%global pkg_name exceptions
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.10.0
+Version: 0.10.4
Release: 0
Summary: Extensible optionally-pure exceptions
License: BSD-3-Clause
-Group: Development/Libraries/Haskell
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-stm-devel
BuildRequires: ghc-template-haskell-devel
-BuildRequires: ghc-transformers-compat-devel
BuildRequires: ghc-transformers-devel
%if %{with tests}
BuildRequires: ghc-QuickCheck-devel
@@ -46,7 +43,6 @@
%package devel
Summary: Haskell %{pkg_name} library development files
-Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -57,7 +53,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ exceptions-0.10.0.tar.gz -> exceptions-0.10.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/exceptions-0.10.0/.gitignore
new/exceptions-0.10.4/.gitignore
--- old/exceptions-0.10.0/.gitignore 2018-03-11 15:52:28.000000000 +0100
+++ new/exceptions-0.10.4/.gitignore 2001-09-09 03:46:40.000000000 +0200
@@ -30,3 +30,8 @@
cabal.project.local~
.HTF/
.ghc.environment.*
+
+# GHC
+dist-install
+GNUmakefile
+ghc.mk
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/exceptions-0.10.0/.travis.yml
new/exceptions-0.10.4/.travis.yml
--- old/exceptions-0.10.0/.travis.yml 2018-03-11 15:52:28.000000000 +0100
+++ new/exceptions-0.10.4/.travis.yml 2001-09-09 03:46:40.000000000 +0200
@@ -1,146 +1,204 @@
# This Travis job script has been generated by a script via
#
-# runghc make_travis_yml_2.hs '-o' '.travis.yml'
'--irc-channel=irc.freenode.org#haskell-lens' '--no-no-tests-no-bench'
'--no-installed' 'cabal.project'
+# haskell-ci '--output=.travis.yml' '--config=cabal.haskell-ci'
'cabal.project'
#
-# For more information, see https://github.com/hvr/multi-ghc-travis
+# For more information, see https://github.com/haskell-CI/haskell-ci
#
+# version: 0.9.20191213
+#
+version: ~> 1.0
language: c
-sudo: false
-
+os: linux
+dist: xenial
git:
- submodules: false # whether to recursively clone submodules
-
+ # whether to recursively clone submodules
+ submodules: false
notifications:
irc:
channels:
- - "irc.freenode.org#haskell-lens"
+ - irc.freenode.org#haskell-lens
skip_join: true
template:
- - "\x0313exceptions\x03/\x0306%{branch}\x03 \x0314%{commit}\x03
%{build_url} %{message}"
-
+ - "\"\\x0313exceptions\\x03/\\x0306%{branch}\\x03 \\x0314%{commit}\\x03
%{build_url} %{message}\""
cache:
directories:
- $HOME/.cabal/packages
- $HOME/.cabal/store
-
+ - $HOME/.hlint
before_cache:
- - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
+ - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
# remove files that are regenerated by 'cabal update'
- - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
- - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
- - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
- - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
- - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
-
- - rm -rfv $HOME/.cabal/packages/head.hackage
-
-matrix:
+ - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
+ - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
+ - rm -rfv $CABALHOME/packages/head.hackage
+jobs:
include:
- - compiler: "ghc-7.0.4"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-7.0.4],
sources: [hvr-ghc]}}
- - compiler: "ghc-7.2.2"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-7.2.2],
sources: [hvr-ghc]}}
- - compiler: "ghc-7.4.2"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-7.4.2],
sources: [hvr-ghc]}}
- - compiler: "ghc-7.6.3"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-7.6.3],
sources: [hvr-ghc]}}
- - compiler: "ghc-7.8.4"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-7.8.4],
sources: [hvr-ghc]}}
- - compiler: "ghc-7.10.3"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-7.10.3],
sources: [hvr-ghc]}}
- - compiler: "ghc-8.0.2"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-8.0.2],
sources: [hvr-ghc]}}
- - compiler: "ghc-8.2.2"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [*apt_packages,cabal-install-2.0,ghc-8.2.2],
sources: [hvr-ghc]}}
- - compiler: "ghc-8.4.1"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [*apt_packages,cabal-install-2.2,ghc-8.4.1],
sources: [hvr-ghc]}}
- - compiler: "ghc-head"
- env: GHCHEAD=true
- addons: {apt: {packages: [*apt_packages,cabal-install-head,ghc-head],
sources: [hvr-ghc]}}
-
+ - compiler: ghc-8.10.1
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.1","cabal-install-3.0"]}}
+ os: linux
+ - compiler: ghc-8.8.1
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
+ os: linux
+ - compiler: ghc-8.6.5
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
+ os: linux
+ - compiler: ghc-8.4.4
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
+ os: linux
+ - compiler: ghc-8.2.2
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
+ os: linux
+ - compiler: ghc-8.0.2
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
+ os: linux
+ - compiler: ghc-7.10.3
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.10.3","cabal-install-3.0"]}}
+ os: linux
+ - compiler: ghc-7.8.4
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.0"]}}
+ os: linux
+ - compiler: ghc-7.6.3
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.6.3","cabal-install-3.0"]}}
+ os: linux
+ - compiler: ghc-7.4.2
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.4.2","cabal-install-3.0"]}}
+ os: linux
+ - compiler: ghc-7.2.2
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.2.2","cabal-install-3.0"]}}
+ os: linux
+ - compiler: ghc-7.0.4
+ addons: {"apt":{"sources":[{"sourceline":"deb
http://ppa.launchpad.net/hvr/ghc/ubuntu xenial
main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.0.4","cabal-install-3.0"]}}
+ os: linux
allow_failures:
- - compiler: "ghc-7.0.4"
- - compiler: "ghc-7.2.2"
- - compiler: "ghc-head"
-
+ - compiler: ghc-7.0.4
+ - compiler: ghc-7.2.2
+ - compiler: ghc-8.10.1
before_install:
- - HC=${CC}
- - HCPKG=${HC/ghc/ghc-pkg}
+ - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
+ - WITHCOMPILER="-w $HC"
+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
+ - HCPKG="$HC-pkg"
- unset CC
- - ROOTDIR=$(pwd)
- - mkdir -p $HOME/.local/bin
- - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
- - HCNUMVER=$(( $(${HC} --numeric-version|sed -E
's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
+ - CABAL=/opt/ghc/bin/cabal
+ - CABALHOME=$HOME/.cabal
+ - export PATH="$CABALHOME/bin:$PATH"
+ - TOP=$(pwd)
+ - "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
+ - |
+ echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >>
.colorful.awk
+ echo 'BEGIN { state = "output"; }' >>
.colorful.awk
+ echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >>
.colorful.awk
+ echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >>
.colorful.awk
+ echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >>
.colorful.awk
+ echo ' if (state == "cabal") {' >>
.colorful.awk
+ echo ' print blue($0)' >>
.colorful.awk
+ echo ' } else {' >>
.colorful.awk
+ echo ' print $0' >>
.colorful.awk
+ echo ' }' >>
.colorful.awk
+ echo '}' >>
.colorful.awk
+ - cat .colorful.awk
+ - |
+ color_cabal_output () {
+ awk -f $TOP/.colorful.awk
+ }
+ - echo text | color_cabal_output
install:
- - cabal --version
+ - ${CABAL} --version
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2>
/dev/null || echo '?')]"
- - BENCH=${BENCH---enable-benchmarks}
- - TEST=${TEST---enable-tests}
- - HADDOCK=${HADDOCK-true}
- - INSTALLED=${INSTALLED-true}
- - GHCHEAD=${GHCHEAD-false}
- - travis_retry cabal update -v
- - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
- - rm -fv cabal.project cabal.project.local
- # Overlay Hackage Package Index for GHC HEAD:
https://github.com/hvr/head.hackage
+ - TEST=--enable-tests
+ - BENCH=--enable-benchmarks
+ - HEADHACKAGE=false
+ - if [ $HCNUMVER -ge 81000 ] ; then HEADHACKAGE=true ; fi
+ - rm -f $CABALHOME/config
- |
- if $GHCHEAD; then
- sed -i.bak 's/-- allow-newer:.*/allow-newer: *:base, *:template-haskell,
*:ghc, *:Cabal/' ${HOME}/.cabal/config
-
- echo 'repository head.hackage'
>> ${HOME}/.cabal/config
- echo ' url: http://head.hackage.haskell.org/'
>> ${HOME}/.cabal/config
- echo ' secure: True'
>> ${HOME}/.cabal/config
- echo ' root-keys:
07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >>
${HOME}/.cabal/config
- echo '
2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >>
${HOME}/.cabal/config
- echo '
8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >>
${HOME}/.cabal/config
- echo ' key-threshold: 3'
>> ${HOME}/.cabal.config
-
- cabal new-update head.hackage -v
- fi
- - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
- - "printf 'packages: \".\"\\n' > cabal.project"
- - cat cabal.project
- - if [ -f "./configure.ac" ]; then
- (cd "." && autoreconf -i);
+ 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
+ echo "extra-prog-path: $CABALHOME/bin"
>> $CABALHOME/config
+ echo "symlink-bindir: $CABALHOME/bin"
>> $CABALHOME/config
+ echo "installdir: $CABALHOME/bin"
>> $CABALHOME/config
+ echo "build-summary: $CABALHOME/logs/build.log"
>> $CABALHOME/config
+ echo "store-dir: $CABALHOME/store"
>> $CABALHOME/config
+ echo "install-dirs user"
>> $CABALHOME/config
+ echo " prefix: $CABALHOME"
>> $CABALHOME/config
+ echo "repository hackage.haskell.org"
>> $CABALHOME/config
+ echo " url: http://hackage.haskell.org/"
>> $CABALHOME/config
+ echo " secure: True"
>> $CABALHOME/config
+ echo " key-threshold: 3"
>> $CABALHOME/config
+ echo " root-keys:"
>> $CABALHOME/config
+ echo "
fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >>
$CABALHOME/config
+ echo "
1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >>
$CABALHOME/config
+ echo "
2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >>
$CABALHOME/config
+ echo "
0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >>
$CABALHOME/config
+ echo "
51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >>
$CABALHOME/config
+ - |
+ 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.ghc.haskell.org"
>> $CABALHOME/config
+ echo " url: https://ghc.gitlab.haskell.org/head.hackage/"
>> $CABALHOME/config
+ echo " secure: True"
>> $CABALHOME/config
+ echo " root-keys:
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >>
$CABALHOME/config
+ echo "
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >>
$CABALHOME/config
+ echo "
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >>
$CABALHOME/config
+ echo " key-threshold: 3"
>> $CABALHOME/config
fi
- - rm -f cabal.project.freeze
- - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project"
--dep -j2 all
- - rm -rf "."/.ghc.environment.* "."/dist
- - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
-
-# Here starts the actual work to be performed for the package under test;
-# any command which exits with a non-zero exit code causes the build to fail.
+ - |
+ echo "program-default-options" >> $CABALHOME/config
+ echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
+ - cat $CABALHOME/config
+ - rm -fv cabal.project cabal.project.local cabal.project.freeze
+ - travis_retry ${CABAL} v2-update -v
+ # Generate cabal.project
+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
+ - touch cabal.project
+ - |
+ echo "packages: ." >> cabal.project
+ - |
+ - "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 $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
+ - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed
's/any.//'"
+ - rm cabal.project.freeze
+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all |
color_cabal_output
script:
- # test that source-distributions can be generated
- - (cd "." && cabal sdist)
- - mv "."/dist/exceptions-*.tar.gz ${DISTDIR}/
+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
+ # Packaging...
+ - ${CABAL} v2-sdist all | color_cabal_output
+ # Unpacking...
+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
- cd ${DISTDIR} || false
- - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
- - "printf 'packages: exceptions-*/*.cabal\\n' > cabal.project"
- - cat cabal.project
-
-
+ - 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: ${PKGDIR_exceptions}" >> cabal.project
+ - |
+ - "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 new-build -w ${HC} ${TEST} ${BENCH} all
- - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST}
${BENCH} all; fi
-
- # cabal check
- - (cd exceptions-* && cabal check)
-
- # haddock
- - rm -rf ./dist-newstyle
- - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else
echo "Skipping haddock generation";fi
+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
+ # Testing...
+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
+ # cabal check...
+ - (cd ${PKGDIR_exceptions} && ${CABAL} -vnormal check)
+ # haddock...
+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH}
all | color_cabal_output
-# REGENDATA
["-o",".travis.yml","--irc-channel=irc.freenode.org#haskell-lens","--no-no-tests-no-bench","--no-installed","cabal.project"]
+# REGENDATA
("0.9.20191213",["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"])
# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/exceptions-0.10.0/CHANGELOG.markdown
new/exceptions-0.10.4/CHANGELOG.markdown
--- old/exceptions-0.10.0/CHANGELOG.markdown 2018-03-11 15:52:28.000000000
+0100
+++ new/exceptions-0.10.4/CHANGELOG.markdown 2001-09-09 03:46:40.000000000
+0200
@@ -1,3 +1,21 @@
+0.10.4 [2019.12.26]
+-------------------
+* Allow building with `template-haskell-2.16.*`.
+* Only depend on `transformers-compat` on old versions of GHC.
+
+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`.
+
+0.10.1 [2019.03.26]
+-------------------
+* Define a `MonadFail` instance for `CatchT`.
+* Allow `QuickCheck-2.13` in the test suite.
+
0.10.0
------
* Fix a regression in 0.9.0 whereby the non-IO effects in `bracket`'s `use`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/exceptions-0.10.0/exceptions.cabal
new/exceptions-0.10.4/exceptions.cabal
--- old/exceptions-0.10.0/exceptions.cabal 2018-03-11 15:52:28.000000000
+0100
+++ new/exceptions-0.10.4/exceptions.cabal 2001-09-09 03:46:40.000000000
+0200
@@ -1,6 +1,6 @@
name: exceptions
category: Control, Exceptions, Monad
-version: 0.10.0
+version: 0.10.4
cabal-version: >= 1.8
license: BSD3
license-file: LICENSE
@@ -12,7 +12,18 @@
copyright: Copyright (C) 2013-2015 Edward A. Kmett
Copyright (C) 2012 Google Inc.
build-type: Simple
-tested-with: GHC == 7.0.4, GHC == 7.2.2, GHC == 7.4.2, GHC == 7.6.3, GHC ==
7.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1
+tested-with: GHC == 7.0.4
+ , GHC == 7.2.2
+ , GHC == 7.4.2
+ , GHC == 7.6.3
+ , GHC == 7.8.4
+ , GHC == 7.10.3
+ , GHC == 8.0.2
+ , GHC == 8.2.2
+ , GHC == 8.4.4
+ , GHC == 8.6.5
+ , GHC == 8.8.1
+ , GHC == 8.10.1
synopsis: Extensible optionally-pure exceptions
description: Extensible optionally-pure exceptions.
@@ -31,15 +42,28 @@
type: git
location: git://github.com/ekmett/exceptions.git
+flag transformers-0-4
+ description: Use @transformers-0.4@ or later.
+ default: True
+
library
build-depends:
base >= 4.3 && < 5,
stm >= 2.2 && < 3,
- template-haskell >= 2.2 && < 2.14,
- transformers >= 0.2 && < 0.6,
- transformers-compat >= 0.3 && < 0.7,
+ template-haskell >= 2.2 && < 2.17,
mtl >= 2.0 && < 2.3
+ if !impl(ghc >= 8.0)
+ build-depends: fail == 4.9.*
+
+ if flag(transformers-0-4)
+ build-depends:
+ transformers >= 0.4 && < 0.6
+ else
+ build-depends:
+ transformers >= 0.2 && < 0.4,
+ transformers-compat >= 0.3 && < 0.7
+
exposed-modules:
Control.Monad.Catch
Control.Monad.Catch.Pure
@@ -49,21 +73,25 @@
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,
- transformers-compat,
- mtl >= 2.2,
+ mtl >= 2.0,
test-framework >= 0.8 && < 0.9,
test-framework-hunit >= 0.3 && < 0.4,
test-framework-quickcheck2 >= 0.3 && < 0.4,
- QuickCheck >= 2.5 && < 2.12
+ QuickCheck >= 2.5 && < 2.14
+
+ if flag(transformers-0-4)
+ build-depends:
+ transformers >= 0.4 && < 0.6
+ else
+ build-depends:
+ transformers >= 0.2 && < 0.4,
+ transformers-compat >= 0.3 && < 0.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/exceptions-0.10.0/src/Control/Monad/Catch/Pure.hs
new/exceptions-0.10.4/src/Control/Monad/Catch/Pure.hs
--- old/exceptions-0.10.0/src/Control/Monad/Catch/Pure.hs 2018-03-11
15:52:28.000000000 +0100
+++ new/exceptions-0.10.4/src/Control/Monad/Catch/Pure.hs 2001-09-09
03:46:40.000000000 +0200
@@ -54,6 +54,7 @@
import Control.Applicative
import Control.Monad.Catch
+import qualified Control.Monad.Fail as Fail
import Control.Monad.Reader as Reader
import Control.Monad.RWS
#if __GLASGOW_HASKELL__ < 710
@@ -109,6 +110,11 @@
CatchT m >>= k = CatchT $ m >>= \ea -> case ea of
Left e -> return (Left e)
Right a -> runCatchT (k a)
+#if !(MIN_VERSION_base(4,13,0))
+ fail = Fail.fail
+#endif
+
+instance Monad m => Fail.MonadFail (CatchT m) where
fail = CatchT . return . Left . toException . userError
instance MonadFix m => MonadFix (CatchT m) where
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/exceptions-0.10.0/src/Control/Monad/Catch.hs
new/exceptions-0.10.4/src/Control/Monad/Catch.hs
--- old/exceptions-0.10.0/src/Control/Monad/Catch.hs 2018-03-11
15:52:28.000000000 +0100
+++ new/exceptions-0.10.4/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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/exceptions-0.10.0/tests/Control/Monad/Catch/Tests.hs
new/exceptions-0.10.4/tests/Control/Monad/Catch/Tests.hs
--- old/exceptions-0.10.0/tests/Control/Monad/Catch/Tests.hs 2018-03-11
15:52:28.000000000 +0100
+++ new/exceptions-0.10.4/tests/Control/Monad/Catch/Tests.hs 2001-09-09
03:46:40.000000000 +0200
@@ -21,7 +21,7 @@
import Control.Monad.List (ListT(..))
import Control.Monad.Trans.Maybe (MaybeT(..))
import Control.Monad.Error (ErrorT(..))
-import Control.Monad.Except (ExceptT(..), runExceptT)
+import Control.Monad.Trans.Except (ExceptT(..), runExceptT)
import Control.Monad.STM (STM, atomically)
--import Control.Monad.Cont (ContT(..))
import Test.Framework (Test, testGroup)