2262f00 · typeable/pandoc

git.iko.soy/typeable/pandoc

Use hslua v0.9.0

commit2262f005ce5b39ccd3694f61f2507b9e61c3804c authorAlbert Krewinkel <albert@zeitkraut.de> dateThu 5 Oct 2017, 11:30 (9 years ago) parent0e54d51

5 files changed+6−17

compare with master

unifiedsplit

pandoc.cabal+2−2 src/Text/Pandoc/Lua/PandocModule.hs+1−12 stack.full.yaml+1−1 stack.pkg.yaml+1−1 stack.yaml+1−1

pandoc.cabal+2−2

@@ -324,7 +324,7 @@ library

324324 yaml >= 0.8.8.2 && < 0.9,

325325 scientific >= 0.2 && < 0.4,

326326 vector >= 0.10 && < 0.13,

327− hslua >= 0.8 && < 0.9,

327+ hslua >= 0.9 && < 0.10,

328328 binary >= 0.5 && < 0.9,

329329 SHA >= 1.6 && < 1.7,

330330 haddock-library >= 1.1 && < 1.5,

@@ -551,7 +551,7 @@ test-suite test-pandoc

551551 text >= 0.11 && < 1.3,

552552 directory >= 1 && < 1.4,

553553 filepath >= 1.1 && < 1.5,

554− hslua >= 0.8 && < 0.9,

554+ hslua >= 0.9 && < 0.10,

555555 process >= 1.2.3 && < 1.7,

556556 skylighting >= 0.4 && < 0.5,

557557 temporary >= 1.1 && < 1.3,

src/Text/Pandoc/Lua/PandocModule.hs+1−12

@@ -16,9 +16,6 @@ along with this program; if not, write to the Free Software

1616Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

1717-}

1818{-# LANGUAGE CPP #-}

19−#if !MIN_VERSION_hslua(0,9,0)

20−{-# OPTIONS_GHC -fno-warn-orphans #-}

21−#endif

2219{- |

2320 Module : Text.Pandoc.Lua.PandocModule

@@ -40,7 +37,7 @@ import Data.Default (Default (..))

4037import Data.IORef

4138import Data.Maybe (fromMaybe)

4239import Data.Text (pack)

43−import Foreign.Lua (Lua, FromLuaStack, ToLuaStack, NumResults, liftIO)

40+import Foreign.Lua (Lua, FromLuaStack, NumResults, liftIO)

4441import Foreign.Lua.FunctionCalling (ToHaskellFunction)

4542import Text.Pandoc.Class (readDataFile, runIO,

4643 runIOorExplode, setUserDataDir, CommonState(..),

@@ -186,11 +183,3 @@ instance FromLuaStack a => FromLuaStack (OrNil a) where

186183 if noValue

187184 then return (OrNil Nothing)

188185 else OrNil . Just <$> Lua.peek idx

189−

190−#if !MIN_VERSION_hslua(0,9,0)

191−instance ToLuaStack BL.ByteString where

192− push = Lua.push . BL.toStrict

193−

194−instance FromLuaStack BL.ByteString where

195− peek = fmap BL.fromStrict . Lua.peek

196−#endif

stack.full.yaml+1−1

@@ -20,6 +20,6 @@ packages:

2020- '../pandoc-types'

2121- '../texmath'

2222extra-deps:

23−- hslua-0.8.0

23+- hslua-0.9.0

2424- skylighting-0.3.3

2525resolver: lts-8.12

stack.pkg.yaml+1−1

@@ -19,7 +19,7 @@ packages:

1919extra-deps:

2020- pandoc-types-1.17.2

2121- texmath-0.9.4.4

22−- hslua-0.8.0

22+- hslua-0.9.0

2323- skylighting-0.4.1

2424- cmark-gfm-0.1.1

2525- QuickCheck-2.10.0.1

stack.yaml+1−1

@@ -9,7 +9,7 @@ packages:

99extra-deps:

1010- pandoc-types-1.17.2

1111- texmath-0.9.4.4

12−- hslua-0.8.0

12+- hslua-0.9.0

1313- skylighting-0.4.1

1414- cmark-gfm-0.1.1

1515- QuickCheck-2.10.0.1