[Git][ghc/ghc][wip/backports-9.8] 5 commits: users_guide: Restore compatibility with pre-packaging Python

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/backports-9.8 at Glasgow Haskell Compiler / GHC


Commits:
e9d6f1d2 by Ben Gamari at 2023-08-09T01:37:21-04:00
users_guide: Restore compatibility with pre-packaging Python

The `packaging` package is not available in Ubuntu 18.04 or Debian 9.
Fall back to distutils in this case to avoid incurring an extra
dependency.

- - - - -
91023342 by Ben Gamari at 2023-08-09T02:42:07-04:00
Bump bytestring submodule to 0.12.0.1+

(cherry picked from commit f85d65da4fb44f1008cad1aef49621ab68243add)

- - - - -
375b3376 by Ben Gamari at 2023-08-21T16:05:20-04:00
Bump Cabal submodule

- - - - -
c735bbdf by Ben Gamari at 2023-08-21T16:05:32-04:00
Bump bytestring submodule

- - - - -
352f4657 by Ben Gamari at 2023-08-21T16:06:30-04:00
Bump haddock submodule

- - - - -


7 changed files:

- docs/users_guide/flags.py
- libraries/Cabal
- libraries/bytestring
- testsuite/tests/driver/recomp007/recomp007.stdout
- testsuite/tests/ghci/scripts/T9881.stdout
- testsuite/tests/ghci/scripts/ghci025.stdout
- utils/haddock


Changes:

=====================================
docs/users_guide/flags.py
=====================================
@@ -50,7 +50,12 @@ import sphinx
 from sphinx import addnodes
 from sphinx.domains.std import GenericObject
 from sphinx.errors import SphinxError
-from packaging.version import parse
+try:
+    from packaging.version import parse as parse_version
+except ImportError as e:
+    # N.B. `packaging` is not available in Ubuntu 18.04 or Debian 9
+    from distutils import LooseVersion as parse_version
+
 from utils import build_table_from_list
 
 import os.path


=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 75e340ceb9beaea9dfc4347684519b0ca3d6a8f8
+Subproject commit bcabe6f69e0fc35de2629c28f210d46f066e3268


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


=====================================
testsuite/tests/driver/recomp007/recomp007.stdout
=====================================
@@ -1,6 +1,6 @@
 "1.0"
-Preprocessing executable 'test' for b-1.0...
-Building executable 'test' for b-1.0...
+Preprocessing executable 'test' for b-1.0..
+Building executable 'test' for b-1.0..
 [1 of 2] Compiling B                ( B.hs, dist/build/test/test-tmp/B.o ) [A package changed]
 [3 of 3] Linking dist/build/test/test [Objects changed]
 "2.0"


=====================================
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.4.0: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.4.0: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.4.0: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.4.0: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.4.0: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.4.0: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.4.0: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.4.0: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.4.0:Data.ByteString.Internal.Type.ByteString
+  bytestring-0.11.5.2:Data.ByteString.Internal.Type.ByteString
   -> GHC.Types.Int
 :browse! T
 -- defined locally


=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit 9b6840977177e34771c652caeb4243bce89e5b97
+Subproject commit 342b0b39bc4a9ac6ddfa616bf7e965263ce78b50



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/291963af49a12a05c40d9ed6fd000cba8b15595b...352f465708d790ce95333a6bc5c12c89b864139f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/291963af49a12a05c40d9ed6fd000cba8b15595b...352f465708d790ce95333a6bc5c12c89b864139f
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/20230821/0fa8f515/attachment-0001.html>