Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support mtl >= 2.3 #1451

Merged
merged 5 commits into from
Dec 5, 2022
Merged

Support mtl >= 2.3 #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71384f9
Support mtl >= 2.3
parsonsmatt Dec 5, 2022
feeb07f
hrmm
parsonsmatt Dec 5, 2022
9b4ba63
lol of course not
parsonsmatt Dec 5, 2022
bb9d45c
Changelog
parsonsmatt Dec 5, 2022
b5929c1
comment out cabal.project
parsonsmatt Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,10 @@ allow-newer:
-- https://github.com/haskellari/postgresql-simple/pull/95
, postgresql-simple:base
, postgresql-simple:template-haskell

-- Needed to test that `persistent-redis` works with mtl-2.3
-- https://github.com/informatikr/hedis/pull/190
-- source-repository-package
-- type: git
-- location: https://github.com/ysangkok/hedis
-- tag: 6f36989836b49974f51a6ee8edaf156490590980
2 changes: 1 addition & 1 deletion persistent-redis/persistent-redis.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ library
, bytestring >= 0.10.8 && < 0.12
, hedis >= 0.9
, http-api-data
, mtl >= 2.2.1 && < 2.3
, mtl >= 2.2.1 && < 2.4
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revision published

, path-pieces >= 0.2
, scientific >= 0.3.5 && < 0.4
, text >= 1.2
Expand Down
5 changes: 5 additions & 0 deletions persistent/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog for persistent

## 2.14.4.2

* [#1451](https://github.com/yesodweb/persistent/pull/1451)
* Support `mtl >= 2.3`

## 2.14.4.1

* [#1449](https://github.com/yesodweb/persistent/pull/1449)
Expand Down
3 changes: 2 additions & 1 deletion persistent/Database/Persist/Sql/Run.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ module Database.Persist.Sql.Run where

import Control.Monad.IO.Unlift
import Control.Monad.Logger.CallStack
import Control.Monad.Reader (MonadReader, void)
import Control.Monad (void)
import Control.Monad.Reader (MonadReader)
import qualified Control.Monad.Reader as MonadReader
import Control.Monad.Trans.Reader hiding (local)
import Control.Monad.Trans.Resource
Expand Down
4 changes: 2 additions & 2 deletions persistent/persistent.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: persistent
version: 2.14.4.1
version: 2.14.4.2
license: MIT
license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com>
Expand Down Expand Up @@ -29,7 +29,7 @@ library
, http-api-data >= 0.3
, lift-type >= 0.1.0.0 && < 0.2.0.0
, monad-logger >= 0.3.28
, mtl < 2.3
, mtl
, path-pieces >= 0.2
, resource-pool >= 0.2.3
, resourcet >= 1.1.10
Expand Down