diff --git a/esqueleto.cabal b/esqueleto.cabal index 5223c7d..be7cb4c 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -66,14 +66,14 @@ library base >= 4.8 && < 5.0 , bytestring , text >= 0.11 && < 1.3 - , persistent >= 2.7.1 && < 2.8 + , persistent >= 2.8.0 && < 2.9 , transformers >= 0.2 , unordered-containers >= 0.2 , tagged >= 0.2 , monad-logger - , conduit >= 1.1 - , resourcet >= 1.1 + , conduit >= 1.3 + , resourcet >= 1.2 , time >= 1.5.0.1 && <= 1.8.0.2 , blaze-html hs-source-dirs: src/ diff --git a/stack-8.2.yaml b/stack-8.2.yaml new file mode 100644 index 0000000..9701823 --- /dev/null +++ b/stack-8.2.yaml @@ -0,0 +1,36 @@ +# resolver: nightly-2017-01-10 +resolver: lts-10.0 +# compiler: ghc-8.0.2 + +packages: +- '.' +- location: + git: https://github.com/yesodweb/persistent + commit: 4d0a6f3a4abde46c82691414e0e283a933a39f3e + extra-dep: true + subdirs: + - persistent + - persistent-sqlite +- location: + git: https://github.com/snoyberg/conduit + commit: 7f75bfca8d479e1737861a75437a288af662a3cf + extra-dep: true + subdirs: + - conduit + - conduit-extra + - resourcet + +extra-deps: +- doctest-prop-0.2.0.1 +- quickcheck-properties-0.1 +- monad-logger-0.3.28 +- mono-traversable-1.0.8.1 + # - persistent-2.7.1 +# - http-client-0.5.0 +# - fail-4.9.0.0 +# - http-types-0.9 +# - attoparsec-0.13.0.1 +# - doctest-0.10.1 +# - semigroups-0.18.0.1 +# - uri-bytestring-0.1.9 +# - temporary-resourcet-0.1.0.0 diff --git a/test/Test.hs b/test/Test.hs index f52c7f5..d948dd5 100644 --- a/test/Test.hs +++ b/test/Test.hs @@ -1482,7 +1482,7 @@ insert' :: ( Functor m insert' v = flip Entity v <$> insert v -type RunDbMonad m = ( MonadBaseControl IO m, MonadIO m, MonadLogger m +type RunDbMonad m = ( R.MonadUnliftIO m, MonadIO m, MonadLogger m , R.MonadThrow m ) #if defined (WITH_POSTGRESQL) || defined (WITH_MYSQL)