diff options
| author | Avi Dessauer <avi.the.coder@gmail.com> | 2019-08-21 05:59:18 -0400 |
|---|---|---|
| committer | Alexey Kiryushin <alexey.a.kiryushin@gmail.com> | 2019-08-21 12:59:18 +0300 |
| commit | 5295ac7f7f26c3a43f0fe9b9c826e876b29cf666 (patch) | |
| tree | 77903524892b9b0108006591a8ccc8d2a854d8c8 | |
| parent | 611368eb780d9a2d5d0476cd9e00da2f0b69a647 (diff) | |
Bump 8.6.5 plans to lts-14 (#41)
| -rw-r--r-- | app/Server.hs | 8 | ||||
| -rw-r--r-- | stack-8.6.5.yaml | 2 | ||||
| -rw-r--r-- | stack.yaml | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/app/Server.hs b/app/Server.hs index 30109e6..fa786c2 100644 --- a/app/Server.hs +++ b/app/Server.hs @@ -125,7 +125,11 @@ import Servant , Header , Headers , QueryParam +#if MIN_VERSION_GLASGOW_HASKELL(8,6,5,0) + , ServerError +#else , ServantErr +#endif , ServerT , ToHttpApiData(..) , addHeader @@ -1835,7 +1839,11 @@ fileNotFound :: Response fileNotFound = responseLBS status404 [("Content-Type", "text/plain")] "Not found" +#if MIN_VERSION_GLASGOW_HASKELL(8,6,5,0) +throwServantError :: (MonadIO m) => ServerError -> m a +#else throwServantError :: (MonadIO m) => ServantErr -> m a +#endif throwServantError = liftIO . throwIO server :: Environment -> ServerT API Handler diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index fcc84d6..f59b52d 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -1,4 +1,4 @@ -resolver: lts-13.20 +resolver: lts-14.1 packages: - '.' - 'vendor/cabal-helper-0.8.1.2' @@ -1,4 +1,4 @@ -resolver: lts-13.20 +resolver: lts-14.1 packages: - '.' - 'vendor/cabal-helper-0.8.1.2' |