[commit: haddock] ghc-head, ghc-head1, headdock-library-1.4.5, ie_avails, master, pr/cabal-desc, v2.18, wip/revert-ttg-2017-11-20, wip/ttg-2017-10-13, wip/ttg-2017-10-31, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13: Fix compilation of lib:haddock-library w/ GHC < 8 (8ed89b1)

git at git.haskell.org git at git.haskell.org
Mon Nov 20 21:09:03 UTC 2017


Repository : ssh://git@git.haskell.org/haddock

On branches: ghc-head,ghc-head1,headdock-library-1.4.5,ie_avails,master,pr/cabal-desc,v2.18,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13
Link       : http://git.haskell.org/haddock.git/commitdiff/8ed89b1899b32e94ca48f5c70f909d10e740c23a

>---------------------------------------------------------------

commit 8ed89b1899b32e94ca48f5c70f909d10e740c23a
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Jul 20 09:08:47 2017 +0200

    Fix compilation of lib:haddock-library w/ GHC < 8


>---------------------------------------------------------------

8ed89b1899b32e94ca48f5c70f909d10e740c23a
 haddock-library/haddock-library.cabal | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal
index 3b11761..9b967c0 100644
--- a/haddock-library/haddock-library.cabal
+++ b/haddock-library/haddock-library.cabal
@@ -50,6 +50,12 @@ library
     Data.Attoparsec.Number
     Documentation.Haddock.Parser.Util
 
+  ghc-options: -Wall
+  if impl(ghc >= 8.0)
+    ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
+  else
+    build-depends: semigroups ^>= 0.18.3, fail ^>= 4.9.0.0
+
 test-suite spec
   type:             exitcode-stdio-1.0
   default-language: Haskell2010



More information about the ghc-commits mailing list