diff options
| -rw-r--r-- | pandoc.cabal | 4 | ||||
| -rw-r--r-- | src/Text/Pandoc/Lua/PandocModule.hs | 13 | ||||
| -rw-r--r-- | stack.full.yaml | 2 | ||||
| -rw-r--r-- | stack.pkg.yaml | 2 | ||||
| -rw-r--r-- | stack.yaml | 2 |
5 files changed, 6 insertions, 17 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index e2297b9ad..fde76dee4 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -324,7 +324,7 @@ library yaml >= 0.8.8.2 && < 0.9, scientific >= 0.2 && < 0.4, vector >= 0.10 && < 0.13, - hslua >= 0.8 && < 0.9, + hslua >= 0.9 && < 0.10, binary >= 0.5 && < 0.9, SHA >= 1.6 && < 1.7, haddock-library >= 1.1 && < 1.5, @@ -551,7 +551,7 @@ test-suite test-pandoc text >= 0.11 && < 1.3, directory >= 1 && < 1.4, filepath >= 1.1 && < 1.5, - hslua >= 0.8 && < 0.9, + hslua >= 0.9 && < 0.10, process >= 1.2.3 && < 1.7, skylighting >= 0.4 && < 0.5, temporary >= 1.1 && < 1.3, diff --git a/src/Text/Pandoc/Lua/PandocModule.hs b/src/Text/Pandoc/Lua/PandocModule.hs index f9b072dff..3c27ecffb 100644 --- a/src/Text/Pandoc/Lua/PandocModule.hs +++ b/src/Text/Pandoc/Lua/PandocModule.hs @@ -16,9 +16,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -} {-# LANGUAGE CPP #-} -#if !MIN_VERSION_hslua(0,9,0) -{-# OPTIONS_GHC -fno-warn-orphans #-} -#endif {- | Module : Text.Pandoc.Lua.PandocModule Copyright : Copyright © 2017 Albert Krewinkel @@ -40,7 +37,7 @@ import Data.Default (Default (..)) import Data.IORef import Data.Maybe (fromMaybe) import Data.Text (pack) -import Foreign.Lua (Lua, FromLuaStack, ToLuaStack, NumResults, liftIO) +import Foreign.Lua (Lua, FromLuaStack, NumResults, liftIO) import Foreign.Lua.FunctionCalling (ToHaskellFunction) import Text.Pandoc.Class (readDataFile, runIO, runIOorExplode, setUserDataDir, CommonState(..), @@ -186,11 +183,3 @@ instance FromLuaStack a => FromLuaStack (OrNil a) where if noValue then return (OrNil Nothing) else OrNil . Just <$> Lua.peek idx - -#if !MIN_VERSION_hslua(0,9,0) -instance ToLuaStack BL.ByteString where - push = Lua.push . BL.toStrict - -instance FromLuaStack BL.ByteString where - peek = fmap BL.fromStrict . Lua.peek -#endif diff --git a/stack.full.yaml b/stack.full.yaml index 71bbbcb0f..8b82c3e67 100644 --- a/stack.full.yaml +++ b/stack.full.yaml @@ -20,6 +20,6 @@ packages: - '../pandoc-types' - '../texmath' extra-deps: -- hslua-0.8.0 +- hslua-0.9.0 - skylighting-0.3.3 resolver: lts-8.12 diff --git a/stack.pkg.yaml b/stack.pkg.yaml index 5fdde5ab2..5ad4beb95 100644 --- a/stack.pkg.yaml +++ b/stack.pkg.yaml @@ -19,7 +19,7 @@ packages: extra-deps: - pandoc-types-1.17.2 - texmath-0.9.4.4 -- hslua-0.8.0 +- hslua-0.9.0 - skylighting-0.4.1 - cmark-gfm-0.1.1 - QuickCheck-2.10.0.1 diff --git a/stack.yaml b/stack.yaml index 5351f6715..d4d7a7b4f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -9,7 +9,7 @@ packages: extra-deps: - pandoc-types-1.17.2 - texmath-0.9.4.4 -- hslua-0.8.0 +- hslua-0.9.0 - skylighting-0.4.1 - cmark-gfm-0.1.1 - QuickCheck-2.10.0.1 |