diff options
| author | Alexey Kiryushin <alexey.a.kiryushin@gmail.com> | 2018-11-13 17:28:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 17:28:09 +0300 |
| commit | 71500f437dbc68395e2486efbcf14cc6cb007e51 (patch) | |
| tree | c5221876181938e0da5f17d6915abeb4e8137a37 | |
| parent | 67d0714dc3a9fc863140014d62efc573878df2d2 (diff) | |
| parent | 24ba7ffb30220baec845791df9c5c8236b23326e (diff) | |
Merge pull request #14 from capital-match/PR/fix-build-failure
Fix build failure, #12
| -rw-r--r-- | cabal.project | 21 | ||||
| -rw-r--r-- | src/HaskellCodeExplorer/GhcUtils.hs | 8 |
2 files changed, 28 insertions, 1 deletions
diff --git a/cabal.project b/cabal.project new file mode 100644 index 0000000..34e7a84 --- /dev/null +++ b/cabal.project @@ -0,0 +1,21 @@ +-- These are project-fixed settings and should not contain developer specific settings. +-- +-- Developer specific settings can be configured in cabal.project.local (e.g. optimization level) +-- either manually or through 'cabal new-configure'. +-- +-- Refer to the documentation: https://cabal.readthedocs.io/en/latest/nix-local-build.html#cabal-new-configure +-- https://cabal.readthedocs.io/en/latest/nix-local-build.html#configuring-builds-with-cabal-project +-- +-- A common config might be: +-- -- all local packages +-- optimization: 0 +-- +-- -- always build dependencies with highest optimization +-- package * +-- optimization: 2 + +with-compiler: ghc-8.4.4 + +packages: . + vendor/cabal-helper-0.8.1.2 + diff --git a/src/HaskellCodeExplorer/GhcUtils.hs b/src/HaskellCodeExplorer/GhcUtils.hs index 33370d5..3a4ec26 100644 --- a/src/HaskellCodeExplorer/GhcUtils.hs +++ b/src/HaskellCodeExplorer/GhcUtils.hs @@ -1110,7 +1110,13 @@ hsDocsToDocH :: DynFlags -> GlobalRdrEnv -> [HsDocString] -> Doc Name hsDocsToDocH flags rdrEnv = rename flags rdrEnv . overIdentifier (parseIdent flags) . - _doc . parseParas . concatMap (unpackFS . (\(HsDocString s) -> s)) + _doc +#if MIN_VERSION_haddock_library(1,6,0) + . parseParas Nothing +#else + . parseParas +#endif + . concatMap (unpackFS . (\(HsDocString s) -> s)) parseIdent :: DynFlags -> String -> Maybe RdrName parseIdent dflags str0 = |