diff --git a/Shake.hs b/Shake.hs index 83519d137..492a71551 100755 --- a/Shake.hs +++ b/Shake.hs @@ -71,6 +71,12 @@ manpageDir p buildDir :: FilePath buildDir = ".build" +pandocExe :: String +pandocExe = "pandoc" + +pandocFiltersResolver :: String +pandocFiltersResolver = "--resolver lts-5.11" + main :: IO () main = do @@ -113,8 +119,7 @@ main = do md = out <.> "md" tmpl = "doc/manpage.nroff" need $ md : tmpl : pandocFilters - cmd "pandoc" md "--to man -s --template" tmpl - -- XXX assume these are compiled + cmd pandocExe md "--to man -s --template" tmpl "--filter tools/pandocRemoveHtmlBlocks" "--filter tools/pandocRemoveHtmlInlines" "--filter tools/pandocRemoveLinks" @@ -135,7 +140,7 @@ main = do pandocFilters |%> \out -> do need [out <.> "hs"] - cmd "stack ghc" out + cmd ("stack "++pandocFiltersResolver++" ghc") out phony "clean" $ do putNormal "Cleaning generated files" diff --git a/tools/pandocCapitalizeHeaders.hs b/tools/pandocCapitalizeHeaders.hs index 1872bca76..ed7968563 100755 --- a/tools/pandocCapitalizeHeaders.hs +++ b/tools/pandocCapitalizeHeaders.hs @@ -1,6 +1,5 @@ #!/usr/bin/env stack --- stack runghc --package pandoc-types --- ^ installs pandoc-types in the current stack db when needed +{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} import Text.Pandoc.JSON import Text.Pandoc.Walk diff --git a/tools/pandocRemoveHtmlBlocks.hs b/tools/pandocRemoveHtmlBlocks.hs index acc99052a..839600181 100755 --- a/tools/pandocRemoveHtmlBlocks.hs +++ b/tools/pandocRemoveHtmlBlocks.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack --- stack runghc --package pandoc-types +{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} import Text.Pandoc.JSON diff --git a/tools/pandocRemoveHtmlInlines.hs b/tools/pandocRemoveHtmlInlines.hs index 63863bdea..be8be5b76 100755 --- a/tools/pandocRemoveHtmlInlines.hs +++ b/tools/pandocRemoveHtmlInlines.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack --- stack runghc --package pandoc-types +{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} import Text.Pandoc.JSON diff --git a/tools/pandocRemoveLinks.hs b/tools/pandocRemoveLinks.hs index 64a780b05..7ff7506b0 100755 --- a/tools/pandocRemoveLinks.hs +++ b/tools/pandocRemoveLinks.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack --- stack runghc --package pandoc-types +{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} import Text.Pandoc.JSON @@ -7,6 +7,6 @@ main :: IO () main = toJSONFilter removeLinks removeLinks :: Inline -> [Inline] -removeLinks (Link l _) = l +removeLinks (Link _ is _) = is removeLinks x = [x] diff --git a/tools/pandocRemoveManonlyBlocks.hs b/tools/pandocRemoveManonlyBlocks.hs index 4f762860c..ec3a8ef3f 100755 --- a/tools/pandocRemoveManonlyBlocks.hs +++ b/tools/pandocRemoveManonlyBlocks.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack --- stack runghc --package pandoc-types +{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} import Text.Pandoc.Builder import Text.Pandoc.JSON diff --git a/tools/pandocRemoveNotes.hs b/tools/pandocRemoveNotes.hs index 4fd894e27..29de813d3 100755 --- a/tools/pandocRemoveNotes.hs +++ b/tools/pandocRemoveNotes.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack --- stack runghc --package pandoc-types +{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} import Text.Pandoc.JSON diff --git a/tools/pandocRemoveWebonlyBlocks.hs b/tools/pandocRemoveWebonlyBlocks.hs index 0326bd2b3..180a64c28 100755 --- a/tools/pandocRemoveWebonlyBlocks.hs +++ b/tools/pandocRemoveWebonlyBlocks.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack --- stack runghc --package pandoc-types +{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} import Text.Pandoc.Builder import Text.Pandoc.JSON