diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 523f2d7bd197950a4fb90bae4ee715530cfd875a..012b5dabb64dc4ee4fb54a74e0754f0e1f79addf 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -105,7 +105,7 @@ Library extra-libraries: zstd CPP-Options: -DHAVE_LIBZSTD - Build-Depends: base >= 4.11 && < 4.20, + Build-Depends: base >= 4.11 && < 4.21, deepseq >= 1.4 && < 1.6, directory >= 1 && < 1.4, process >= 1 && < 1.7, diff --git a/libraries/array b/libraries/array index 4c9cc53ea0a76fcea3542391832f7f5bd95ace09..510456786715d96dfc9e9bc4cead9aace1ce2db6 160000 --- a/libraries/array +++ b/libraries/array @@ -1 +1 @@ -Subproject commit 4c9cc53ea0a76fcea3542391832f7f5bd95ace09 +Subproject commit 510456786715d96dfc9e9bc4cead9aace1ce2db6 diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index e92dc068d4b237654e9f0087752eb65567a49f58..371fe5d8229c640b5f506da71c4a472689e7c742 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: base -version: 4.19.0.0 +version: 4.20.0.0 -- NOTE: Don't forget to update ./changelog.md license: BSD-3-Clause diff --git a/libraries/deepseq b/libraries/deepseq index eb1eff5236d2a38e10f49e12301daa52ad20915b..09aed1bf774f2f05c8b390539ce35adf5cd68c30 160000 --- a/libraries/deepseq +++ b/libraries/deepseq @@ -1 +1 @@ -Subproject commit eb1eff5236d2a38e10f49e12301daa52ad20915b +Subproject commit 09aed1bf774f2f05c8b390539ce35adf5cd68c30 diff --git a/libraries/directory b/libraries/directory index fc38cbfc5c7c4b631ed89d6b41bbe00ee96c8b21..4b7c231d187cf253c5f446c4aed2fea26b81d5f9 160000 --- a/libraries/directory +++ b/libraries/directory @@ -1 +1 @@ -Subproject commit fc38cbfc5c7c4b631ed89d6b41bbe00ee96c8b21 +Subproject commit 4b7c231d187cf253c5f446c4aed2fea26b81d5f9 diff --git a/libraries/filepath b/libraries/filepath index 4dd36add328032f9cbf0eff2a3511ab4369b18eb..87a09e296ea6fc137a0b32edda1bd0f54332642e 160000 --- a/libraries/filepath +++ b/libraries/filepath @@ -1 +1 @@ -Subproject commit 4dd36add328032f9cbf0eff2a3511ab4369b18eb +Subproject commit 87a09e296ea6fc137a0b32edda1bd0f54332642e diff --git a/libraries/ghc-boot-th/ghc-boot-th.cabal.in b/libraries/ghc-boot-th/ghc-boot-th.cabal.in index 7cd949ccc620bfa89fa90534baf93283a900f915..309fc23bce768ac1c9946a12169762bb281b917d 100644 --- a/libraries/ghc-boot-th/ghc-boot-th.cabal.in +++ b/libraries/ghc-boot-th/ghc-boot-th.cabal.in @@ -36,4 +36,4 @@ Library GHC.ForeignSrcLang.Type GHC.Lexeme - build-depends: base >= 4.7 && < 4.20 + build-depends: base >= 4.7 && < 4.21 diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in index a0f250574ae4c282c34ea199cad12e3e570f0687..79caa3a9b5c683465d801841193e779d1a5d971b 100644 --- a/libraries/ghc-boot/ghc-boot.cabal.in +++ b/libraries/ghc-boot/ghc-boot.cabal.in @@ -73,7 +73,7 @@ Library GHC.Version GHC.Platform.Host - build-depends: base >= 4.7 && < 4.20, + build-depends: base >= 4.7 && < 4.21, binary == 0.8.*, bytestring >= 0.10 && < 0.13, containers >= 0.5 && < 0.8, diff --git a/libraries/ghc-compact/ghc-compact.cabal b/libraries/ghc-compact/ghc-compact.cabal index 228a8b82dcadabed7a10f939aa6abc1c55a7a6e2..ad524066b16a1e376d0acd3484d37b6ca66a0289 100644 --- a/libraries/ghc-compact/ghc-compact.cabal +++ b/libraries/ghc-compact/ghc-compact.cabal @@ -40,7 +40,7 @@ library CPP build-depends: ghc-prim >= 0.5.3 && < 0.11, - base >= 4.9.0 && < 4.20, + base >= 4.9.0 && < 4.21, bytestring >= 0.10.6.0 && <0.13 ghc-options: -Wall diff --git a/libraries/ghc-experimental/ghc-experimental.cabal b/libraries/ghc-experimental/ghc-experimental.cabal index 2899c894cbdcd986ac08d13ac95a2e77182d5314..45dc979cd6c182cf23a31e2ffb5ef849563dc5cf 100644 --- a/libraries/ghc-experimental/ghc-experimental.cabal +++ b/libraries/ghc-experimental/ghc-experimental.cabal @@ -30,7 +30,7 @@ library if arch(wasm32) exposed-modules: GHC.Wasm.Prim other-extensions: - build-depends: base ^>=4.19, + build-depends: base ^>=4.20, ghc-internal >= 0.1 && < 0.2, ghc-prim >= 0.10 && < 0.11 hs-source-dirs: src diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index f8f734014f6224a6b56de3ef03e4e37b4f8d9250..4aed5d888bff658fb7cd28c4a4c5ed0f3abfd900 100644 --- a/libraries/ghci/ghci.cabal.in +++ b/libraries/ghci/ghci.cabal.in @@ -75,7 +75,7 @@ library Build-Depends: rts, array == 0.5.*, - base >= 4.8 && < 4.20, + base >= 4.8 && < 4.21, ghc-prim >= 0.5.0 && < 0.12, binary == 0.8.*, bytestring >= 0.10 && < 0.13, diff --git a/libraries/haskeline b/libraries/haskeline index ab2272336641195d0d087a6ccfd9bf511d208860..76157646fb5836fc022e770f7db2156661e899c3 160000 --- a/libraries/haskeline +++ b/libraries/haskeline @@ -1 +1 @@ -Subproject commit ab2272336641195d0d087a6ccfd9bf511d208860 +Subproject commit 76157646fb5836fc022e770f7db2156661e899c3 diff --git a/libraries/hpc b/libraries/hpc index 496ff3b1a2d14a57ea9065099a4bb78ab8919170..8bf6f8b08b0d72cb9231775b66ca572acc1d3197 160000 --- a/libraries/hpc +++ b/libraries/hpc @@ -1 +1 @@ -Subproject commit 496ff3b1a2d14a57ea9065099a4bb78ab8919170 +Subproject commit 8bf6f8b08b0d72cb9231775b66ca572acc1d3197 diff --git a/libraries/os-string b/libraries/os-string index 6c567f572e62437b8431b0f64b91393c40b677c8..8e13019854e1497cb83581bbcab25e763fcc4d4b 160000 --- a/libraries/os-string +++ b/libraries/os-string @@ -1 +1 @@ -Subproject commit 6c567f572e62437b8431b0f64b91393c40b677c8 +Subproject commit 8e13019854e1497cb83581bbcab25e763fcc4d4b diff --git a/libraries/parsec b/libraries/parsec index 4cc55b481b2eaf0606235522a6a340c10ca8dbba..4a44a8cdaa8c3eaa97a73a6da05940dd3bf7c93b 160000 --- a/libraries/parsec +++ b/libraries/parsec @@ -1 +1 @@ -Subproject commit 4cc55b481b2eaf0606235522a6a340c10ca8dbba +Subproject commit 4a44a8cdaa8c3eaa97a73a6da05940dd3bf7c93b diff --git a/libraries/process b/libraries/process index dfdae0a7036b42d352a515214e6116424dd08ec9..a53f925e3ee246e2429418b7a088ecaa0976007b 160000 --- a/libraries/process +++ b/libraries/process @@ -1 +1 @@ -Subproject commit dfdae0a7036b42d352a515214e6116424dd08ec9 +Subproject commit a53f925e3ee246e2429418b7a088ecaa0976007b diff --git a/libraries/semaphore-compat b/libraries/semaphore-compat index 8cd32a85388c7b51786a7aedd15404e2e4896f1b..e8719d3b8e7e069b8f9200004b3d8a77446c91d3 160000 --- a/libraries/semaphore-compat +++ b/libraries/semaphore-compat @@ -1 +1 @@ -Subproject commit 8cd32a85388c7b51786a7aedd15404e2e4896f1b +Subproject commit e8719d3b8e7e069b8f9200004b3d8a77446c91d3 diff --git a/libraries/stm b/libraries/stm index 225162f792c7561b66ed9f05f2491915ac333b88..4e7aa7885b3f9724b19e68d12cbd2774b11b9bd0 160000 --- a/libraries/stm +++ b/libraries/stm @@ -1 +1 @@ -Subproject commit 225162f792c7561b66ed9f05f2491915ac333b88 +Subproject commit 4e7aa7885b3f9724b19e68d12cbd2774b11b9bd0 diff --git a/libraries/template-haskell/template-haskell.cabal.in b/libraries/template-haskell/template-haskell.cabal.in index a303c1e5944ce42d6d724b56e833a3ed9a84ff97..d472178b62ec5703c46f1872c224a97b59ed4005 100644 --- a/libraries/template-haskell/template-haskell.cabal.in +++ b/libraries/template-haskell/template-haskell.cabal.in @@ -55,7 +55,7 @@ Library Language.Haskell.TH.Lib.Map build-depends: - base >= 4.11 && < 4.20, + base >= 4.11 && < 4.21, ghc-boot-th == @ProjectVersionMunged@, ghc-prim, pretty == 1.1.* diff --git a/libraries/terminfo b/libraries/terminfo index 4d26c55fb2f4af9649c318ef17abba13fbb214a4..500399a1497dfe1786ba67d6d2bfced4832f3fed 160000 --- a/libraries/terminfo +++ b/libraries/terminfo @@ -1 +1 @@ -Subproject commit 4d26c55fb2f4af9649c318ef17abba13fbb214a4 +Subproject commit 500399a1497dfe1786ba67d6d2bfced4832f3fed diff --git a/libraries/unix b/libraries/unix index 00bf6dd7a4a78f1d9d4fead303dc727e1055ffbd..930a8289f96c5353d120af4fd155446c574709f2 160000 --- a/libraries/unix +++ b/libraries/unix @@ -1 +1 @@ -Subproject commit 00bf6dd7a4a78f1d9d4fead303dc727e1055ffbd +Subproject commit 930a8289f96c5353d120af4fd155446c574709f2 diff --git a/testsuite/tests/gadt/T19847a.stderr b/testsuite/tests/gadt/T19847a.stderr index e37681df7f8f1a82d4d42d9a3340d6b65f99f81a..29c720d320f8a1e8a73e77524624b21547af39ba 100644 --- a/testsuite/tests/gadt/T19847a.stderr +++ b/testsuite/tests/gadt/T19847a.stderr @@ -9,4 +9,4 @@ DATA CONSTRUCTORS (x ~ y, c ~ [x], Ord x) => x -> y -> T (x, y) b c Dependent modules: [] -Dependent packages: [base-4.19.0.0] +Dependent packages: [base-4.20.0.0] diff --git a/utils/haddock b/utils/haddock index 59bddf94eaab8d048924cc98d398c38e8035cf31..243fefaa40ddcc7c657a95e92f30cb79ec4ecb45 160000 --- a/utils/haddock +++ b/utils/haddock @@ -1 +1 @@ -Subproject commit 59bddf94eaab8d048924cc98d398c38e8035cf31 +Subproject commit 243fefaa40ddcc7c657a95e92f30cb79ec4ecb45 diff --git a/utils/hsc2hs b/utils/hsc2hs index a6d9f73689ac51100ed7f6af0ea8cecd34422a91..b0b0cca3db42fc9bf8ebc7da8ddd6fa937c5aa25 160000 --- a/utils/hsc2hs +++ b/utils/hsc2hs @@ -1 +1 @@ -Subproject commit a6d9f73689ac51100ed7f6af0ea8cecd34422a91 +Subproject commit b0b0cca3db42fc9bf8ebc7da8ddd6fa937c5aa25