Use hslua v0.9.0

This commit is contained in:
Albert Krewinkel 2017-10-05 11:30:44 +02:00
parent 0e54d51d89
commit 2262f005ce
No known key found for this signature in database
GPG key ID: 388DC0B21F631124
5 changed files with 6 additions and 17 deletions

View file

@ -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,

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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