Release haddock-2.23, haddock-library-1.8.0

Tentatively adjust bounds and changelogs for the release to be bundled
with GHC 8.8.1.

6 files changed, 18 insertions, 17 deletions

diff --git a/CHANGES.md b/CHANGES.md
index a6d96fed..88656da4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-## Changes in TBA 
+## Changes in 2.23.0
 
  * "Linuwial" is the new default theme (#721, #782, #949)
 
@@ -29,6 +29,8 @@
  * Many fixes to the LaTeX backend, mostly focused on not crashing
    as well as generating LaTeX source that compiles
 
+ * More flexible parsing of the module header
+
 ## Changes in version 2.22.0
 
  * Make `--package-version` optional for `--hoogle` (#899)
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index c427e752..9a120f5d 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -1,6 +1,6 @@
 cabal-version:        2.0
 name:                 haddock-api
-version:              2.22.0
+version:              2.23.0
 synopsis:             A documentation-generation tool for Haskell libraries
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries
@@ -42,7 +42,7 @@ library
   default-language: Haskell2010
 
   -- this package typically supports only single major versions
-  build-depends: base            ^>= 4.12.0
+  build-depends: base            ^>= 4.13.0
                , ghc             ^>= 8.8
                , ghc-paths       ^>= 0.1.0.9
                , haddock-library ^>= 1.8.0
@@ -65,7 +65,7 @@ library
   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
+    ghc-options: -Wcompat -Wnoncanonical-monad-instances
 
   exposed-modules:
     Documentation.Haddock
diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal
index 5c744082..99773475 100644
--- a/haddock-library/haddock-library.cabal
+++ b/haddock-library/haddock-library.cabal
@@ -33,7 +33,7 @@ common lib-defaults
 
   ghc-options: -funbox-strict-fields -Wall -fwarn-tabs
   if impl(ghc >= 8.0)
-    ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
+    ghc-options: -Wcompat -Wnoncanonical-monad-instances
 
 library
   import: lib-defaults
diff --git a/haddock-library/src/Documentation/Haddock/Parser/Identifier.hs b/haddock-library/src/Documentation/Haddock/Parser/Identifier.hs
index 7bc98b62..a83e5abf 100644
--- a/haddock-library/src/Documentation/Haddock/Parser/Identifier.hs
+++ b/haddock-library/src/Documentation/Haddock/Parser/Identifier.hs
@@ -109,7 +109,7 @@ takeIdentifier input = listToMaybe $ do
     (cl, input'''') <- maybeToList (T.uncons input''')
     guard (cl == '\'' || cl == '`')
 
-    pure (ns, op, ident, cl, input'''')
+    return (ns, op, ident, cl, input'''')
 
   where
 
@@ -122,21 +122,21 @@ takeIdentifier input = listToMaybe $ do
             , c' == ',' || c' == ')'
             -> do let (commas, t'') = T.span (== ',') t'
                   (')', t''') <- maybeToList (T.uncons t'')
-                  pure (T.take (T.length commas + 2) t, t''')
+                  return (T.take (T.length commas + 2) t, t''')
 
         -- Parenthesized
         '(' -> do (n,   t'' ) <- general False 0 [] t'
                   (')', t''') <- maybeToList (T.uncons t'')
-                  pure (T.take (n + 2) t, t''')
+                  return (T.take (n + 2) t, t''')
 
         -- Backticked
         '`' -> do (n,   t'' ) <- general False 0 [] t'
                   ('`', t''') <- maybeToList (T.uncons t'')
-                  pure (T.take (n + 2) t, t''')
+                  return (T.take (n + 2) t, t''')
 
         -- Unadorned
         _   -> do (n,   t'' ) <- general False 0 [] t
-                  pure (T.take n t, t'')
+                  return (T.take n t, t'')
 
     -- | Parse out a possibly qualified operator or identifier
     general :: Bool           -- ^ refuse inputs starting with operators
diff --git a/haddock-test/haddock-test.cabal b/haddock-test/haddock-test.cabal
index 23b5953c..ed174e4f 100644
--- a/haddock-test/haddock-test.cabal
+++ b/haddock-test/haddock-test.cabal
@@ -16,7 +16,7 @@ library
   default-language: Haskell2010
   ghc-options: -Wall
   hs-source-dirs:   src
-  build-depends:    base >= 4.3 && < 4.13, bytestring, directory, process, filepath, Cabal, xml, xhtml
+  build-depends:    base >= 4.3 && < 4.14, bytestring, directory, process, filepath, Cabal, xml, xhtml
 
   exposed-modules:
     Test.Haddock
diff --git a/haddock.cabal b/haddock.cabal
index 078955fb..563955b9 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,6 +1,6 @@
 cabal-version:        2.0
 name:                 haddock
-version:              2.22.0
+version:              2.23.0
 synopsis:             A documentation-generation tool for Haskell libraries
 description:
   This is Haddock, a tool for automatically generating documentation
@@ -23,7 +23,7 @@ description:
   without any documentation annotations, Haddock can generate useful documentation
   from your source code.
   .
-  <<https://cdn.rawgit.com/haskell/haddock/ghc-8.6/doc/cheatsheet/haddocks.svg>>
+  <<https://cdn.rawgit.com/haskell/haddock/ghc-8.8/doc/cheatsheet/haddocks.svg>>
 license:              BSD3
 license-file:         LICENSE
 author:               Simon Marlow, David Waern
@@ -33,7 +33,7 @@ bug-reports:          https://github.com/haskell/haddock/issues
 copyright:            (c) Simon Marlow, David Waern
 category:             Documentation
 build-type:           Simple
-tested-with:          GHC==8.6.*
+tested-with:          GHC==8.8.*
 
 extra-source-files:
   CHANGES.md
@@ -64,8 +64,7 @@ executable haddock
 
   -- haddock typically only supports a single GHC major version 
   build-depends:
-    -- FIXME: drop 4.12.0.0 once GHC HEAD updates to 4.13.0.0
-    base ^>= 4.12.0.0 || ^>= 4.13.0.0
+    base ^>= 4.13.0.0
 
   if flag(in-ghc-tree)
     hs-source-dirs: haddock-api/src,  haddock-library/src
@@ -141,7 +140,7 @@ executable haddock
   else
     -- in order for haddock's advertised version number to have proper meaning,
     -- we pin down to a single haddock-api version.
-    build-depends:  haddock-api == 2.22.0
+    build-depends:  haddock-api == 2.23.0
 
 test-suite html-test
   type:             exitcode-stdio-1.0