diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index a5caea2230c8d269585617a944a09a5c5571e0fd..aad7bd00a73fa46d335db5093a07024324a212cb 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -94,7 +94,7 @@ Library extra-libraries: zstd CPP-Options: -DHAVE_LIBZSTD - Build-Depends: base >= 4.11 && < 4.19, + Build-Depends: base >= 4.11 && < 4.20, deepseq >= 1.4 && < 1.6, directory >= 1 && < 1.4, process >= 1 && < 1.7, diff --git a/libraries/array b/libraries/array index f487b8de85f2b271a3831c14ab6439b9bc9b8343..0daca5dfa33d6c522e9fb8e94a2b66a5ed658c20 160000 --- a/libraries/array +++ b/libraries/array @@ -1 +1 @@ -Subproject commit f487b8de85f2b271a3831c14ab6439b9bc9b8343 +Subproject commit 0daca5dfa33d6c522e9fb8e94a2b66a5ed658c20 diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index 7d7fe0aef3be099ffacb5bb015554fac2e416e2f..75408eb6d5da5547b2dd4e374d1f19d94927452d 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: base -version: 4.18.0.0 +version: 4.19.0.0 -- NOTE: Don't forget to update ./changelog.md license: BSD-3-Clause diff --git a/libraries/directory b/libraries/directory index 3ae36d84e44737fa9800d74d55ae1e30b75628cf..a0c9361817db13917df7777f669a97c4d787f44e 160000 --- a/libraries/directory +++ b/libraries/directory @@ -1 +1 @@ -Subproject commit 3ae36d84e44737fa9800d74d55ae1e30b75628cf +Subproject commit a0c9361817db13917df7777f669a97c4d787f44e diff --git a/libraries/filepath b/libraries/filepath index bb0e5cd49655b41bd3209b100f7a5a74698cbe83..6da411d1bdc4a0731bc8135f11ad16181f9e2d6d 160000 --- a/libraries/filepath +++ b/libraries/filepath @@ -1 +1 @@ -Subproject commit bb0e5cd49655b41bd3209b100f7a5a74698cbe83 +Subproject commit 6da411d1bdc4a0731bc8135f11ad16181f9e2d6d diff --git a/libraries/ghc-boot-th/ghc-boot-th.cabal.in b/libraries/ghc-boot-th/ghc-boot-th.cabal.in index d8f8ac1e5f2c5453cae154f5b8a3f04771155a82..7cd949ccc620bfa89fa90534baf93283a900f915 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.19 + build-depends: base >= 4.7 && < 4.20 diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in index 6a9c945cae566924b31ed4e98d48b997e0231eb6..fb891117fe1564b227a90a954a52a23761c31b79 100644 --- a/libraries/ghc-boot/ghc-boot.cabal.in +++ b/libraries/ghc-boot/ghc-boot.cabal.in @@ -70,7 +70,7 @@ Library GHC.Version GHC.Platform.Host - build-depends: base >= 4.7 && < 4.19, + build-depends: base >= 4.7 && < 4.20, binary == 0.8.*, bytestring >= 0.10 && < 0.12, containers >= 0.5 && < 0.7, diff --git a/libraries/ghc-compact/ghc-compact.cabal b/libraries/ghc-compact/ghc-compact.cabal index 519e7db78e3b85ee5a51cdaec25323fa46deee9c..bdc5a3d4839f779259a7d049b4b4337428444dea 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.19, + base >= 4.9.0 && < 4.20, bytestring >= 0.10.6.0 && <0.12 ghc-options: -Wall diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index e9e2ad250b071090ef9447e6130b2568811412a2..4a3d9fc5e6c8e2ffe3af5a09cdf862381771e6bb 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.19, + base >= 4.8 && < 4.20, ghc-prim >= 0.5.0 && < 0.11, binary == 0.8.*, bytestring >= 0.10 && < 0.12, diff --git a/libraries/haskeline b/libraries/haskeline index 1c2ad91edc936a9836d1ad80a26f8be03a7d8bb0..0ea07e223685787893dccbcbb67f1720ef4cf80e 160000 --- a/libraries/haskeline +++ b/libraries/haskeline @@ -1 +1 @@ -Subproject commit 1c2ad91edc936a9836d1ad80a26f8be03a7d8bb0 +Subproject commit 0ea07e223685787893dccbcbb67f1720ef4cf80e diff --git a/libraries/parsec b/libraries/parsec index 1f542120d9adc5e22f8791a6d595210e93c6c389..ddcd0cbafe7637b15fda48f1c7cf735f3ccfd8c9 160000 --- a/libraries/parsec +++ b/libraries/parsec @@ -1 +1 @@ -Subproject commit 1f542120d9adc5e22f8791a6d595210e93c6c389 +Subproject commit ddcd0cbafe7637b15fda48f1c7cf735f3ccfd8c9 diff --git a/libraries/semaphore-compat b/libraries/semaphore-compat index 663ef75467995acf41c51d3e21d03347e85b844e..c8fc7b1757b4eecbd10239038fbc6602340105b1 160000 --- a/libraries/semaphore-compat +++ b/libraries/semaphore-compat @@ -1 +1 @@ -Subproject commit 663ef75467995acf41c51d3e21d03347e85b844e +Subproject commit c8fc7b1757b4eecbd10239038fbc6602340105b1 diff --git a/libraries/stm b/libraries/stm index 86172e75bd4f5c400b3a6f0cd3945bdb7c03bcdd..f8582bd6e31df73b4f18f676650ae183624d8eb2 160000 --- a/libraries/stm +++ b/libraries/stm @@ -1 +1 @@ -Subproject commit 86172e75bd4f5c400b3a6f0cd3945bdb7c03bcdd +Subproject commit f8582bd6e31df73b4f18f676650ae183624d8eb2 diff --git a/libraries/template-haskell/template-haskell.cabal.in b/libraries/template-haskell/template-haskell.cabal.in index 7d021ed8e5c9da95d18b898dcbce2e8a0cfc2115..a303c1e5944ce42d6d724b56e833a3ed9a84ff97 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.19, + base >= 4.11 && < 4.20, ghc-boot-th == @ProjectVersionMunged@, ghc-prim, pretty == 1.1.* diff --git a/libraries/terminfo b/libraries/terminfo index 98100776edcf33796ddf2e752233e6ef179b876d..4d26c55fb2f4af9649c318ef17abba13fbb214a4 160000 --- a/libraries/terminfo +++ b/libraries/terminfo @@ -1 +1 @@ -Subproject commit 98100776edcf33796ddf2e752233e6ef179b876d +Subproject commit 4d26c55fb2f4af9649c318ef17abba13fbb214a4 diff --git a/libraries/unix b/libraries/unix index 720debbf5b89366007bac473e8d7fd18e4114f1a..5c3f316cf13b1c5a2c8622065cccd8eb81a81b89 160000 --- a/libraries/unix +++ b/libraries/unix @@ -1 +1 @@ -Subproject commit 720debbf5b89366007bac473e8d7fd18e4114f1a +Subproject commit 5c3f316cf13b1c5a2c8622065cccd8eb81a81b89 diff --git a/testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout b/testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout index e0d3325475e53e471beb0c89e077578097ab6625..1f32695ccd6dffa1e96648248b22c15baa721a55 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout +++ b/testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout @@ -1,25 +1,25 @@ -Preprocessing library 'p' for bkpcabal08-0.1.0.0.. +Preprocessing library 'impl' for bkpcabal08-0.1.0.0... +Building library 'impl' for bkpcabal08-0.1.0.0... +Preprocessing library 'p' for bkpcabal08-0.1.0.0... Building library 'p' instantiated with A = <A> B = <B> -for bkpcabal08-0.1.0.0.. +for bkpcabal08-0.1.0.0... [2 of 2] Compiling B[sig] ( p/B.hsig, nothing ) -Preprocessing library 'q' for bkpcabal08-0.1.0.0.. +Preprocessing library 'q' for bkpcabal08-0.1.0.0... Building library 'q' instantiated with A = <A> B = <B> -for bkpcabal08-0.1.0.0.. +for bkpcabal08-0.1.0.0... [2 of 4] Compiling B[sig] ( q/B.hsig, nothing ) [3 of 4] Compiling M ( q/M.hs, nothing ) [A changed] -[4 of 4] Instantiating bkpcabal08-0.1.0.0-EyPgBicvfbiC7dE1n4Leie-p -Preprocessing library 'impl' for bkpcabal08-0.1.0.0.. -Building library 'impl' for bkpcabal08-0.1.0.0.. -Preprocessing library 'q' for bkpcabal08-0.1.0.0.. +[4 of 4] Instantiating bkpcabal08-0.1.0.0-5O1mUtZZLBeDZEqqtwJcCj-p +Preprocessing library 'q' for bkpcabal08-0.1.0.0... Building library 'q' instantiated with - A = bkpcabal08-0.1.0.0-7fVENJzzGcJGpTFnmRtPuV-impl:A - B = bkpcabal08-0.1.0.0-7fVENJzzGcJGpTFnmRtPuV-impl:B -for bkpcabal08-0.1.0.0.. -[1 of 3] Compiling A[sig] ( q/A.hsig, dist/build/bkpcabal08-0.1.0.0-ECOfUnn43H71QBN16LasXC-q+GMGlyMx4Le5H1wfFVpXzYJ/A.o ) [Prelude package changed] -[2 of 3] Compiling B[sig] ( q/B.hsig, dist/build/bkpcabal08-0.1.0.0-ECOfUnn43H71QBN16LasXC-q+GMGlyMx4Le5H1wfFVpXzYJ/B.o ) [Prelude package changed] -Preprocessing library 'r' for bkpcabal08-0.1.0.0.. -Building library 'r' for bkpcabal08-0.1.0.0.. + A = bkpcabal08-0.1.0.0-DlVb5PcmUolGCHYbfTL7EP-impl:A + B = bkpcabal08-0.1.0.0-DlVb5PcmUolGCHYbfTL7EP-impl:B +for bkpcabal08-0.1.0.0... +[1 of 3] Compiling A[sig] ( q/A.hsig, dist/build/bkpcabal08-0.1.0.0-LFiTKyjPqyn9yyuysCoVKg-q+5IA1jA4bEzCFcXtraqAC38/A.o ) [Prelude package changed] +[2 of 3] Compiling B[sig] ( q/B.hsig, dist/build/bkpcabal08-0.1.0.0-LFiTKyjPqyn9yyuysCoVKg-q+5IA1jA4bEzCFcXtraqAC38/B.o ) [Prelude package changed] +Preprocessing library 'r' for bkpcabal08-0.1.0.0... +Building library 'r' for bkpcabal08-0.1.0.0... diff --git a/testsuite/tests/gadt/T19847a.stderr b/testsuite/tests/gadt/T19847a.stderr index 15053038357c7ea1e5b7d91d31221715bbdbde89..e37681df7f8f1a82d4d42d9a3340d6b65f99f81a 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.18.0.0] +Dependent packages: [base-4.19.0.0] diff --git a/utils/haddock b/utils/haddock index 4bf963f87b5d994b1ddc72ee4bd2bd968637e2de..98c285fd9c6057b34341f91c2261d00df803735a 160000 --- a/utils/haddock +++ b/utils/haddock @@ -1 +1 @@ -Subproject commit 4bf963f87b5d994b1ddc72ee4bd2bd968637e2de +Subproject commit 98c285fd9c6057b34341f91c2261d00df803735a diff --git a/utils/hsc2hs b/utils/hsc2hs index f70b360b295298e4da10afe02ebf022b21342008..1ee25e923b769c8df310f7e8690ad7622eb4d446 160000 --- a/utils/hsc2hs +++ b/utils/hsc2hs @@ -1 +1 @@ -Subproject commit f70b360b295298e4da10afe02ebf022b21342008 +Subproject commit 1ee25e923b769c8df310f7e8690ad7622eb4d446