[Git][ghc/ghc][wip/ghc-9.10] 4 commits: Bump parsec submodule to upstream master

[Ben Gamari (@bgamari)]

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


Commits:
2d1c6074 by Ben Gamari at 2024-04-12T10:27:25-04:00
Bump parsec submodule to upstream master

- - - - -
6efe55ef by Ben Gamari at 2024-04-12T10:27:27-04:00
testsuite: More aggressive normalisation of process004 output

It turns out that this test uses `execvp`, not `exec` on CentOS 7.
Normalise this spurious difference away.

- - - - -
702ff84e by Ben Gamari at 2024-04-12T11:35:06-04:00
Bump array, binary, stm submodules

- - - - -
51fe02fd by Ben Gamari at 2024-04-12T12:33:35-04:00
Bump time submodule to 1.14

As requested in #24528.

- - - - -


12 changed files:

- compiler/ghc.cabal.in
- ghc/ghc-bin.cabal.in
- hadrian/src/Rules/Dependencies.hs
- libraries/Cabal
- libraries/array
- libraries/binary
- libraries/directory
- libraries/hpc
- libraries/parsec
- libraries/stm
- libraries/time
- testsuite/tests/process/all.T


Changes:

=====================================
compiler/ghc.cabal.in
=====================================
@@ -111,7 +111,7 @@ Library
                    process    >= 1   && < 1.7,
                    bytestring >= 0.9 && < 0.13,
                    binary     == 0.8.*,
-                   time       >= 1.4 && < 1.13,
+                   time       >= 1.4 && < 1.15,
                    containers >= 0.6.2.1 && < 0.8,
                    array      >= 0.1 && < 0.6,
                    filepath   >= 1   && < 1.6,


=====================================
ghc/ghc-bin.cabal.in
=====================================
@@ -61,7 +61,7 @@ Executable ghc
             ghci           == @ProjectVersionMunged@,
             haskeline      == 0.8.*,
             exceptions     == 0.10.*,
-            time           >= 1.8 && < 1.13
+            time           >= 1.8 && < 1.15
         CPP-Options: -DHAVE_INTERNAL_INTERPRETER
         Other-Modules:
             GHCi.Leak


=====================================
hadrian/src/Rules/Dependencies.hs
=====================================
@@ -30,6 +30,7 @@ extra_dependencies =
     ,dep (containers, "Data.Set.Internal") th_internal
     ,dep (containers, "Data.Sequence.Internal") th_internal
     ,dep (containers, "Data.Graph") th_internal
+    ,dep (time, "Data.Time.Clock.Internal.UniversalTime") th_internal
     ]))
     ]
 


=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 7d140c56d277c49fb8452729de3bb62c937017a0
+Subproject commit b5ac2f70b0289c5ee1d31211a44133217a8fb9e3


=====================================
libraries/array
=====================================
@@ -1 +1 @@
-Subproject commit 510456786715d96dfc9e9bc4cead9aace1ce2db6
+Subproject commit a65f8a5e7c26fe9b8012b90cbbff8866f8d39113


=====================================
libraries/binary
=====================================
@@ -1 +1 @@
-Subproject commit b30971d569e934cd54d08c45c7e906cfe8af3709
+Subproject commit a501955f7ab48da81d732958c8834caaa3e470b6


=====================================
libraries/directory
=====================================
@@ -1 +1 @@
-Subproject commit 4b7c231d187cf253c5f446c4aed2fea26b81d5f9
+Subproject commit fc144a581768eb0a328bdcd5adcffca400bd0876


=====================================
libraries/hpc
=====================================
@@ -1 +1 @@
-Subproject commit 8bf6f8b08b0d72cb9231775b66ca572acc1d3197
+Subproject commit 4989c41b96c7c9ca09a6687da638ac28f3d3688b


=====================================
libraries/parsec
=====================================
@@ -1 +1 @@
-Subproject commit 0736c51d0b39a9852cd39259af4cfaf6cafe36a3
+Subproject commit 9c071b05fbb077afbaf0dd2dfdab21265859ae91


=====================================
libraries/stm
=====================================
@@ -1 +1 @@
-Subproject commit b77afda28b60f526ebb4be436240afd6ca956673
+Subproject commit ff8f8ceeceb14ac59accd53dd82a5d32c7e08626


=====================================
libraries/time
=====================================
@@ -1 +1 @@
-Subproject commit baab563ee2ce547f7b7f7e7069ed09db2d406941
+Subproject commit e5c5d1987011efe88a21ab6ded45aaa33a16274f


=====================================
testsuite/tests/process/all.T
=====================================
@@ -1,6 +1,10 @@
-# some platforms use spawnp instead of exec in some cases, resulting
+# some platforms use spawnp or execvp instead of exec in some cases, resulting
 # in spurious error output changes.
-normalise_exec = normalise_fun(lambda s: s.replace('posix_spawnp', 'exec'))
+normalise_exec = normalise_fun(
+    lambda s: s.replace('posix_spawnp', 'exec'),
+    lambda s: s.replace('execvp', 'exec'),
+    lambda s: s.replace('execvpe', 'exec'),
+)
 
 test('process001', [req_process], compile_and_run, [''])
 test('process002', [fragile_for(16547, concurrent_ways), req_process], compile_and_run, [''])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4cf82155ab7ed13249681a2fdf5a88dc93bf1e0b...51fe02fd96f9ca4da959fc3294ea1fc4e7baaff9

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4cf82155ab7ed13249681a2fdf5a88dc93bf1e0b...51fe02fd96f9ca4da959fc3294ea1fc4e7baaff9
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/20240412/e8e6013e/attachment-0001.html>