[Git][ghc/ghc][master] 2 commits: hsc2hs: Bump submodule

[Marge Bot (@marge-bot)]

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


Commits:
0da490a1 by Ben Gamari at 2024-01-26T17:34:41-05:00
hsc2hs: Bump submodule

- - - - -
3f442fd2 by Ben Gamari at 2024-01-26T17:34:41-05:00
Bump containers submodule to 0.7

- - - - -


11 changed files:

- compiler/ghc.cabal.in
- ghc/ghc-bin.cabal.in
- libraries/Cabal
- libraries/containers
- libraries/ghc-boot/ghc-boot.cabal.in
- libraries/ghc-heap/ghc-heap.cabal.in
- libraries/ghci/ghci.cabal.in
- libraries/haskeline
- testsuite/tests/driver/T4437.hs
- utils/hsc2hs
- utils/iserv/iserv.cabal.in


Changes:

=====================================
compiler/ghc.cabal.in
=====================================
@@ -114,7 +114,7 @@ Library
                    bytestring >= 0.9 && < 0.13,
                    binary     == 0.8.*,
                    time       >= 1.4 && < 1.13,
-                   containers >= 0.6.2.1 && < 0.7,
+                   containers >= 0.6.2.1 && < 0.8,
                    array      >= 0.1 && < 0.6,
                    filepath   >= 1   && < 1.5,
                    template-haskell == 2.21.*,


=====================================
ghc/ghc-bin.cabal.in
=====================================
@@ -37,7 +37,7 @@ Executable ghc
                    directory  >= 1   && < 1.4,
                    process    >= 1   && < 1.7,
                    filepath   >= 1   && < 1.5,
-                   containers >= 0.5 && < 0.7,
+                   containers >= 0.5 && < 0.8,
                    transformers >= 0.5 && < 0.7,
                    ghc-boot      == @ProjectVersionMunged@,
                    ghc           == @ProjectVersionMunged@


=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit a0d815c4773a9d7aa0f48cc5bd08947d282dc917
+Subproject commit ae3c40a20bf98870488e3b40fc4495009b026e33


=====================================
libraries/containers
=====================================
@@ -1 +1 @@
-Subproject commit f61b0c9104a3c436361f56a0974c5eeef40c1b89
+Subproject commit 4fda06c43ea14f808748aa8988158946c3ce0caf


=====================================
libraries/ghc-boot/ghc-boot.cabal.in
=====================================
@@ -76,7 +76,7 @@ Library
     build-depends: base       >= 4.7 && < 4.20,
                    binary     == 0.8.*,
                    bytestring >= 0.10 && < 0.13,
-                   containers >= 0.5 && < 0.7,
+                   containers >= 0.5 && < 0.8,
                    directory  >= 1.2 && < 1.4,
                    filepath   >= 1.3 && < 1.5,
                    deepseq    >= 1.4 && < 1.6,


=====================================
libraries/ghc-heap/ghc-heap.cabal.in
=====================================
@@ -25,7 +25,7 @@ library
   build-depends:    base             >= 4.9.0 && < 5.0
                   , ghc-prim         > 0.2 && < 0.12
                   , rts              == 1.0.*
-                  , containers       >= 0.6.2.1 && < 0.7
+                  , containers       >= 0.6.2.1 && < 0.8
 
   ghc-options:      -Wall
   if !os(ghcjs)


=====================================
libraries/ghci/ghci.cabal.in
=====================================
@@ -79,7 +79,7 @@ library
         ghc-prim         >= 0.5.0 && < 0.12,
         binary           == 0.8.*,
         bytestring       >= 0.10 && < 0.13,
-        containers       >= 0.5 && < 0.7,
+        containers       >= 0.5 && < 0.8,
         deepseq          >= 1.4 && < 1.6,
         filepath         == 1.4.*,
         ghc-boot         == @ProjectVersionMunged@,


=====================================
libraries/haskeline
=====================================
@@ -1 +1 @@
-Subproject commit 16ee820fc86f43045365f2c3536ad18147eb0b79
+Subproject commit ab2272336641195d0d087a6ccfd9bf511d208860


=====================================
testsuite/tests/driver/T4437.hs
=====================================
@@ -37,7 +37,7 @@ check title expected got
 -- See Note [Adding a language extension] in compiler/GHC/Driver/Session.hs.
 expectedGhcOnlyExtensions :: [String]
 expectedGhcOnlyExtensions =
-    [ "TypeAbstractions"
+    [
     ]
 
 expectedCabalOnlyExtensions :: [String]


=====================================
utils/hsc2hs
=====================================
@@ -1 +1 @@
-Subproject commit 5bf5c61e7c6e813d03bc069e17289c574185d41c
+Subproject commit a6d9f73689ac51100ed7f6af0ea8cecd34422a91


=====================================
utils/iserv/iserv.cabal.in
=====================================
@@ -34,7 +34,7 @@ Executable iserv
                    base       >= 4   && < 5,
                    binary     >= 0.7 && < 0.11,
                    bytestring >= 0.10 && < 0.13,
-                   containers >= 0.5 && < 0.7,
+                   containers >= 0.5 && < 0.8,
                    deepseq    >= 1.4 && < 1.6,
                    ghci       == @ProjectVersionMunged@
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b2d8cd85fa6543f5d424bccadf8824f9b416498c...3f442fd2cba968d6f8e2d451892d26a09d7409ff

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b2d8cd85fa6543f5d424bccadf8824f9b416498c...3f442fd2cba968d6f8e2d451892d26a09d7409ff
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/20240126/14f5e66f/attachment-0001.html>