From b861c20ff2d7460061e73492e3a945e48ef40bac Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Wed, 10 Jun 2020 10:48:23 +0200 Subject: Let pandoc-types 1.21+ with new Block constructors --- hakyll.cabal | 3 ++- lib/Hakyll/Web/Pandoc/Binary.hs | 25 ++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/hakyll.cabal b/hakyll.cabal index c8add09..74a6c2f 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -214,7 +214,8 @@ library Hakyll.Web.Pandoc.Binary build-depends: pandoc >=2.0.5, - pandoc-citeproc >=0.14 + pandoc-citeproc >=0.14, + pandoc-types executable hakyll-init main-is: Init.hs diff --git a/lib/Hakyll/Web/Pandoc/Binary.hs b/lib/Hakyll/Web/Pandoc/Binary.hs index deeaf08..033ca9a 100644 --- a/lib/Hakyll/Web/Pandoc/Binary.hs +++ b/lib/Hakyll/Web/Pandoc/Binary.hs @@ -1,13 +1,14 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveGeneric #-} module Hakyll.Web.Pandoc.Binary where -import Data.Binary (Binary (..)) +import Data.Binary (Binary (..)) -import qualified Text.CSL as CSL -import qualified Text.CSL.Reference as REF -import qualified Text.CSL.Style as STY -import Text.Pandoc +import qualified Text.CSL as CSL +import qualified Text.CSL.Reference as REF +import qualified Text.CSL.Style as STY +import Text.Pandoc.Definition -------------------------------------------------------------------------------- -- orphans @@ -31,3 +32,17 @@ instance Binary REF.RefType instance Binary REF.Season instance Binary STY.Agent instance Binary STY.Formatted + +#if MIN_VERSION_pandoc_types(1, 21, 0) +instance Binary Caption +instance Binary Cell +instance Binary ColSpan +instance Binary ColWidth +instance Binary Row +instance Binary RowHeadColumns +instance Binary RowSpan +instance Binary TableBody +instance Binary TableFoot +instance Binary TableHead +#endif + -- cgit v1.2.3