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

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
bd323b0e by Ben Gamari at 2024-05-24T07:55:15-04:00
base: Ensure that CHANGELOG is included in extra-source-files

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

Closes #24831.

- - - - -
1bfd32e8 by Ben Gamari at 2024-05-24T07:55:15-04:00
base: Fix changelog reference to setBacktraceMechanismState

(cherry picked from commit b63f7ba01fdfd98a01d2f0dec8d9262b3e595c5d)

- - - - -


2 changed files:

- libraries/base/base.cabal
- libraries/base/changelog.md


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


=====================================
libraries/base/changelog.md
=====================================
@@ -23,7 +23,7 @@
   * Exceptions now capture backtrace information via their `ExceptionContext`. GHC
     supports several mechanisms by which backtraces can be collected which can be
     individually enabled and disabled via
-    `GHC.Exception.Backtrace.setEnabledBacktraceMechanisms`.
+    `GHC.Exception.Backtrace.setBacktraceMechanismState`.
   * Update to [Unicode 15.1.0](https://www.unicode.org/versions/Unicode15.1.0/).
   * Fix `withFile`, `withFileBlocking`, and `withBinaryFile` to not incorrectly annotate exceptions raised in wrapped computation. ([CLC proposal #237](https://github.com/haskell/core-libraries-committee/issues/237))
   * Fix `fdIsNonBlocking` to always be `0` for regular files and block devices on unix, regardless of `O_NONBLOCK`



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c5e00c35927d574f71bf77449817b131d1749750...1bfd32e871da8c8bb3163a85c1bd71e93c38af8f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c5e00c35927d574f71bf77449817b131d1749750...1bfd32e871da8c8bb3163a85c1bd71e93c38af8f
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/20240524/7f9b0406/attachment-0001.html>