From 05ff2589616685ce00271e96865c99de0edc8c99 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Thu, 2 Mar 2017 02:30:06 -0500 Subject: update to lts-8.3 --- acme-certify.hs | 3 ++- src/Network/ACME.hs | 6 +++--- stack.yaml | 21 +++------------------ 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/acme-certify.hs b/acme-certify.hs index 6cb3c05..c7a8279 100644 --- a/acme-certify.hs +++ b/acme-certify.hs @@ -5,6 +5,7 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE PackageImports #-} {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeSynonymInstances #-} @@ -27,7 +28,7 @@ import Data.Text (Text, pack, unpack) import Data.Text.Encoding (decodeUtf8, encodeUtf8) import Data.Time.Clock import Data.Yaml (Object) -import qualified Data.Yaml.Config as Config +import qualified "yaml-config" Data.Yaml.Config as Config import Data.Yaml.Config.Internal (Config (..)) import Network.ACME (HttpProvisioner, Keys (..), canProvision, certify, diff --git a/src/Network/ACME.hs b/src/Network/ACME.hs index 4b96afc..5ea6ff8 100644 --- a/src/Network/ACME.hs +++ b/src/Network/ACME.hs @@ -35,7 +35,7 @@ import Network.Connection import Network.HTTP.Conduit (Manager, mkManagerSettings, newManager) import Network.URI -import Network.Wreq (Response, checkStatus, defaults, +import Network.Wreq (Response, checkResponse, defaults, responseBody, responseHeader, responseStatus, statusCode, statusMessage) @@ -168,8 +168,8 @@ post url payload = do put $ r ^?! responseHeader "Replay-Nonce" . to (Nonce . T.unpack . decodeUtf8) return r where - noStatusCheck = defaults & checkStatus .~ Just nullChecker - nullChecker _ _ _ = Nothing + noStatusCheck = defaults & checkResponse .~ Just nullChecker + nullChecker _ _ = return () sendPayload :: (MonadIO m, MonadState Nonce m, MonadReader Env m) => (Directory -> String) -> ByteString -> m (Response LC.ByteString) sendPayload reqType payload = do diff --git a/stack.yaml b/stack.yaml index e4f9de2..e25bad1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,14 +1,14 @@ # 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-5.0 +resolver: lts-8.3 # Local packages, usually specified by relative directory name packages: - '.' - location: git: git@github.com:afcady/HSOpenSSL.git - commit: 90679fb0e20514f915c90c0e27774867a30915df + commit: 99fc8cd8e1906c8e4426c51ecb32d3a04fd08a30 extra-dep: true - location: git: git@github.com:afcady/email-validate-hs.git @@ -20,26 +20,11 @@ extra-deps: - yaml-config-0.3.0 - failure-0.2.0.3 - posix-escape-0.1 +- wreq-0.5.0.0 # Override default flag values for local packages and extra-deps flags: HsOpenSSL: fast-bignum: false -# Extra package databases containing global packages extra-package-dbs: [] - -# Control whether we use the GHC we find on the path -# system-ghc: true - -# Require a specific version of stack, using version ranges -# require-stack-version: -any # Default -# require-stack-version: >= 1.0.0 - -# Override the architecture used by stack, especially useful on Windows -# arch: i386 -# arch: x86_64 - -# Extra directories used by stack for building -# extra-include-dirs: [/path/to/dir] -# extra-lib-dirs: [/path/to/dir] -- cgit v1.2.3