From c28428fd8c61cfd21adba5b5fbefc0f8a1784da8 Mon Sep 17 00:00:00 2001 From: Bergi Date: Tue, 20 Mar 2018 12:57:58 +0100 Subject: Make Pandoc dependency optional --- hakyll.cabal | 71 +++++++++++++++++++++--------------------------------------- 1 file changed, 25 insertions(+), 46 deletions(-) (limited to 'hakyll.cabal') diff --git a/hakyll.cabal b/hakyll.cabal index 63bea3b..1e7c202 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -99,6 +99,11 @@ Flag buildWebsite Default: False Manual: True +Flag usePandoc + Description: Include Pandoc support + Default: True + Manual: True + Library Ghc-Options: -Wall Hs-Source-Dirs: lib @@ -134,9 +139,6 @@ Library Hakyll.Web.Html Hakyll.Web.Html.RelativizeUrls Hakyll.Web.Paginate - Hakyll.Web.Pandoc - Hakyll.Web.Pandoc.Biblio - Hakyll.Web.Pandoc.FileType Hakyll.Web.Redirect Hakyll.Web.Tags Hakyll.Web.Template @@ -156,7 +158,6 @@ Library Hakyll.Core.Provider.Internal Hakyll.Core.Provider.MetadataCache Hakyll.Core.Util.Parser - Hakyll.Web.Pandoc.Binary Paths_hakyll Build-Depends: @@ -173,14 +174,10 @@ Library filepath >= 1.0 && < 1.5, lrucache >= 1.1.1 && < 1.3, mtl >= 1 && < 2.3, - network >= 2.6 && < 2.7, network-uri >= 2.6 && < 2.7, - pandoc >= 2.0.5 && < 2.2, - pandoc-citeproc >= 0.14 && < 0.15, parsec >= 3.0 && < 3.2, process >= 1.6 && < 1.7, random >= 1.0 && < 1.2, - regex-base >= 0.93 && < 0.94, regex-tdfa >= 1.1 && < 1.3, resourcet >= 1.1 && < 1.3, scientific >= 0.3.4 && < 0.4, @@ -222,6 +219,19 @@ Library Cpp-options: -DCHECK_EXTERNAL + If flag(usePandoc) + Exposed-Modules: + Hakyll.Web.Pandoc + Hakyll.Web.Pandoc.Biblio + Hakyll.Web.Pandoc.FileType + Other-Modules: + Hakyll.Web.Pandoc.Binary + Build-Depends: + pandoc >= 2.0.5 && < 2.2, + pandoc-citeproc >= 0.14 && < 0.15 + Cpp-options: + -DUSE_PANDOC + Test-suite hakyll-tests Type: exitcode-stdio-1.0 Hs-source-dirs: tests @@ -243,7 +253,6 @@ Test-suite hakyll-tests Hakyll.Web.CompressCss.Tests Hakyll.Web.Html.RelativizeUrls.Tests Hakyll.Web.Html.Tests - Hakyll.Web.Pandoc.FileType.Tests Hakyll.Web.Template.Context.Tests Hakyll.Web.Template.Tests TestSuite.Util @@ -256,61 +265,31 @@ Test-suite hakyll-tests tasty-quickcheck >= 0.8 && < 0.11, -- Copy pasted from hakyll dependencies: base >= 4.8 && < 5, - binary >= 0.5 && < 0.10, - blaze-html >= 0.5 && < 0.10, - blaze-markup >= 0.5.1 && < 0.9, bytestring >= 0.9 && < 0.11, containers >= 0.3 && < 0.6, - cryptohash >= 0.7 && < 0.12, - data-default >= 0.4 && < 0.8, - deepseq >= 1.3 && < 1.5, - directory >= 1.0 && < 1.4, filepath >= 1.0 && < 1.5, - lrucache >= 1.1.1 && < 1.3, - mtl >= 1 && < 2.3, - network >= 2.6 && < 2.7, - network-uri >= 2.6 && < 2.7, - pandoc >= 2.0.5 && < 2.2, - pandoc-citeproc >= 0.14 && < 0.15, - parsec >= 3.0 && < 3.2, - process >= 1.6 && < 1.7, - random >= 1.0 && < 1.2, - regex-base >= 0.93 && < 0.94, - regex-tdfa >= 1.1 && < 1.3, - resourcet >= 1.1 && < 1.3, - scientific >= 0.3.4 && < 0.4, - tagsoup >= 0.13.1 && < 0.15, text >= 0.11 && < 1.3, - time >= 1.8 && < 1.10, - time-locale-compat >= 0.1 && < 0.2, unordered-containers >= 0.2 && < 0.3, - vector >= 0.11 && < 0.13, - yaml >= 0.8.11 && < 0.9, - optparse-applicative >= 0.12 && < 0.15 + yaml >= 0.8.11 && < 0.9 If flag(previewServer) - Build-depends: - wai >= 3.2 && < 3.3, - warp >= 3.2 && < 3.3, - wai-app-static >= 3.1 && < 3.2, - http-types >= 0.9 && < 0.13, - fsnotify >= 0.2 && < 0.3 Cpp-options: -DPREVIEW_SERVER If flag(watchServer) - Build-depends: - fsnotify >= 0.2 && < 0.3 Cpp-options: -DWATCH_SERVER If flag(checkExternal) - Build-depends: - http-conduit >= 2.2 && < 2.4, - http-types >= 0.7 && < 0.13 Cpp-options: -DCHECK_EXTERNAL + If flag(usePandoc) + Other-modules: + Hakyll.Web.Pandoc.FileType.Tests + Cpp-options: + -DUSE_PANDOC + Executable hakyll-init Main-is: Init.hs Ghc-options: -Wall -threaded -- cgit v1.2.3