33 lines
975 B
Diff
33 lines
975 B
Diff
--- a/Val.hs 2020-03-31 11:00:33.329814064 +0200
|
|
+++ b/Val.hs 2020-03-31 11:00:24.602711845 +0200
|
|
@@ -42,7 +42,7 @@
|
|
b64 :: B.ByteString -> T.Text
|
|
b64 = T.decodeUtf8 . B64.encode
|
|
|
|
-unb64 :: Monad m => T.Text -> m B.ByteString
|
|
+unb64 :: MonadFail m => T.Text -> m B.ByteString
|
|
unb64 t = either
|
|
(\_ -> fail "bad base64 data")
|
|
return
|
|
--- a/Server.hs 2020-03-31 12:53:45.860509650 +0200
|
|
+++ b/Server.hs 2020-03-31 12:52:34.873835069 +0200
|
|
@@ -105,7 +105,7 @@
|
|
-- (Workaround for
|
|
-- https://github.com/jaspervdj/websockets/issues/140)
|
|
setHost "*6" $
|
|
- setPort (serverPort o) $
|
|
+ setPort (CmdLine.serverPort o) $
|
|
defaultSettings
|
|
|
|
checkEnv :: ServerOpts -> IO ServerOpts
|
|
--- a/debug-me.cabal
|
|
+++ b/debug-me.cabal
|
|
@@ -64,7 +64,7 @@
|
|
, stm-chans (>= 3.0)
|
|
, posix-pty (>= 0.2.1)
|
|
, terminal-size (>= 0.3)
|
|
- , aeson (>= 0.11 && < 1.5)
|
|
+ , aeson (>= 0.11 && < 1.6)
|
|
, sandi (>= 0.4)
|
|
, text (>= 1.2.2)
|
|
, optparse-applicative (>= 0.12)
|