Hello community,
here is the log from the commit of package ghc-profunctors for
openSUSE:Leap:15.2 checked in at 2020-02-19 18:40:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/ghc-profunctors (Old)
and /work/SRC/openSUSE:Leap:15.2/.ghc-profunctors.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-profunctors"
Wed Feb 19 18:40:38 2020 rev:13 rq:771415 version:5.5.1
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/ghc-profunctors/ghc-profunctors.changes
2020-01-15 15:02:31.237813089 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.ghc-profunctors.new.26092/ghc-profunctors.changes
2020-02-19 18:40:39.146149162 +0100
@@ -1,0 +2,35 @@
+Wed Nov 27 03:00:49 UTC 2019 - [email protected]
+
+- Update profunctors to version 5.5.1.
+ 5.5.1 [2019.11.26]
+ ------------------
+ * Add `Choice`, `Cochoice`, `Closed`, `Strong`, and `Costrong` instances for
+ `Data.Bifunctor.Sum`.
+
+-------------------------------------------------------------------
+Fri Nov 8 16:14:28 UTC 2019 - Peter Simons <[email protected]>
+
+- Drop obsolete group attributes.
+
+-------------------------------------------------------------------
+Sat Sep 7 02:01:38 UTC 2019 - [email protected]
+
+- Update profunctors to version 5.5.
+ 5.5 [2019.09.06]
+ ----------------
+ * Change the type of `roam` to make it actually useful.
+ * Add a `Cochoice` instance for `Forget`.
+
+-------------------------------------------------------------------
+Sat May 11 02:00:37 UTC 2019 - [email protected]
+
+- Update profunctors to version 5.4.
+ 5.4 [2019.05.10]
+ ----------------
+ * Add `wander`-like combinator `roam` to `Mapping`.
+ * Remove illegal `instance Choice (Costar w)`.
+ * Add `strong` combinator #62.
+ * Only depend on `semigroups` before GHC 8.0.
+ * Add `Contravariant` instances for `Star` and `Forget`.
+
+-------------------------------------------------------------------
Old:
----
profunctors-5.3.tar.gz
New:
----
profunctors-5.5.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-profunctors.spec ++++++
--- /var/tmp/diff_new_pack.cZzJb0/_old 2020-02-19 18:40:39.662149796 +0100
+++ /var/tmp/diff_new_pack.cZzJb0/_new 2020-02-19 18:40:39.662149796 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-profunctors
#
-# 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
@@ -18,11 +18,10 @@
%global pkg_name profunctors
Name: ghc-%{pkg_name}
-Version: 5.3
+Version: 5.5.1
Release: 0
Summary: Profunctors
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
BuildRequires: ghc-Cabal-devel
@@ -32,7 +31,6 @@
BuildRequires: ghc-contravariant-devel
BuildRequires: ghc-distributive-devel
BuildRequires: ghc-rpm-macros
-BuildRequires: ghc-semigroups-devel
BuildRequires: ghc-tagged-devel
BuildRequires: ghc-transformers-devel
@@ -41,7 +39,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}
++++++ profunctors-5.3.tar.gz -> profunctors-5.5.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/.hlint.yaml
new/profunctors-5.5.1/.hlint.yaml
--- old/profunctors-5.3/.hlint.yaml 2018-07-03 03:33:59.000000000 +0200
+++ new/profunctors-5.5.1/.hlint.yaml 2001-09-09 03:46:40.000000000 +0200
@@ -49,6 +49,16 @@
name: Collapse lambdas
within: Data.Profunctor.Unsafe
+- ignore:
+ name: Eta reduce
+ within: Data.Profunctor.Mapping
+
+- ignore:
+ name: "Use tuple-section"
+
+- ignore:
+ name: "Avoid lambda using `infix`"
+
- fixity: "infixr 9 #."
- fixity: "infixl 8 .#"
- fixity: "infixr 0 :->"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/.travis.yml
new/profunctors-5.5.1/.travis.yml
--- old/profunctors-5.3/.travis.yml 2018-07-03 03:33:59.000000000 +0200
+++ new/profunctors-5.5.1/.travis.yml 2001-09-09 03:46:40.000000000 +0200
@@ -1,151 +1,168 @@
# 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' '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.4
#
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:
- - "\x0313profunctors\x03/\x0306%{branch}\x03 \x0314%{commit}\x03
%{build_url} %{message}"
-
+ - "\"\\x0313profunctors\\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.1"
- env: GHCHEAD=true
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.6.1],
sources: [hvr-ghc]}}
- - compiler: "ghc-8.4.3"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3],
sources: [hvr-ghc]}}
- - compiler: "ghc-8.2.2"
- # env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,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.2,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.2,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.2,ghc-7.8.4],
sources: [hvr-ghc]}}
- - compiler: "ghc-head"
- env: GHCHEAD=true
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head],
sources: [hvr-ghc]}}
-
+ - compiler: ghc-8.8.1
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
+ - compiler: ghc-8.6.5
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
+ - compiler: ghc-8.4.4
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
+ - compiler: ghc-8.2.2
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
+ - compiler: ghc-8.0.2
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
+ - compiler: ghc-7.10.3
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-3.0"]}}
+ - compiler: ghc-7.8.4
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-3.0"]}}
+ - compiler: ghc-head
+ addons:
{"apt":{"sources":["hvr-ghc"],"packages":["ghc-head","cabal-install-head"]}}
allow_failures:
- - compiler: "ghc-head"
- - compiler: "ghc-8.6.1"
-
+ - compiler: ghc-head
before_install:
- - HC=${CC}
- - HCPKG=${HC/ghc/ghc-pkg}
+ - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
+ - WITHCOMPILER="-w $HC"
+ - HCPKG="$HC-pkg"
- unset CC
- - export HLINTVER=2.1.3
- - mkdir ~/.hlint
- - curl -L
https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz
| tar -xz --strip-components=1 -C ~/.hlint
- - ROOTDIR=$(pwd)
- - mkdir -p $HOME/.local/bin
- - "PATH=~/.hlint:/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}
- - UNCONSTRAINED=${UNCONSTRAINED-true}
- - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
- - 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
- - |
- 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
+ - TEST=--enable-tests
+ - BENCH=--enable-benchmarks
+ - HEADHACKAGE=false
+ - if [ $HCNUMVER -gt 80801 ] ; 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
+ 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 $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
- - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
- - "printf 'packages: \".\"\\n' > cabal.project"
- - touch cabal.project.local
- - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list
--simple-output); do echo $pkg | 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
+ - if [ $HCNUMVER -ge 80800 ] && [ $HCNUMVER -lt 80802 ] ; then (cd /tmp &&
${CABAL} v2-install $WITHCOMPILER -j2 hlint --constraint='hlint ==2.1.*' |
color_cabal_output) ; fi
+ # 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 -- '^(profunctors)$' || 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
- - 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 $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/profunctors-*.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: profunctors-*/*.cabal\\n' > cabal.project"
- - touch cabal.project.local
- - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list
--simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/
installed/' >> cabal.project.local; done; fi"
+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
+ - PKGDIR_profunctors="$(find . -maxdepth 1 -type d -regex
'.*/profunctors-[0-9.]*')"
+ # Generate cabal.project
+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
+ - touch cabal.project
+ - |
+ echo "packages: ${PKGDIR_profunctors}" >> cabal.project
+ - |
+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed
's/-[^-]*$//' | (grep -vE -- '^(profunctors)$' || 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
-
- # cabal check
- - (cd profunctors-* && cabal check)
-
- # haddock
- - rm -rf ./dist-newstyle
- - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else
echo "Skipping haddock generation";fi
-
- # hlint
- - hlint --version
- - (cd profunctors-* && hlint src)
+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
+ # HLint..
+ - if [ $HCNUMVER -ge 80800 ] && [ $HCNUMVER -lt 80802 ] ; then (cd
${PKGDIR_profunctors} && hlint src) ; fi
+ # cabal check...
+ - (cd ${PKGDIR_profunctors} && ${CABAL} -vnormal check)
+ # haddock...
+ - ${CABAL} v2-haddock $WITHCOMPILER ${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","cabal.project"]
+# REGENDATA
["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"]
# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/CHANGELOG.markdown
new/profunctors-5.5.1/CHANGELOG.markdown
--- old/profunctors-5.3/CHANGELOG.markdown 2018-07-03 03:33:59.000000000
+0200
+++ new/profunctors-5.5.1/CHANGELOG.markdown 2001-09-09 03:46:40.000000000
+0200
@@ -1,3 +1,21 @@
+5.5.1 [2019.11.26]
+------------------
+* Add `Choice`, `Cochoice`, `Closed`, `Strong`, and `Costrong` instances for
+ `Data.Bifunctor.Sum`.
+
+5.5 [2019.09.06]
+----------------
+* Change the type of `roam` to make it actually useful.
+* Add a `Cochoice` instance for `Forget`.
+
+5.4 [2019.05.10]
+----------------
+* Add `wander`-like combinator `roam` to `Mapping`.
+* Remove illegal `instance Choice (Costar w)`.
+* Add `strong` combinator #62.
+* Only depend on `semigroups` before GHC 8.0.
+* Add `Contravariant` instances for `Star` and `Forget`.
+
5.3 [2018.07.02]
----------------
* Generalize the types of `(#.)` and `(.#)`. Before, they were:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/profunctors.cabal
new/profunctors-5.5.1/profunctors.cabal
--- old/profunctors-5.3/profunctors.cabal 2018-07-03 03:33:59.000000000
+0200
+++ new/profunctors-5.5.1/profunctors.cabal 2001-09-09 03:46:40.000000000
+0200
@@ -1,6 +1,6 @@
name: profunctors
category: Control, Categories
-version: 5.3
+version: 5.5.1
license: BSD3
cabal-version: >= 1.10
license-file: LICENSE
@@ -16,8 +16,9 @@
, GHC == 7.10.3
, GHC == 8.0.2
, GHC == 8.2.2
- , GHC == 8.4.3
- , GHC == 8.6.1
+ , GHC == 8.4.4
+ , GHC == 8.6.5
+ , GHC == 8.8.1
build-type: Simple
extra-source-files:
.ghci
@@ -40,10 +41,12 @@
comonad >= 4 && < 6,
contravariant >= 1 && < 2,
distributive >= 0.4.4 && < 1,
- semigroups >= 0.11 && < 0.19,
tagged >= 0.4.4 && < 1,
transformers >= 0.2 && < 0.6
+ if !impl(ghc >= 8.0)
+ build-depends: semigroups >= 0.11 && < 0.20
+
exposed-modules:
Data.Profunctor
Data.Profunctor.Adjunction
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/src/Data/Profunctor/Adjunction.hs
new/profunctors-5.5.1/src/Data/Profunctor/Adjunction.hs
--- old/profunctors-5.3/src/Data/Profunctor/Adjunction.hs 2018-07-03
03:33:59.000000000 +0200
+++ new/profunctors-5.5.1/src/Data/Profunctor/Adjunction.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,5 +1,4 @@
{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE RankNTypes #-}
-----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/src/Data/Profunctor/Choice.hs
new/profunctors-5.5.1/src/Data/Profunctor/Choice.hs
--- old/profunctors-5.3/src/Data/Profunctor/Choice.hs 2018-07-03
03:33:59.000000000 +0200
+++ new/profunctors-5.5.1/src/Data/Profunctor/Choice.hs 2001-09-09
03:46:40.000000000 +0200
@@ -33,8 +33,9 @@
import Control.Comonad
import Data.Bifunctor.Joker (Joker(..))
import Data.Bifunctor.Product (Product(..))
+import Data.Bifunctor.Sum (Sum(..))
import Data.Bifunctor.Tannen (Tannen(..))
-import Data.Monoid hiding (Product)
+import Data.Monoid hiding (Product, Sum)
import Data.Profunctor.Adjunction
import Data.Profunctor.Monad
import Data.Profunctor.Strong
@@ -73,8 +74,8 @@
-- assocE ('Right' c) = 'Right' ('Right' c)
-- unassocE :: 'Either' a ('Either' b c) -> 'Either' ('Either' a b) c
-- unassocE ('Left' a) = 'Left' ('Left' a)
- -- unassocE ('Right' ('Left' b) = 'Left' ('Right' b)
- -- unassocE ('Right' ('Right' c)) = 'Right' c)
+ -- unassocE ('Right' ('Left' b)) = 'Left' ('Right' b)
+ -- unassocE ('Right' ('Right' c)) = 'Right' c
-- @
left' :: p a b -> p (Either a c) (Either b c)
left' = dimap (either Right Left) (either Right Left) . right'
@@ -94,8 +95,8 @@
-- assocE ('Right' c) = 'Right' ('Right' c)
-- unassocE :: 'Either' a ('Either' b c) -> 'Either' ('Either' a b) c
-- unassocE ('Left' a) = 'Left' ('Left' a)
- -- unassocE ('Right' ('Left' b) = 'Left' ('Right' b)
- -- unassocE ('Right' ('Right' c)) = 'Right' c)
+ -- unassocE ('Right' ('Left' b)) = 'Left' ('Right' b)
+ -- unassocE ('Right' ('Right' c)) = 'Right' c
-- @
right' :: p a b -> p (Either c a) (Either c b)
right' = dimap (either Right Left) (either Right Left) . left'
@@ -128,13 +129,6 @@
right' = right
{-# INLINE right' #-}
--- NB: This instance is highly questionable
-instance Traversable w => Choice (Costar w) where
- left' (Costar wab) = Costar (either Right Left . fmap wab . traverse (either
Right Left))
- {-# INLINE left' #-}
- right' (Costar wab) = Costar (fmap wab . sequence)
- {-# INLINE right' #-}
-
instance Choice Tagged where
left' (Tagged b) = Tagged (Left b)
{-# INLINE left' #-}
@@ -165,6 +159,14 @@
right' (Pair p q) = Pair (right' p) (right' q)
{-# INLINE right' #-}
+instance (Choice p, Choice q) => Choice (Sum p q) where
+ left' (L2 p) = L2 (left' p)
+ left' (R2 q) = R2 (left' q)
+ {-# INLINE left' #-}
+ right' (L2 p) = L2 (right' p)
+ right' (R2 q) = R2 (right' q)
+ {-# INLINE right' #-}
+
instance (Functor f, Choice p) => Choice (Tannen f p) where
left' (Tannen fp) = Tannen (fmap left' fp)
{-# INLINE left' #-}
@@ -304,8 +306,8 @@
-- assocE ('Right' c) = 'Right' ('Right' c)
-- unassocE :: 'Either' a ('Either' b c) -> 'Either' ('Either' a b) c
-- unassocE ('Left' a) = 'Left' ('Left' a)
- -- unassocE ('Right' ('Left' b) = 'Left' ('Right' b)
- -- unassocE ('Right' ('Right' c)) = 'Right' c)
+ -- unassocE ('Right' ('Left' b)) = 'Left' ('Right' b)
+ -- unassocE ('Right' ('Right' c)) = 'Right' c
-- @
unleft :: p (Either a d) (Either b d) -> p a b
unleft = unright . dimap (either Right Left) (either Right Left)
@@ -325,8 +327,8 @@
-- assocE ('Right' c) = 'Right' ('Right' c)
-- unassocE :: 'Either' a ('Either' b c) -> 'Either' ('Either' a b) c
-- unassocE ('Left' a) = 'Left' ('Left' a)
- -- unassocE ('Right' ('Left' b) = 'Left' ('Right' b)
- -- unassocE ('Right' ('Right' c)) = 'Right' c)
+ -- unassocE ('Right' ('Left' b)) = 'Left' ('Right' b)
+ -- unassocE ('Right' ('Right' c)) = 'Right' c
-- @
unright :: p (Either d a) (Either d b) -> p a b
unright = unleft . dimap (either Right Left) (either Right Left)
@@ -356,6 +358,16 @@
unleft (Pair p q) = Pair (unleft p) (unleft q)
unright (Pair p q) = Pair (unright p) (unright q)
+instance (Cochoice p, Cochoice q) => Cochoice (Sum p q) where
+ unleft (L2 p) = L2 (unleft p)
+ unleft (R2 q) = R2 (unleft q)
+ unright (L2 p) = L2 (unright p)
+ unright (R2 q) = R2 (unright q)
+
+instance Cochoice (Forget r) where
+ unleft (Forget f) = Forget (f . Left)
+ unright (Forget f) = Forget (f . Right)
+
----------------------------------------------------------------------------
-- * CotambaraSum
----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/src/Data/Profunctor/Closed.hs
new/profunctors-5.5.1/src/Data/Profunctor/Closed.hs
--- old/profunctors-5.3/src/Data/Profunctor/Closed.hs 2018-07-03
03:33:59.000000000 +0200
+++ new/profunctors-5.5.1/src/Data/Profunctor/Closed.hs 2001-09-09
03:46:40.000000000 +0200
@@ -30,6 +30,7 @@
import Control.Category
import Control.Comonad
import Data.Bifunctor.Product (Product(..))
+import Data.Bifunctor.Sum (Sum(..))
import Data.Bifunctor.Tannen (Tannen(..))
import Data.Coerce (Coercible, coerce)
import Data.Distributive
@@ -38,7 +39,7 @@
import Data.Profunctor.Strong
import Data.Profunctor.Types
import Data.Profunctor.Unsafe
-import Data.Semigroup hiding (Product)
+import Data.Semigroup hiding (Product, Sum)
import Data.Tagged
import Data.Tuple
import Prelude hiding ((.),id)
@@ -67,10 +68,10 @@
closed = (.)
instance Functor f => Closed (Costar f) where
- closed (Costar fab) = Costar $ \fxa x -> fab (fmap ($x) fxa)
+ closed (Costar fab) = Costar $ \fxa x -> fab (fmap ($ x) fxa)
instance Functor f => Closed (Cokleisli f) where
- closed (Cokleisli fab) = Cokleisli $ \fxa x -> fab (fmap ($x) fxa)
+ closed (Cokleisli fab) = Cokleisli $ \fxa x -> fab (fmap ($ x) fxa)
instance Distributive f => Closed (Star f) where
closed (Star afb) = Star $ \xa -> distribute $ \x -> afb (xa x)
@@ -81,6 +82,10 @@
instance (Closed p, Closed q) => Closed (Product p q) where
closed (Pair p q) = Pair (closed p) (closed q)
+instance (Closed p, Closed q) => Closed (Sum p q) where
+ closed (L2 p) = L2 (closed p)
+ closed (R2 q) = R2 (closed q)
+
instance (Functor f, Closed p) => Closed (Tannen f p) where
closed (Tannen fp) = Tannen (fmap closed fp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/src/Data/Profunctor/Mapping.hs
new/profunctors-5.5.1/src/Data/Profunctor/Mapping.hs
--- old/profunctors-5.3/src/Data/Profunctor/Mapping.hs 2018-07-03
03:33:59.000000000 +0200
+++ new/profunctors-5.5.1/src/Data/Profunctor/Mapping.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,7 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE DeriveFunctor #-}
-----------------------------------------------------------------------------
-- |
-- Copyright : (C) 2015-2018 Edward Kmett
@@ -15,6 +16,8 @@
( Mapping(..)
, CofreeMapping(..)
, FreeMapping(..)
+ -- * Traversing in terms of Mapping
+ , wanderMapping
-- * Closed in terms of Mapping
, traverseMapping
, closedMapping
@@ -44,16 +47,51 @@
-- 'dimap' 'Data.Functor.Identity.Identity'
'Data.Functor.Identity.runIdentity' '.' 'map'' ≡ 'id'
-- @
map' :: Functor f => p a b -> p (f a) (f b)
+ map' = roam fmap
+
+ roam :: ((a -> b) -> s -> t)
+ -> p a b -> p s t
+ roam f = dimap (\s -> Bar $ \ab -> f ab s) lent . map'
+
+newtype Bar t b a = Bar
+ { runBar :: (a -> b) -> t }
+ deriving Functor
+
+lent :: Bar t a a -> t
+lent m = runBar m id
instance Mapping (->) where
map' = fmap
+ roam f = f
instance (Monad m, Distributive m) => Mapping (Kleisli m) where
map' (Kleisli f) = Kleisli (collect f)
+#if __GLASGOW_HASKELL__ >= 710
+ roam f = Kleisli #. genMap f .# runKleisli
+#else
+ -- We could actually use this implementation everywhere, but it's kind of a
+ -- warty mess, and there have been rumblings of WrappedMonad deprecation.
+ -- If/when GHC 7.8 moves out of the support window, this will vanish in a
+ -- puff of cleanup.
+ roam f = (Kleisli . (unwrapMonad .)) #. genMapW f .# ((WrapMonad .) .
runKleisli)
+ where
+ genMapW
+ :: (Monad m, Distributive m)
+ => ((a -> b) -> s -> t)
+ -> (a -> WrappedMonad m b) -> s -> WrappedMonad m t
+ genMapW abst amb s = WrapMonad $ (\ab -> abst ab s) <$> distribute
(unwrapMonad #. amb)
+#endif
+
+genMap :: Distributive f => ((a -> b) -> s -> t) -> (a -> f b) -> s -> f t
+genMap abst afb s = fmap (\ab -> abst ab s) (distribute afb)
-- see <https://github.com/ekmett/distributive/issues/12>
instance (Applicative m, Distributive m) => Mapping (Star m) where
map' (Star f) = Star (collect f)
+ roam f = Star #. genMap f .# runStar
+
+wanderMapping :: Mapping p => (forall f. Applicative f => (a -> f b) -> s -> f
t) -> p a b -> p s t
+wanderMapping f = roam ((runIdentity .) #. f .# (Identity .))
traverseMapping :: (Mapping p, Functor f) => p a b -> p (f a) (f b)
traverseMapping = map'
@@ -79,10 +117,14 @@
instance Profunctor p => Traversing (CofreeMapping p) where
traverse' = map'
+ wander f = roam $ (runIdentity .) #. f .# (Identity .)
instance Profunctor p => Mapping (CofreeMapping p) where
-- !@(#*&() Compose isn't representational in its second arg or we could use
#. and .#
map' (CofreeMapping p) = CofreeMapping (dimap Compose getCompose p)
+ roam f (CofreeMapping p) =
+ CofreeMapping $
+ dimap (Compose #. fmap (\s -> Bar $ \ab -> f ab s)) (fmap lent .#
getCompose) p
instance ProfunctorFunctor CofreeMapping where
promap f (CofreeMapping p) = CofreeMapping (f p)
@@ -113,6 +155,7 @@
instance Traversing (FreeMapping p) where
traverse' = map'
+ wander f = roam ((runIdentity .) #. f .# (Identity .))
instance Mapping (FreeMapping p) where
map' (FreeMapping l m r) = FreeMapping (fmap l .# getCompose) m (Compose #.
fmap r)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/src/Data/Profunctor/Rep.hs
new/profunctors-5.5.1/src/Data/Profunctor/Rep.hs
--- old/profunctors-5.3/src/Data/Profunctor/Rep.hs 2018-07-03
03:33:59.000000000 +0200
+++ new/profunctors-5.5.1/src/Data/Profunctor/Rep.hs 2001-09-09
03:46:40.000000000 +0200
@@ -139,7 +139,7 @@
-- | Default definition for 'closed' given that @p@ is 'Corepresentable'
closedCorep :: Corepresentable p => p a b -> p (x -> a) (x -> b)
-closedCorep p = cotabulate $ \fs x -> cosieve p (fmap ($x) fs)
+closedCorep p = cotabulate $ \fs x -> cosieve p (fmap ($ x) fs)
instance Corepresentable (->) where
type Corep (->) = Identity
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/src/Data/Profunctor/Sieve.hs
new/profunctors-5.5.1/src/Data/Profunctor/Sieve.hs
--- old/profunctors-5.3/src/Data/Profunctor/Sieve.hs 2018-07-03
03:33:59.000000000 +0200
+++ new/profunctors-5.5.1/src/Data/Profunctor/Sieve.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,7 +1,6 @@
{-# LANGUAGE UndecidableInstances #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE Trustworthy #-}
-----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/src/Data/Profunctor/Strong.hs
new/profunctors-5.5.1/src/Data/Profunctor/Strong.hs
--- old/profunctors-5.3/src/Data/Profunctor/Strong.hs 2018-07-03
03:33:59.000000000 +0200
+++ new/profunctors-5.5.1/src/Data/Profunctor/Strong.hs 2001-09-09
03:46:40.000000000 +0200
@@ -19,6 +19,7 @@
-- * Strength
Strong(..)
, uncurry'
+ , strong
, Tambara(..)
, tambara, untambara
, Pastro(..)
@@ -38,13 +39,14 @@
import Control.Monad.Fix
import Data.Bifunctor.Clown (Clown(..))
import Data.Bifunctor.Product (Product(..))
+import Data.Bifunctor.Sum (Sum(..))
import Data.Bifunctor.Tannen (Tannen(..))
import Data.Functor.Contravariant (Contravariant(..))
import Data.Profunctor.Adjunction
import Data.Profunctor.Monad
import Data.Profunctor.Types
import Data.Profunctor.Unsafe
-import Data.Semigroup hiding (Product)
+import Data.Semigroup hiding (Product, Sum)
import Data.Tagged
import Data.Tuple
import Prelude hiding (id,(.))
@@ -60,7 +62,7 @@
-- This describes profunctor strength with respect to the product structure
-- of Hask.
--
--- <http://www-kb.is.s.u-tokyo.ac.jp/~asada/papers/arrStrMnd.pdf>
+-- <http://www.riec.tohoku.ac.jp/~asada/papers/arrStrMnd.pdf>
--
class Profunctor p => Strong p where
-- | Laws:
@@ -68,7 +70,7 @@
-- @
-- 'first'' ≡ 'dimap' 'swap' 'swap' '.' 'second''
-- 'lmap' 'fst' ≡ 'rmap' 'fst' '.' 'first''
- -- 'lmap' ('second' f) '.' 'first'' ≡ 'rmap' ('second' f) '.' 'first'
+ -- 'lmap' ('second'' f) '.' 'first'' ≡ 'rmap' ('second'' f) '.' 'first''
-- 'first'' '.' 'first'' ≡ 'dimap' assoc unassoc '.' 'first'' where
-- assoc ((a,b),c) = (a,(b,c))
-- unassoc (a,(b,c)) = ((a,b),c)
@@ -81,7 +83,7 @@
-- @
-- 'second'' ≡ 'dimap' 'swap' 'swap' '.' 'first''
-- 'lmap' 'snd' ≡ 'rmap' 'snd' '.' 'second''
- -- 'lmap' ('first' f) '.' 'second'' ≡ 'rmap' ('first' f) '.' 'second''
+ -- 'lmap' ('first'' f) '.' 'second'' ≡ 'rmap' ('first'' f) '.' 'second''
-- 'second'' '.' 'second'' ≡ 'dimap' unassoc assoc '.' 'second'' where
-- assoc ((a,b),c) = (a,(b,c))
-- unassoc (a,(b,c)) = ((a,b),c)
@@ -95,6 +97,9 @@
uncurry' = rmap (\(f,x) -> f x) . first'
{-# INLINE uncurry' #-}
+strong :: Strong p => (a -> b -> c) -> p a b -> p a c
+strong f x = dimap (\a -> (a, a)) (\(b, a) -> f a b) (first' x)
+
instance Strong (->) where
first' ab ~(a, c) = (ab a, c)
{-# INLINE first' #-}
@@ -142,6 +147,14 @@
second' (Pair p q) = Pair (second' p) (second' q)
{-# INLINE second' #-}
+instance (Strong p, Strong q) => Strong (Sum p q) where
+ first' (L2 p) = L2 (first' p)
+ first' (R2 q) = R2 (first' q)
+ {-# INLINE first' #-}
+ second' (L2 p) = L2 (second' p)
+ second' (R2 q) = R2 (second' q)
+ {-# INLINE second' #-}
+
instance (Functor f, Strong p) => Strong (Tannen f p) where
first' (Tannen fp) = Tannen (fmap first' fp)
{-# INLINE first' #-}
@@ -374,6 +387,12 @@
unfirst (Pair p q) = Pair (unfirst p) (unfirst q)
unsecond (Pair p q) = Pair (unsecond p) (unsecond q)
+instance (Costrong p, Costrong q) => Costrong (Sum p q) where
+ unfirst (L2 p) = L2 (unfirst p)
+ unfirst (R2 q) = R2 (unfirst q)
+ unsecond (L2 p) = L2 (unsecond p)
+ unsecond (R2 q) = R2 (unsecond q)
+
----------------------------------------------------------------------------
-- * Cotambara
----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/profunctors-5.3/src/Data/Profunctor/Types.hs
new/profunctors-5.5.1/src/Data/Profunctor/Types.hs
--- old/profunctors-5.3/src/Data/Profunctor/Types.hs 2018-07-03
03:33:59.000000000 +0200
+++ new/profunctors-5.5.1/src/Data/Profunctor/Types.hs 2001-09-09
03:46:40.000000000 +0200
@@ -39,6 +39,7 @@
import Data.Coerce (Coercible, coerce)
import Data.Distributive
import Data.Foldable
+import Data.Functor.Contravariant
import Data.Monoid hiding (Product)
import Data.Profunctor.Unsafe
import Data.Traversable
@@ -98,6 +99,10 @@
id = Star return
Star f . Star g = Star $ g >=> f
+instance Contravariant f => Contravariant (Star f a) where
+ contramap f (Star g) = Star (contramap f . g)
+ {-# INLINE contramap #-}
+
------------------------------------------------------------------------------
-- Costar
------------------------------------------------------------------------------
@@ -214,3 +219,7 @@
instance Traversable (Forget r a) where
traverse _ (Forget k) = pure (Forget k)
{-# INLINE traverse #-}
+
+instance Contravariant (Forget r a) where
+ contramap _ (Forget k) = Forget k
+ {-# INLINE contramap #-}
