Merge remote-tracking branch 'origin/master' into ghc-head

1 files changed, 67 insertions, 21 deletions

diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal
index cabfbc67..120af729 100644
--- a/haddock-library/haddock-library.cabal
+++ b/haddock-library/haddock-library.cabal
@@ -1,5 +1,5 @@
 name:                 haddock-library
-version:              1.4.2
+version:              1.4.6
 synopsis:             Library exposing some functionality of Haddock.
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries. These modules expose some functionality of it
@@ -9,37 +9,62 @@ description:          Haddock is a documentation-generation tool for Haskell
                       itself, see the ‘haddock’ package.
 license:              BSD3
 license-file:         LICENSE
-maintainer:           Simon Hengel <sol@typeful.net>, Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
+maintainer:           Alex Biehl <alexbiehl@gmail.com>, Simon Hengel <sol@typeful.net>, Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
 homepage:             http://www.haskell.org/haddock/
 bug-reports:          https://github.com/haskell/haddock/issues
 category:             Documentation
 build-type:           Simple
-cabal-version:        >= 1.10
-stability:            experimental
-
+cabal-version:        >= 2.0
+extra-source-files:
+  CHANGES.md
 library
   default-language:     Haskell2010
 
   build-depends:
-      base >= 4.5 && < 4.11
-    , bytestring
-    , transformers
-    , deepseq
+      base         >= 4.5     && < 4.11
+    , bytestring   >= 0.9.2.1 && < 0.11
+    , transformers >= 0.3.0   && < 0.6
 
-  hs-source-dirs:       src, vendor/attoparsec-0.12.1.1
+  -- internal sub-lib
+  build-depends:        attoparsec
+
+  hs-source-dirs:       src
   ghc-options:          -funbox-strict-fields -Wall -fwarn-tabs -O2
 
   exposed-modules:
+    Documentation.Haddock.Doc
+    Documentation.Haddock.Markup
     Documentation.Haddock.Parser
     Documentation.Haddock.Parser.Monad
     Documentation.Haddock.Types
-    Documentation.Haddock.Doc
+    Documentation.Haddock.Utf8
 
   other-modules:
-    Data.Attoparsec
+    Documentation.Haddock.Parser.Util
+
+  ghc-options: -Wall
+  if impl(ghc >= 8.0)
+    ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
+
+library attoparsec
+  default-language:     Haskell2010
+
+  build-depends:
+      base         >= 4.5     && < 4.11
+    , bytestring   >= 0.9.2.1 && < 0.11
+    , deepseq      >= 1.3     && < 1.5
+
+  hs-source-dirs:       vendor/attoparsec-0.13.1.0
+
+  -- NB: haddock-library needs only small part of lib:attoparsec
+  --     internally, so we only bundle that subset here
+  exposed-modules:
     Data.Attoparsec.ByteString
-    Data.Attoparsec.ByteString.Buffer
     Data.Attoparsec.ByteString.Char8
+
+  other-modules:
+    Data.Attoparsec
+    Data.Attoparsec.ByteString.Buffer
     Data.Attoparsec.ByteString.FastSet
     Data.Attoparsec.ByteString.Internal
     Data.Attoparsec.Combinator
@@ -47,8 +72,15 @@ library
     Data.Attoparsec.Internal.Fhthagn
     Data.Attoparsec.Internal.Types
     Data.Attoparsec.Number
-    Documentation.Haddock.Parser.Util
-    Documentation.Haddock.Utf8
+
+  ghc-options:          -funbox-strict-fields -Wall -fwarn-tabs -O2
+
+  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
@@ -57,26 +89,40 @@ test-suite spec
   hs-source-dirs:
       test
     , src
-    , vendor/attoparsec-0.12.1.1
   ghc-options: -Wall
 
   cpp-options:
       -DTEST
 
   other-modules:
+      Documentation.Haddock.Doc
+      Documentation.Haddock.Parser
+      Documentation.Haddock.Parser.Monad
+      Documentation.Haddock.Parser.Util
+      Documentation.Haddock.Parser.UtilSpec
       Documentation.Haddock.ParserSpec
+      Documentation.Haddock.Types
+      Documentation.Haddock.Utf8
       Documentation.Haddock.Utf8Spec
-      Documentation.Haddock.Parser.UtilSpec
 
   build-depends:
+      base-compat   ^>= 0.9.3
+    , transformers   >= 0.3.0   && < 0.6
+    , hspec         ^>= 2.4.4
+    , QuickCheck    ^>= 2.10
+
+  -- internal sub-lib
+  build-depends: attoparsec
+
+  -- Versions for the dependencies below are transitively pinned by
+  -- dependency on haddock-library:lib:attoparsec
+  build-depends:
       base
     , bytestring
-    , transformers
     , deepseq
 
-    , base-compat
-    , hspec
-    , QuickCheck == 2.*
+  build-tool-depends:
+    hspec-discover:hspec-discover ^>= 2.4.4
 
 source-repository head
   type:     git