diff --git a/amazonka-mtl.cabal b/amazonka-mtl.cabal index 123bedd..d877ea4 100644 --- a/amazonka-mtl.cabal +++ b/amazonka-mtl.cabal @@ -1,6 +1,6 @@ cabal-version: 1.18 --- This file has been generated from package.yaml by hpack version 0.35.2. +-- This file has been generated from package.yaml by hpack version 0.37.0. -- -- see: https://github.com/sol/hpack @@ -112,6 +112,7 @@ library , base <5 , conduit , lens + , monad-logger , mtl , resourcet , unliftio-core diff --git a/library/Control/Monad/AWS/EnvT.hs b/library/Control/Monad/AWS/EnvT.hs index 813c317..e227218 100644 --- a/library/Control/Monad/AWS/EnvT.hs +++ b/library/Control/Monad/AWS/EnvT.hs @@ -28,10 +28,14 @@ where import Prelude +import Control.Monad.Logger (MonadLogger, MonadLoggerIO) import Control.Monad.AWS.Class import Control.Monad.AWS.ViaReader +import Control.Monad.Except (MonadError) import Control.Monad.Reader +import Control.Monad.State (MonadState) import Control.Monad.Trans.Resource +import Control.Monad.Writer (MonadWriter) -- | -- @@ -47,9 +51,17 @@ newtype EnvT m a = EnvT , MonadUnliftIO , MonadResource , MonadReader Env + , MonadError e + , MonadState s + , MonadWriter w + , MonadLogger + , MonadLoggerIO ) deriving (MonadAWS) via (ReaderAWS (EnvT m)) +instance MonadTrans EnvT where + lift = EnvT . lift . lift + -- | -- -- @since 0.1.0.0 diff --git a/package.yaml b/package.yaml index 8107cd5..8f94eca 100644 --- a/package.yaml +++ b/package.yaml @@ -112,6 +112,7 @@ library: - amazonka-core - conduit - lens + - monad-logger - mtl - resourcet - unliftio-core diff --git a/stack-lts-21.11.yaml b/stack-lts-21.11.yaml new file mode 100644 index 0000000..c262303 --- /dev/null +++ b/stack-lts-21.11.yaml @@ -0,0 +1,7 @@ +resolver: lts-21.11 +extra-deps: + - amazonka-2.0 + - amazonka-core-2.0 + - amazonka-s3-2.0 + - amazonka-sso-2.0 + - amazonka-sts-2.0 diff --git a/stack-lts-21.11.yaml.lock b/stack-lts-21.11.yaml.lock new file mode 100644 index 0000000..7008fda --- /dev/null +++ b/stack-lts-21.11.yaml.lock @@ -0,0 +1,47 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: amazonka-2.0@sha256:d401ac9094bb331d1bfb9be879d9007ca6bc94085ab745de5aa827128ad7917c,3522 + pantry-tree: + sha256: b9fa0aaccff472ac93200d505678fb560ce15a9e409bdff61e1a3e08ed89d344 + size: 1528 + original: + hackage: amazonka-2.0 +- completed: + hackage: amazonka-core-2.0@sha256:b60507a2791d05ce6fb69544a854c0ee0ec794908400aebe9adcacedf9cd4e17,4585 + pantry-tree: + sha256: 60d4c21ff717e3cfa3fc78812c6d1032e22c27d9427d2ab42f649a6cc0b70d0d + size: 3222 + original: + hackage: amazonka-core-2.0 +- completed: + hackage: amazonka-s3-2.0@sha256:1d93bec43e0fc9bc3a57c43aeeb010c74a60afd3af5acd077731aad923f99802,13870 + pantry-tree: + sha256: 0b88c93134287ca43f169d2163acce45700bab1ea81e97f11de4d4330db7c9fa + size: 38690 + original: + hackage: amazonka-s3-2.0 +- completed: + hackage: amazonka-sso-2.0@sha256:dfb9232d66fac2a912f63aa5ddaf56ea495649cc3ab451b5102f8ec579dedc4f,3012 + pantry-tree: + sha256: 1018821c55d328ad72e532267bc27528353fc226ad43817a9e8ea91509b9b7a9 + size: 1817 + original: + hackage: amazonka-sso-2.0 +- completed: + hackage: amazonka-sts-2.0@sha256:949968463bde023a6b8035527b5da5585da8e3c36f0366eedf663aac2b9d5d12,3226 + pantry-tree: + sha256: b761d4c67118c25f4711c183b4983903a3a759d5802b91795f603cb0555bfb0e + size: 2880 + original: + hackage: amazonka-sts-2.0 +snapshots: +- completed: + sha256: 64d66303f927e87ffe6b8ccf736229bf608731e80d7afdf62bdd63c59f857740 + size: 640037 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/11.yaml + original: lts-21.11 diff --git a/stack-nightly.yaml b/stack-nightly.yaml index c5ecde6..00c2a55 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -1 +1 @@ -resolver: nightly-2023-09-09 +resolver: nightly-2024-12-03 diff --git a/stack-nightly.yaml.lock b/stack-nightly.yaml.lock index 6d26190..46cdd8a 100644 --- a/stack-nightly.yaml.lock +++ b/stack-nightly.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - sha256: a4e61f552492f4f0a14246c054144a8b6b455c67c9e99fddf891d009baa65604 - size: 667656 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/9/9.yaml - original: nightly-2023-09-09 + sha256: f6666a91f63dae89e47da2be54f79c8819601dfacf53fd7015fec1454864892e + size: 678851 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/12/3.yaml + original: nightly-2024-12-03 diff --git a/stack.yaml b/stack.yaml index c262303..a3c4fd5 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,7 +1,8 @@ -resolver: lts-21.11 +resolver: lts-22.42 extra-deps: - amazonka-2.0 - amazonka-core-2.0 - amazonka-s3-2.0 - amazonka-sso-2.0 - amazonka-sts-2.0 + - crypton-0.33 diff --git a/stack.yaml.lock b/stack.yaml.lock index 7c100b1..4dee452 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -39,9 +39,16 @@ packages: size: 2880 original: hackage: amazonka-sts-2.0 +- completed: + hackage: crypton-0.33@sha256:5e92f29b9b7104d91fcdda1dec9400c9ad1f1791c231cc41ceebd783fb517dee,18202 + pantry-tree: + sha256: 38809499d7f9775ef45cd29ab5c3dc9b283a813f34c1cdc56681b24f8cf8bb4f + size: 23148 + original: + hackage: crypton-0.33 snapshots: - completed: - sha256: 64d66303f927e87ffe6b8ccf736229bf608731e80d7afdf62bdd63c59f857740 - size: 640037 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/11.yaml - original: lts-21.11 + sha256: 3e184a8f5e751ba159db999ce1bebe45143ce8422b525b4d2de6d9b849d203c9 + size: 720269 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/42.yaml + original: lts-22.42