Support pandoc >= 3.8 && <3.10, hoauth2 == 2.15.*

gitit.cabal

@@ -134,7 +134,7 @@ Library
                      mtl,
                      old-time,
                      temporary,
-                     pandoc >= 2.9 && < 2.20 || >= 3.0 && < 3.8,
+                     pandoc >= 2.9 && < 2.20 || >= 3.0 && < 3.11,
                      pandoc-types >= 1.20 && < 1.24,
                      skylighting >= 0.8.2.3 && < 0.15,
                      bytestring,
@@ -162,7 +162,7 @@ Library
                      json >= 0.4 && < 0.12,
                      uri-bytestring >= 0.2.3.3,
                      split,
-                     hoauth2 >= 2.3.0 && < 2.15,
+                     hoauth2 >= 2.3.0 && < 2.16,
                      xml-conduit >= 1.5 && < 1.11,
                      http-conduit >= 2.1.6 && < 2.4,
                      http-client-tls >= 0.2.2 && < 0.4,

src/Network/Gitit/Authentication/Github.hs

@@ -16,7 +16,11 @@ import qualified Data.ByteString.Char8 as BS
 import qualified Data.ByteString.Lazy as BSL
 import qualified URI.ByteString as URI
 import Network.HTTP.Conduit
+#if MIN_VERSION_hoauth2(2,15,0)
+import Network.OAuth2
+#else
 import Network.OAuth.OAuth2
+#endif
 import Control.Monad (liftM, mplus, mzero)
 import Data.Maybe
 import Data.Aeson

src/Network/Gitit/Config.hs

@@ -42,7 +42,11 @@ import Paths_gitit (getDataFileName)
 import System.FilePath ((</>))
 import Text.Pandoc hiding (ERROR, WARNING, MathJax, MathML, WebTeX, getDataFileName)
 import qualified Control.Exception as E
+#if MIN_VERSION_hoauth2(2,15,0)
+import Network.OAuth2 (OAuth2(..))
+#else
 import Network.OAuth.OAuth2 (OAuth2(..))
+#endif
 import URI.ByteString (parseURI, laxURIParserOptions)
 import qualified Data.ByteString.Char8 as BS
 import Network.Gitit.Compat.Except

src/Network/Gitit/ContentTransformer.hs

@@ -515,7 +515,11 @@ pandocToHtml pandocContents = do
                                  MathJax u -> Pandoc.MathJax $ T.pack u
                                  RawTeX -> Pandoc.PlainMath
                       , writerTableOfContents = toc
+#if MIN_VERSION_pandoc(3,8,0)
+                      , writerHighlightMethod = Skylighting pygments
+#else
                       , writerHighlightStyle = Just pygments
+#endif
                       , writerExtensions = if bird
                                               then enableExtension Ext_literate_haskell
                                                    $ writerExtensions def

src/Network/Gitit/Types.hs

@@ -83,7 +83,11 @@ import Data.FileStore.Types
 import Network.Gitit.Server
 import Text.HTML.TagSoup.Entity (lookupEntity)
 import Data.Char (isSpace)
+#if MIN_VERSION_hoauth2(2,15,0)
+import Network.OAuth2
+#else
 import Network.OAuth.OAuth2
+#endif
 import Text.Blaze.Html (Html)
 
 data PageType = Markdown