Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Depend on bytestring-0.9.0.1 and provide a ByteString instance for IsString manually,

Browse source 
in Text/Pandoc/ODT.hs.  Upgrading to 0.9.1.0 causes problems unless every package
has been built with that version, so for now we stick with 0.9.0.1.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1358 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
fiddlosopher 2008-08-01 06:35:55 +00:00
parent ba32c2ec42
commit 31e261ca39
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Text/Pandoc/ODT.hs
View file

@ -43,7 +43,11 @@ import Text.XML.Light
import Text.XML.Light.Cursor
import Text.Pandoc.Shared ( withTempDir )
import Network.URI ( isURI )
import qualified Data.ByteString.Char8 as B ( writeFile )
import Data.String ( IsString (..) )
import qualified Data.ByteString.Char8 as B ( writeFile, pack, ByteString )
instance IsString B.ByteString
where fromString = B.pack
-- | Produce an ODT file from OpenDocument XML.
saveOpenDocumentAsODT :: FilePath -- ^ Pathname of ODT file to be produced.

4
pandoc.cabal
View file

@ -73,7 +73,9 @@ Library
if flag(highlighting)
Build-depends: highlighting-kate
cpp-options: -DHIGHLIGHTING
Build-Depends: parsec < 3, xhtml, mtl, network, filepath, process, directory, utf8-string, template-haskell, bytestring
Build-Depends: parsec < 3, xhtml, mtl, network, filepath, process, directory, utf8-string,
template-haskell, bytestring == 0.9.0.1
-- Note: bytestring-0.9.1.0 contains an InString instance for ByteString
Hs-Source-Dirs: .
Exposed-Modules: Text.Pandoc,
Text.Pandoc.Blocks,