Merge pull request #857 from sjakobi/ghc-head-update-3

Update ghc-head

1 files changed, 35 insertions, 56 deletions

diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal
index 535cff0e..df2dbf93 100644
--- a/haddock-library/haddock-library.cabal
+++ b/haddock-library/haddock-library.cabal
@@ -1,5 +1,6 @@
+cabal-version:        2.0
 name:                 haddock-library
-version:              1.4.6
+version:              1.6.0
 synopsis:             Library exposing some functionality of Haddock.
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries. These modules expose some functionality of it
@@ -8,28 +9,27 @@ description:          Haddock is a documentation-generation tool for Haskell
                       project if you can't release often. For interacting with Haddock
                       itself, see the ‘haddock’ package.
 license:              BSD3
-license-file:         LICENSE
+license-files:        LICENSE
 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:        >= 2.0
 extra-source-files:
   CHANGES.md
+
 library
   default-language:     Haskell2010
 
   build-depends:
       base         >= 4.5     && < 4.13
     , bytestring   >= 0.9.2.1 && < 0.11
+    , containers   >= 0.4.2.1 && < 0.6
     , transformers >= 0.3.0   && < 0.6
-
-  -- internal sub-lib
-  build-depends:        attoparsec
+    , text         >= 1.2.3.0  && < 1.3
+    , parsec       >= 3.1.13.0 && < 3.2
 
   hs-source-dirs:       src
-  ghc-options:          -funbox-strict-fields -Wall -fwarn-tabs -O2
 
   exposed-modules:
     Documentation.Haddock.Doc
@@ -42,44 +42,9 @@ library
   other-modules:
     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.13
-    , 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.Char8
-
-  other-modules:
-    Data.Attoparsec
-    Data.Attoparsec.ByteString.Buffer
-    Data.Attoparsec.ByteString.FastSet
-    Data.Attoparsec.ByteString.Internal
-    Data.Attoparsec.Combinator
-    Data.Attoparsec.Internal
-    Data.Attoparsec.Internal.Fhthagn
-    Data.Attoparsec.Internal.Types
-    Data.Attoparsec.Number
-
-  ghc-options:          -funbox-strict-fields -Wall -fwarn-tabs -O2
-
-  ghc-options: -Wall
+  ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2
   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
@@ -106,23 +71,37 @@ test-suite spec
       Documentation.Haddock.Utf8Spec
 
   build-depends:
-      base-compat   ^>= 0.9.3
+      base         >= 4.5     && < 4.12
+    , base-compat  >= 0.9.3   && < 0.11
+    , bytestring   >= 0.9.2.1 && < 0.11
+    , containers   >= 0.4.2.1 && < 0.6
     , transformers   >= 0.3.0   && < 0.6
-    , hspec         ^>= 2.4.4
-    , QuickCheck    ^>= 2.10
+    , hspec        >= 2.4.4   && < 2.6
+    , QuickCheck    ^>= 2.11
+    , text         >= 1.2.3.0  && < 1.3
+    , parsec       >= 3.1.13.0 && < 3.2
+    , deepseq      >= 1.3     && < 1.5
 
-  -- internal sub-lib
-  build-depends: attoparsec
+  build-tool-depends:
+    hspec-discover:hspec-discover >= 2.4.4 && < 2.6
 
-  -- Versions for the dependencies below are transitively pinned by
-  -- dependency on haddock-library:lib:attoparsec
+test-suite fixtures
+  type:             exitcode-stdio-1.0
+  default-language: Haskell2010
+  main-is:          Fixtures.hs
+  ghc-options:      -Wall -O0
+  hs-source-dirs:   fixtures
   build-depends:
-      base
-    , bytestring
-    , deepseq
-
-  build-tool-depends:
-    hspec-discover:hspec-discover ^>= 2.4.4
+      base         >= 4.5     && < 4.12
+    , base-compat  >= 0.9.3   && < 0.11
+    , directory             ^>= 1.3.0.2
+    , filepath              ^>= 1.4.1.2
+    , optparse-applicative  ^>= 0.14.0.0
+    , tree-diff             ^>= 0.0.0.1
+
+  -- Depend on the library.
+  build-depends:
+    haddock-library
 
 source-repository head
   type:     git