summaryrefslogtreecommitdiffhomepage
path: root/Role
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2018-12-08 13:26:14 -0400
committerJoey Hess <joeyh@joeyh.name>2018-12-08 13:28:42 -0400
commit9d7e697474720b2c6e78fbf11066a8499fc55807 (patch)
treef2f1b6b0c29017f2fcc6cb206ffea5939d3b19c7 /Role
parentad33cd0f276eb898db5287dd36bf06fd6258f911 (diff)
downloaddebug-me-9d7e697474720b2c6e78fbf11066a8499fc55807.tar.gz
Update to lts-12.10, support ghc 8.4, and aeson 1.3.
Don't fully understand the need for the MonoLocalBinds language extension, which was not needed before but now ghc complains if it's not included, but I've tested it and it does work. All the rest of the changes are straightforward AMP changes and dep updates. Removed fgl from stack.yaml because it seems that indirect dep no longer needs to be specified for stack to build. Added custom-setup stanza since stack now warns without one. This commit was sponsored by Trenton Cronholm on Patreon.
Diffstat (limited to 'Role')
-rw-r--r--Role/Developer.hs3
-rw-r--r--Role/User.hs3
2 files changed, 4 insertions, 2 deletions
diff --git a/Role/Developer.hs b/Role/Developer.hs
index d706a7a..abdad08 100644
--- a/Role/Developer.hs
+++ b/Role/Developer.hs
@@ -38,9 +38,10 @@ import qualified Data.Text as T
import Data.List
import Data.Maybe
import Control.Monad
-import Data.Monoid
import Data.Time.Clock.POSIX
import Network.URI
+import Data.Monoid
+import Prelude
run :: DeveloperOpts -> IO ()
run = run' developer . debugUrl
diff --git a/Role/User.hs b/Role/User.hs
index 6ee1a42..6ec0302 100644
--- a/Role/User.hs
+++ b/Role/User.hs
@@ -30,11 +30,12 @@ import System.Exit
import qualified Data.Text.IO as T
import qualified Data.ByteString as B
import Data.List.NonEmpty (NonEmpty(..), toList)
-import Data.Monoid
import Data.Maybe
import Data.Time.Clock.POSIX
import System.IO
import System.Environment
+import Data.Monoid
+import Prelude
run :: UserOpts -> IO ExitCode
run os = fromMaybe (ExitFailure 101) <$> connect