[Git][ghc/ghc][wip/ghc-9.10] 2 commits: base: Ensure that CHANGELOG is included in extra-source-files

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/ghc-9.10 at Glasgow Haskell Compiler / GHC


Commits:
559e73fb by Ben Gamari at 2024-05-28T09:37:46-04:00
base: Ensure that CHANGELOG is included in extra-source-files

This was missed in the `ghc-internal` split.

Closes #24831.

- - - - -
b8d08f1a by Ben Gamari at 2024-05-28T09:37:46-04:00
Bump haddock submodule with fix to #24853

It appears that this reversion was not merged to ghc-9.10, again
breaking quick-jump in `base`'s Haddocks.

Fixes #24853.

- - - - -


2 changed files:

- libraries/base/base.cabal
- utils/haddock


Changes:

=====================================
libraries/base/base.cabal
=====================================
@@ -19,6 +19,8 @@ description:    Haskell's base library provides, among other things, core types
                 [Set](https://hackage.haskell.org/package/containers/docs/Data-Set.html) are available in the [containers](https://hackage.haskell.org/package/containers) library.
                 To work with textual data, use the [text](https://hackage.haskell.org/package/text/docs/Data-Text.html) library.
 
+extra-source-files:
+    changelog.md
 
 Library
     default-language: Haskell2010


=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit bda1fa14a8dd03eebae4a1225b1a422e5d87906c
+Subproject commit be6f0182cf874956816d1debde1da7a7a8b950bc



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a9a10cae1d13290d8cb9cd0d01b82351be153521...b8d08f1a9b15f4c8fe27d27bd03bd82ffe8578af

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a9a10cae1d13290d8cb9cd0d01b82351be153521...b8d08f1a9b15f4c8fe27d27bd03bd82ffe8578af
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240528/b1eee59b/attachment.html>