From dd57a30831bda84f70ef43f1ed9d9bc90e0ee5e5 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sat, 29 Jun 2019 15:35:09 -0400 Subject: update stackage to lts-13.26 --- src/Network/ACME.hs | 8 ++++---- stack.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Network/ACME.hs b/src/Network/ACME.hs index 5ea6ff8..35eebcb 100644 --- a/src/Network/ACME.hs +++ b/src/Network/ACME.hs @@ -70,9 +70,9 @@ certify directoryUrl keys reg domainKeys domains = do cr dom = challengeRequest dom >>= statusReport >>= extractCR >>= performChallenge dom - runResourceT $ do + do challengeResultLinks <- forM (map fst domains) cr - lift . runExceptT $ do + runExceptT $ do ExceptT $ pollResults challengeResultLinks <&> left ("certificate receipt was not attempted because a challenge failed: " ++) ExceptT $ retrieveCert certReq >>= statusReport <&> checkCertResponse @@ -154,12 +154,12 @@ data Directory = Directory { } newtype Nonce = Nonce String data Env = Env { getDir :: Directory, getKeys :: Keys, getSession :: WS.Session } -type ACME = RWST Env () Nonce IO +type ACME = RWST Env () Nonce ResIO runACME :: URI -> Keys -> ACME a -> IO a runACME url keys f = WS.withSession $ \sess -> do Just (dir, nonce) <- getDirectory sess (show url) - fst <$> evalRWST f (Env dir keys sess) nonce + runResourceT $ fst <$> evalRWST f (Env dir keys sess) nonce post :: (MonadReader Env m, MonadState Nonce m, MonadIO m) => String -> LC.ByteString -> m (Response LC.ByteString) post url payload = do diff --git a/stack.yaml b/stack.yaml index dcef853..a46cf9b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,7 +1,7 @@ # For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) -resolver: lts-10.10 +resolver: lts-13.26 # Local packages, usually specified by relative directory name packages: -- cgit v1.2.3