[Git][ghc/ghc][wip/ghc-9.6-backports] 3 commits: Bump bytestring submodule to 0.11.5.2 (#23789)

[Zubin (@wz1000)]

Zubin pushed to branch wip/ghc-9.6-backports at Glasgow Haskell Compiler / GHC


Commits:
e8d84040 by Zubin Duggal at 2023-09-18T12:46:36+05:30
Bump bytestring submodule to 0.11.5.2 (#23789)

(cherry picked from commit a98ae4ec6f4325c32c86cc0726947b6ecf4d047a)

- - - - -
e5afc1e4 by Zubin Duggal at 2023-09-18T12:46:36+05:30
Bump filepath submodule to 1.4.100.4
Bump bytestring submodule to 0.11.5.2

- - - - -
975c2ba3 by Zubin Duggal at 2023-09-18T12:46:36+05:30
Prepare release 9.6.3

- - - - -


8 changed files:

- configure.ac
- docs/users_guide/release-notes.rst
- libraries/base/base.cabal
- libraries/base/changelog.md
- libraries/bytestring
- libraries/filepath
- testsuite/tests/ghci/scripts/T9881.stdout
- testsuite/tests/ghci/scripts/ghci025.stdout


Changes:

=====================================
configure.ac
=====================================
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.6.2], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.6.3], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
     # Version on master must be X.Y (not X.Y.Z) for ProjectVersionMunged variable
     # to be useful (cf #19058). However, the version must have three components
     # (X.Y.Z) on stable branches (e.g. ghc-9.2) to ensure that pre-releases are


=====================================
docs/users_guide/release-notes.rst
=====================================
@@ -6,3 +6,4 @@ Release notes
 
    9.6.1-notes
    9.6.2-notes
+   9.6.3-notes


=====================================
libraries/base/base.cabal
=====================================
@@ -1,6 +1,6 @@
 cabal-version:  3.0
 name:           base
-version:        4.18.0.0
+version:        4.18.1.0
 -- NOTE: Don't forget to update ./changelog.md
 
 license:        BSD-3-Clause


=====================================
libraries/base/changelog.md
=====================================
@@ -1,5 +1,13 @@
 # Changelog for [`base` package](http://hackage.haskell.org/package/base)
 
+## 4.18.1.0 *September 2023*
+
+   * Add missing int64/word64-to-double/float rules ([CLC Proposal #203](https://github.com/haskell/core-libraries-committee/issues/203))
+
+   * Restore `mingwex` dependency on Windows (#23309).
+
+   * Fix an incorrect CPP guard on `darwin_HOST_OS`.
+
 ## 4.18.0.0 *March 2023*
 
   * Add `INLINABLE` pragmas to `generic*` functions in Data.OldList ([CLC proposal #129](https://github.com/haskell/core-libraries-committee/issues/130))


=====================================
libraries/bytestring
=====================================
@@ -1 +1 @@
-Subproject commit 9cab76dc861f651c3940e873ce921d9e09733cc8
+Subproject commit e377f49b046c986184cf802c8c6386b04c1f1aeb


=====================================
libraries/filepath
=====================================
@@ -1 +1 @@
-Subproject commit bb0e5cd49655b41bd3209b100f7a5a74698cbe83
+Subproject commit 367f6bffc158ef1a9055fb876e23447636853aa4


=====================================
testsuite/tests/ghci/scripts/T9881.stdout
=====================================
@@ -19,19 +19,19 @@ instance Ord Data.ByteString.Lazy.ByteString
 
 type Data.ByteString.ByteString :: *
 data Data.ByteString.ByteString
-  = bytestring-0.11.5.1:Data.ByteString.Internal.Type.BS {-# UNPACK #-}(GHC.ForeignPtr.ForeignPtr
+  = bytestring-0.11.5.2:Data.ByteString.Internal.Type.BS {-# UNPACK #-}(GHC.ForeignPtr.ForeignPtr
                                                                           GHC.Word.Word8)
                                                          {-# UNPACK #-}Int
-  	-- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  	-- Defined in ‘bytestring-0.11.5.2:Data.ByteString.Internal.Type’
 instance Monoid Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.5.2:Data.ByteString.Internal.Type’
 instance Read Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.5.2:Data.ByteString.Internal.Type’
 instance Semigroup Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.5.2:Data.ByteString.Internal.Type’
 instance Show Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.5.2:Data.ByteString.Internal.Type’
 instance Eq Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.5.2:Data.ByteString.Internal.Type’
 instance Ord Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.5.2:Data.ByteString.Internal.Type’


=====================================
testsuite/tests/ghci/scripts/ghci025.stdout
=====================================
@@ -54,7 +54,7 @@ Prelude.length :: Data.Foldable.Foldable t => t a -> GHC.Types.Int
 type T.Integer :: *
 data T.Integer = ...
 T.length ::
-  bytestring-0.11.5.1:Data.ByteString.Internal.Type.ByteString
+  bytestring-0.11.5.2:Data.ByteString.Internal.Type.ByteString
   -> GHC.Types.Int
 :browse! T
 -- defined locally



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a61d4c4694aa555091e3d726a60f68aec9a46aa0...975c2ba31e2a66de90278a9a1ac57dbdfdf166f6

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a61d4c4694aa555091e3d726a60f68aec9a46aa0...975c2ba31e2a66de90278a9a1ac57dbdfdf166f6
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/20230918/2b2b2836/attachment-0001.html>