summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2017-04-03 15:10:32 -0400
committerJoey Hess <joeyh@joeyh.name>2017-04-03 15:10:32 -0400
commit13fa279af67fad0305697682ee3c039061cb94bf (patch)
tree0da9ef0ef37f72422958a236dab8583b984a19a7
parente5b0bfb4f9b92728f136b13c34f5a761a3d29095 (diff)
downloadkeysafe-13fa279af67fad0305697682ee3c039061cb94bf.tar.gz
Fix build with some versions of servant.
Application is exported by Servant 0.8.1, but apparently not by some other versions that the cabal file allows to be used. Explictly import from Network.Wai
-rw-r--r--CHANGELOG6
-rw-r--r--HTTP/Server.hs1
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 60167a0..bd5e4ee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+keysafe (0.20170304) UNRELEASED; urgency=medium
+
+ * Fix build with some versions of servant.
+
+ -- Joey Hess <id@joeyh.name> Mon, 03 Apr 2017 15:09:28 -0400
+
keysafe (0.20170303) unstable; urgency=medium
* Updated to use raaz-0.1.1.
diff --git a/HTTP/Server.hs b/HTTP/Server.hs
index 61bdbfd..1abcc56 100644
--- a/HTTP/Server.hs
+++ b/HTTP/Server.hs
@@ -18,6 +18,7 @@ import CmdLine (ServerConfig(..))
import Storage.Local
import Serialization ()
import Servant
+import Network.Wai (Application)
import Network.Wai.Handler.Warp
import Control.Monad.IO.Class
import Control.Concurrent