aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pandoc-cli/pandoc-cli.cabal2
-rw-r--r--pandoc-cli/src/pandoc.hs8
-rw-r--r--stack.yaml2
3 files changed, 7 insertions, 5 deletions
diff --git a/pandoc-cli/pandoc-cli.cabal b/pandoc-cli/pandoc-cli.cabal
index a7734bd55..f7f65ba7e 100644
--- a/pandoc-cli/pandoc-cli.cabal
+++ b/pandoc-cli/pandoc-cli.cabal
@@ -59,7 +59,7 @@ executable pandoc
main-is: pandoc.hs
buildable: True
build-depends: pandoc,
- hslua-cli >= 1.1 && < 1.2
+ hslua-cli >= 1.2 && < 1.3
other-modules: PandocCLI.Server
if flag(server)
build-depends: pandoc-server >= 0.1 && < 0.2,
diff --git a/pandoc-cli/src/pandoc.hs b/pandoc-cli/src/pandoc.hs
index 4564aa619..ca39b316f 100644
--- a/pandoc-cli/src/pandoc.hs
+++ b/pandoc-cli/src/pandoc.hs
@@ -39,9 +39,11 @@ main = E.handle (handleError . Left) $ do
-- | Runs pandoc as a Lua interpreter that is (mostly) compatible with
-- the default @lua@ program shipping with Lua.
runLuaInterpreter :: String -> [String] -> IO ()
-runLuaInterpreter _progName _args = do
+runLuaInterpreter progName args = do
let settings = Settings
{ settingsVersionInfo = "\nEmbedded in pandoc " <> pandocVersion
- , settingsRunner = handleError <=< runIOorExplode . runLua
+ , settingsRunner = runner
}
- runStandalone settings
+ runStandalone settings progName args
+ where
+ runner _envBehavior = handleError <=< runIOorExplode . runLua
diff --git a/stack.yaml b/stack.yaml
index 3efb346a8..c43cd4a69 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -14,7 +14,7 @@ extra-deps:
- skylighting-format-latex-0.1
- hslua-2.2.1
- hslua-aeson-2.2.1
-- hslua-cli-1.1.0
+- hslua-cli-1.2.0
- hslua-classes-2.2.0
- hslua-core-2.2.1
- hslua-marshalling-2.2.1