aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Text/Pandoc/ODT.hs6
-rw-r--r--pandoc.cabal4
2 files changed, 8 insertions, 2 deletions
diff --git a/Text/Pandoc/ODT.hs b/Text/Pandoc/ODT.hs
index c254f6013..16e8f0c26 100644
--- a/Text/Pandoc/ODT.hs
+++ b/Text/Pandoc/ODT.hs
@@ -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.
diff --git a/pandoc.cabal b/pandoc.cabal
index 400bcfd5f..2f3fc39ef 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -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,