Hello community,
here is the log from the commit of package ghc-semigroupoids for
openSUSE:Factory checked in at 2019-08-29 17:22:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-semigroupoids (Old)
and /work/SRC/openSUSE:Factory/.ghc-semigroupoids.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-semigroupoids"
Thu Aug 29 17:22:43 2019 rev:12 rq:726816 version:5.3.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-semigroupoids/ghc-semigroupoids.changes
2019-06-19 21:12:47.562765376 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-semigroupoids.new.7948/ghc-semigroupoids.changes
2019-08-29 17:22:45.555315073 +0200
@@ -1,0 +2,9 @@
+Wed Aug 28 02:02:29 UTC 2019 - [email protected]
+
+- Update semigroupoids to version 5.3.3.
+ 5.3.3 [2019.08.27]
+ ------------------
+ * Add `Alt` and `Plus` instances for `HashMap` from the
`unordered-containers`
+ package.
+
+-------------------------------------------------------------------
Old:
----
semigroupoids-5.3.2.tar.gz
semigroupoids.cabal
New:
----
semigroupoids-5.3.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-semigroupoids.spec ++++++
--- /var/tmp/diff_new_pack.h2Rxud/_old 2019-08-29 17:22:46.399314932 +0200
+++ /var/tmp/diff_new_pack.h2Rxud/_new 2019-08-29 17:22:46.407314931 +0200
@@ -19,14 +19,13 @@
%global pkg_name semigroupoids
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 5.3.2
+Version: 5.3.3
Release: 0
Summary: Semigroupoids: Category sans id
License: BSD-2-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/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-base-orphans-devel
BuildRequires: ghc-bifunctors-devel
@@ -96,7 +95,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ semigroupoids-5.3.2.tar.gz -> semigroupoids-5.3.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/semigroupoids-5.3.2/.travis.yml
new/semigroupoids-5.3.3/.travis.yml
--- old/semigroupoids-5.3.2/.travis.yml 2001-09-09 03:46:40.000000000 +0200
+++ new/semigroupoids-5.3.3/.travis.yml 2001-09-09 03:46:40.000000000 +0200
@@ -1,159 +1,178 @@
# This Travis job script has been generated by a script via
#
-# runghc make_travis_yml_2.hs '-o' '.travis.yml' '--ghc-head'
'--irc-channel=irc.freenode.org#haskell-lens' '--no-no-tests-no-bench'
'--no-unconstrained' '--allow-failure=7.0.4' '--allow-failure=7.2.2'
'cabal.project'
+# haskell-ci '--output=.travis.yml' '--config=cabal.haskell-ci'
'cabal.project'
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
+# version: 0.3.20190425
+#
language: c
-sudo: false
-
+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:
- - "\x0313semigroupoids\x03/\x0306%{branch}\x03 \x0314%{commit}\x03
%{build_url} %{message}"
-
+ - "\"\\x0313semigroupoids\\x03/\\x0306%{branch}\\x03
\\x0314%{commit}\\x03 %{build_url} %{message}\""
cache:
directories:
- $HOME/.cabal/packages
- $HOME/.cabal/store
-
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
-
+ - 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
matrix:
include:
- - compiler: "ghc-8.6.3"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3],
sources: [hvr-ghc]}}
- - compiler: "ghc-8.4.4"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4],
sources: [hvr-ghc]}}
- - compiler: "ghc-8.2.2"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2],
sources: [hvr-ghc]}}
- - compiler: "ghc-8.0.2"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2],
sources: [hvr-ghc]}}
- - compiler: "ghc-7.10.3"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3],
sources: [hvr-ghc]}}
- - compiler: "ghc-7.8.4"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4],
sources: [hvr-ghc]}}
- - compiler: "ghc-7.6.3"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.6.3],
sources: [hvr-ghc]}}
- - compiler: "ghc-7.4.2"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.4.2],
sources: [hvr-ghc]}}
- - compiler: "ghc-7.2.2"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.2.2],
sources: [hvr-ghc]}}
- - compiler: "ghc-7.0.4"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.0.4],
sources: [hvr-ghc]}}
- - compiler: "ghc-head"
+ - 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
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
+ - compiler: ghc-8.2.2
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
+ - compiler: ghc-8.0.2
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
+ - compiler: ghc-7.10.3
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}
+ - compiler: ghc-7.8.4
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}
+ - compiler: ghc-7.6.3
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-2.4"]}}
+ - compiler: ghc-7.4.2
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.4.2","cabal-install-2.4"]}}
+ - compiler: ghc-7.2.2
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.2.2","cabal-install-2.4"]}}
+ - compiler: ghc-7.0.4
+ 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
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head],
sources: [hvr-ghc]}}
-
allow_failures:
- - compiler: "ghc-head"
- - 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.8.1
before_install:
- - HC=${CC}
- - HCPKG=${HC/ghc/ghc-pkg}
+ - HC=$(echo "/opt/$CC/bin/ghc" | 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"
+ - 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/') ))
- 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}
- - UNCONSTRAINED=${UNCONSTRAINED-true}
- - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
+ - TEST=--enable-tests
+ - BENCH=--enable-benchmarks
- 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
+ - rm -f $CABALHOME/config
+ - |
+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
+ echo "remote-build-reporting: anonymous" >> $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
- |
if $GHCHEAD; then
- sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config
- for pkg in $($HCPKG list --simple-output); do pkg=$(echo $pkg | sed
's/-[^-]*$//'); sed -i "s/allow-newer: /allow-newer: *:$pkg, /"
${HOME}/.cabal/config; done
-
- 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
-
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
-
- cabal new-update head.hackage -v
+ 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 " secure: True"
>> $CABALHOME/config
+ echo " root-keys:
07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >>
$CABALHOME/config
+ echo "
2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >>
$CABALHOME/config
+ echo "
8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >>
$CABALHOME/config
+ echo " key-threshold: 3"
>> $CABALHOME/config
fi
- - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
- - "printf 'packages: \".\"\\n' > cabal.project"
- - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
- - touch cabal.project.local
- - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list
--simple-output); do echo $pkg | grep -vw -- semigroupoids | sed
's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local;
done; fi"
+ - 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
+ - |
+ echo "write-ghc-environment-files: always" >> cabal.project
+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed
's/-[^-]*$//' | grep -vE -- '^(semigroupoids)$' | 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
- - 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.
+ - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
+ - ${CABAL} v2-freeze -w ${HC} ${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
script:
- # test that source-distributions can be generated
- - cabal new-sdist all
+ - 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: semigroupoids-*/*.cabal\\n' > cabal.project"
- - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
- - touch cabal.project.local
- - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list
--simple-output); do echo $pkg | grep -vw -- semigroupoids | sed
's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local;
done; fi"
+ # Generate cabal.project
+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
+ - touch cabal.project
+ - |
+ echo 'packages: "semigroupoids-*/*.cabal"' >> cabal.project
+ - |
+ echo "write-ghc-environment-files: always" >> cabal.project
+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed
's/-[^-]*$//' | grep -vE -- '^(semigroupoids)$' | 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 semigroupoids-* && cabal check)
-
- # haddock
- - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else
echo "Skipping haddock generation";fi
+ - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
+ # Testing...
+ - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
+ # cabal check...
+ - (cd semigroupoids-* && ${CABAL} -vnormal check)
+ # haddock...
+ - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
-# REGENDATA
["-o",".travis.yml","--ghc-head","--irc-channel=irc.freenode.org#haskell-lens","--no-no-tests-no-bench","--no-unconstrained","--allow-failure=7.0.4","--allow-failure=7.2.2","cabal.project"]
+# REGENDATA
["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"]
# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/semigroupoids-5.3.2/CHANGELOG.markdown
new/semigroupoids-5.3.3/CHANGELOG.markdown
--- old/semigroupoids-5.3.2/CHANGELOG.markdown 2001-09-09 03:46:40.000000000
+0200
+++ new/semigroupoids-5.3.3/CHANGELOG.markdown 2001-09-09 03:46:40.000000000
+0200
@@ -1,3 +1,8 @@
+5.3.3 [2019.08.27]
+------------------
+* Add `Alt` and `Plus` instances for `HashMap` from the `unordered-containers`
+ package.
+
5.3.2 [2019.01.04]
------------------
* Bump the lower bound on `semigroups` to 0.16.2, and avoid incurring
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/semigroupoids-5.3.2/semigroupoids.cabal
new/semigroupoids-5.3.3/semigroupoids.cabal
--- old/semigroupoids-5.3.2/semigroupoids.cabal 2001-09-09 03:46:40.000000000
+0200
+++ new/semigroupoids-5.3.3/semigroupoids.cabal 2001-09-09 03:46:40.000000000
+0200
@@ -1,6 +1,6 @@
name: semigroupoids
category: Control, Comonads
-version: 5.3.2
+version: 5.3.3
license: BSD3
cabal-version: >= 1.8
license-file: LICENSE
@@ -19,7 +19,8 @@
, GHC == 8.0.2
, GHC == 8.2.2
, GHC == 8.4.4
- , GHC == 8.6.3
+ , GHC == 8.6.5
+ , GHC == 8.8.1
build-type: Custom
synopsis: Semigroupoids: Category sans id
extra-source-files:
@@ -145,7 +146,7 @@
transformers-compat >= 0.5 && < 0.7
if impl(ghc >= 7.0 && < 7.2)
- build-depends: generic-deriving >= 1.11 && < 1.13
+ build-depends: generic-deriving >= 1.11 && < 1.14
if impl(ghc >= 7.2 && < 7.6)
build-depends: ghc-prim
@@ -169,7 +170,7 @@
build-depends: tagged >= 0.8.5 && < 1
if flag(unordered-containers)
- build-depends: hashable >= 1.1 && < 1.3,
+ build-depends: hashable >= 1.1 && < 1.4,
unordered-containers >= 0.2 && < 0.3
hs-source-dirs: src
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/semigroupoids-5.3.2/src/Data/Functor/Alt.hs
new/semigroupoids-5.3.3/src/Data/Functor/Alt.hs
--- old/semigroupoids-5.3.2/src/Data/Functor/Alt.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/semigroupoids-5.3.3/src/Data/Functor/Alt.hs 2001-09-09
03:46:40.000000000 +0200
@@ -75,6 +75,13 @@
import Data.Proxy
#endif
+#ifdef MIN_VERSION_unordered_containers
+import Data.Hashable
+import Data.HashMap.Lazy (HashMap)
+import qualified Data.HashMap.Lazy as HashMap
+import Prelude (Eq)
+#endif
+
#ifdef MIN_VERSION_generic_deriving
import Generics.Deriving.Base
#else
@@ -200,6 +207,11 @@
(<!>) = mappend
#endif
+#ifdef MIN_VERSION_unordered_containers
+instance (Hashable k, Eq k) => Alt (HashMap k) where
+ (<!>) = HashMap.union
+#endif
+
instance Alt NonEmpty where
(a :| as) <!> ~(b :| bs) = a :| (as ++ b : bs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/semigroupoids-5.3.2/src/Data/Functor/Bind/Class.hs
new/semigroupoids-5.3.3/src/Data/Functor/Bind/Class.hs
--- old/semigroupoids-5.3.2/src/Data/Functor/Bind/Class.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/semigroupoids-5.3.3/src/Data/Functor/Bind/Class.hs 2001-09-09
03:46:40.000000000 +0200
@@ -403,7 +403,7 @@
empty = WrapApplicative empty
WrapApplicative a <|> WrapApplicative b = WrapApplicative (a <|> b)
--- | Transform a Apply into an Applicative by adding a unit.
+-- | Transform an Apply into an Applicative by adding a unit.
newtype MaybeApply f a = MaybeApply { runMaybeApply :: Either (f a) a }
instance Functor f => Functor (MaybeApply f) where
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/semigroupoids-5.3.2/src/Data/Functor/Plus.hs
new/semigroupoids-5.3.3/src/Data/Functor/Plus.hs
--- old/semigroupoids-5.3.2/src/Data/Functor/Plus.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/semigroupoids-5.3.3/src/Data/Functor/Plus.hs 2001-09-09
03:46:40.000000000 +0200
@@ -60,6 +60,12 @@
import Data.Proxy
#endif
+#ifdef MIN_VERSION_unordered_containers
+import Data.Hashable
+import Data.HashMap.Lazy (HashMap)
+import qualified Data.HashMap.Lazy as HashMap
+#endif
+
#ifdef MIN_VERSION_generic_deriving
import Generics.Deriving.Base
#else
@@ -120,6 +126,11 @@
zero = mempty
#endif
+#ifdef MIN_VERSION_unordered_containers
+instance (Hashable k, Eq k) => Plus (HashMap k) where
+ zero = HashMap.empty
+#endif
+
instance Alternative f => Plus (WrappedApplicative f) where
zero = empty
