adjunctions 4.2.1 → 4.2.2
raw patch · 11 files changed
+122/−36 lines, 11 filesdep ~mtlPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: mtl
API changes (from Hackage documentation)
Files
- .travis.yml +84/−18
- CHANGELOG.markdown +4/−0
- README.markdown +1/−1
- adjunctions.cabal +1/−1
- src/Control/Comonad/Representable/Store.hs +8/−5
- src/Control/Comonad/Trans/Adjoint.hs +4/−2
- src/Control/Monad/Representable/State.hs +4/−1
- src/Control/Monad/Trans/Adjoint.hs +4/−2
- src/Control/Monad/Trans/Contravariant/Adjoint.hs +4/−2
- src/Control/Monad/Trans/Conts.hs +4/−2
- src/Data/Functor/Adjunction.hs +4/−2
.travis.yml view
@@ -1,31 +1,97 @@-language: haskell+# This file has been generated -- see https://github.com/hvr/multi-ghc-travis+language: c+sudo: false -before_install:- # Uncomment whenever hackage is down.- # - mkdir -p ~/.cabal && cp travis/config ~/.cabal/config && cabal update- - cabal update+cache:+ directories:+ - $HOME/.cabsnap+ - $HOME/.cabal/packages - # Try installing some of the build-deps with apt-get for speed.- - travis/cabal-apt-install $mode- - travis/cabal-apt-install packdeps packunused+before_cache:+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar +matrix:+ include:+ - env: CABALVER=1.16 GHCVER=7.4.2+ compiler: ": #GHC 7.4.2"+ addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}+ - env: CABALVER=1.16 GHCVER=7.6.3+ compiler: ": #GHC 7.6.3"+ addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}+ - env: CABALVER=1.18 GHCVER=7.8.4+ compiler: ": #GHC 7.8.4"+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}+ - env: CABALVER=1.22 GHCVER=7.10.1+ compiler: ": #GHC 7.10.1"+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}+ - env: CABALVER=1.22 GHCVER=7.10.2+ compiler: ": #GHC 7.10.2"+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}++before_install:+ - unset CC+ - export HAPPYVER=1.19.5+ - export ALEXVER=3.1.4+ - export PATH=~/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:/opt/happy/$HAPPYVER/bin:/opt/alex/$ALEXVER/bin:$PATH+ install:- - cabal configure $mode- - cabal build --ghc-options=-ddump-minimal-imports+ - cabal --version+ - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"+ - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];+ then+ zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz >+ $HOME/.cabal/packages/hackage.haskell.org/00-index.tar;+ fi+ - travis_retry cabal update+ - "sed -i 's/^jobs:.*$/jobs: 2/' $HOME/.cabal/config"+ - cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v > installplan.txt+ - sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt +# check whether current requested install-plan matches cached package-db snapshot+ - if diff -u installplan.txt $HOME/.cabsnap/installplan.txt;+ then+ echo "cabal build-cache HIT";+ rm -rfv .ghc;+ cp -a $HOME/.cabsnap/ghc $HOME/.ghc;+ cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/;+ else+ echo "cabal build-cache MISS";+ rm -rf $HOME/.cabsnap;+ mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;+ cabal install --only-dependencies --enable-tests --enable-benchmarks;+ if [ "$GHCVER" = "7.10.1" ]; then cabal install Cabal-1.22.4.0; fi;+ fi++# snapshot package-db on cache miss+ - if [ ! -d $HOME/.cabsnap ];+ then+ echo "snapshotting package-db to build-cache";+ mkdir $HOME/.cabsnap;+ cp -a $HOME/.ghc $HOME/.cabsnap/ghc;+ cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;+ fi++# 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. script:- - $script- - hlint src --cpp-define HLINT- - packdeps adjunctions.cabal- - packunused+ - cabal configure --enable-tests -v2 # -v2 provides useful information for debugging+ - cabal build # this builds all libraries and executables (including tests)+ - cabal test+ - cabal bench || true # expected result: these will crash+ - cabal sdist || true # tests that a source-distribution can be generated +# Check that the resulting source distribution can be built & installed.+# If there are no other `.tar.gz` files in `dist`, this can be even simpler:+# `cabal install --force-reinstalls dist/*-*.tar.gz`+ - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&+ (cd dist && cabal install --force-reinstalls "$SRC_TGZ")+ notifications: irc: channels: - "irc.freenode.org#haskell-lens" skip_join: true template:- - "\x0313adjunctions\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}"--env:- - mode="--enable-tests" script="cabal test --show-details=always"+ - "\x0313adjunctions\x0f/\x0306%{branch}\x0f \x0314%{commit}\x0f %{message} \x0302\x1f%{build_url}\x0f"+# EOF
CHANGELOG.markdown view
@@ -1,3 +1,7 @@+4.2.2+-----+* Builds clean on GHC 7.10+ 4.2.1 ----- * `semigroupoids` 5 support.
README.markdown view
@@ -1,7 +1,7 @@ adjunctions ========== -[](http://travis-ci.org/ekmett/adjunctions)+[](https://hackage.haskell.org/package/adjunctions) [](http://travis-ci.org/ekmett/adjunctions) This package provides adjunctions for Haskell.
adjunctions.cabal view
@@ -1,6 +1,6 @@ name: adjunctions category: Data Structures, Adjunctions-version: 4.2.1+version: 4.2.2 license: BSD3 cabal-version: >= 1.6 license-file: LICENSE
src/Control/Comonad/Representable/Store.hs view
@@ -1,8 +1,9 @@-{-# LANGUAGE TypeFamilies- , FlexibleContexts- , FlexibleInstances- , MultiParamTypeClasses- , UndecidableInstances #-}+{-# LANGUAGE CPP #-}+{-# LANGUAGE TypeFamilies #-}+{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleInstances #-}+{-# LANGUAGE MultiParamTypeClasses #-}+{-# LANGUAGE UndecidableInstances #-} ---------------------------------------------------------------------- -- | -- Module : Control.Comonad.Representable.Store@@ -28,7 +29,9 @@ , ComonadStore(..) ) where +#if __GLASGOW_HASKELL__ < 710 import Control.Applicative+#endif import Control.Comonad import Control.Comonad.Cofree.Class import Control.Comonad.Env.Class
src/Control/Comonad/Trans/Adjoint.hs view
@@ -1,6 +1,6 @@-{-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE CPP #-}-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702+{-# LANGUAGE MultiParamTypeClasses #-}+#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL__ < 710 {-# LANGUAGE Trustworthy #-} #endif -----------------------------------------------------------------------------@@ -22,7 +22,9 @@ ) where import Prelude hiding (sequence)+#if __GLASGOW_HASKELL__ < 710 import Control.Applicative+#endif import Control.Comonad import Control.Comonad.Trans.Class import Data.Functor.Adjunction
src/Control/Monad/Representable/State.hs view
@@ -34,7 +34,10 @@ , MonadState(..) ) where +#if __GLASGOW_HASKELL__ < 710 import Control.Applicative+#endif+import Control.Monad import Data.Functor.Bind import Data.Functor.Bind.Trans import Control.Monad.State.Class@@ -43,7 +46,7 @@ import Control.Monad.Writer.Class import Control.Monad.Free.Class import Control.Monad.Trans.Class-import Control.Monad.Identity+import Data.Functor.Identity import Data.Functor.Rep -- ---------------------------------------------------------------------------
src/Control/Monad/Trans/Adjoint.hs view
@@ -1,6 +1,6 @@-{-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE CPP #-}-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702+{-# LANGUAGE MultiParamTypeClasses #-}+#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL__ < 710 {-# LANGUAGE Trustworthy #-} #endif -----------------------------------------------------------------------------@@ -22,7 +22,9 @@ ) where import Prelude hiding (sequence)+#if __GLASGOW_HASKELL__ < 710 import Control.Applicative+#endif import Control.Monad (ap, liftM) import Control.Monad.Trans.Class import Data.Traversable
src/Control/Monad/Trans/Contravariant/Adjoint.hs view
@@ -1,6 +1,6 @@-{-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE CPP #-}-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702+{-# LANGUAGE MultiParamTypeClasses #-}+#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL__ < 710 {-# LANGUAGE Trustworthy #-} #endif -----------------------------------------------------------------------------@@ -35,7 +35,9 @@ ) where import Prelude hiding (sequence)+#if __GLASGOW_HASKELL__ < 710 import Control.Applicative+#endif import Control.Comonad import Control.Monad (ap) import Data.Functor.Identity
src/Control/Monad/Trans/Conts.hs view
@@ -1,6 +1,6 @@-{-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE CPP #-}-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702+{-# LANGUAGE MultiParamTypeClasses #-}+#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL__ < 710 {-# LANGUAGE Trustworthy #-} #endif -----------------------------------------------------------------------------@@ -33,7 +33,9 @@ ) where import Prelude hiding (sequence)+#if __GLASGOW_HASKELL__ < 710 import Control.Applicative+#endif import Control.Comonad import Control.Monad.Trans.Class import Control.Monad (ap)
src/Data/Functor/Adjunction.hs view
@@ -4,7 +4,7 @@ , UndecidableInstances #-} {-# LANGUAGE CPP #-}-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702+#if __GLASGOW_HASKELL__ >= 702 {-# LANGUAGE Trustworthy #-} #endif @@ -31,10 +31,12 @@ , splitL, unsplitL ) where +#if __GLASGOW_HASKELL__ < 710 import Control.Applicative+#endif import Control.Arrow ((&&&), (|||)) import Control.Monad.Free-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 707+#if __GLASGOW_HASKELL__ < 707 import Control.Monad.Instances () #endif import Control.Monad.Trans.Identity