diff options
author | Ben Gamari <ben@smart-cactus.org> | 2022-12-07 19:37:39 -0500 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2022-12-21 15:27:49 -0500 |
commit | fb4d36c451218180ea40de7ec2c7b1209baf1dea (patch) | |
tree | ac0d0d63cdcca152c65bdf20d1d176c971743280 | |
parent | ceb2e9b9b2e29047922453b545ef03f9d9e3244d (diff) | |
download | haskell-fb4d36c451218180ea40de7ec2c7b1209baf1dea.tar.gz |
base: Bump version to 4.18
Requires various submodule bumps.
-rw-r--r-- | compiler/ghc.cabal.in | 2 | ||||
m--------- | libraries/array | 0 | ||||
-rw-r--r-- | libraries/base/base.cabal | 2 | ||||
m--------- | libraries/deepseq | 0 | ||||
m--------- | libraries/directory | 0 | ||||
m--------- | libraries/filepath | 0 | ||||
-rw-r--r-- | libraries/ghc-boot-th/ghc-boot-th.cabal.in | 2 | ||||
-rw-r--r-- | libraries/ghc-boot/ghc-boot.cabal.in | 2 | ||||
-rw-r--r-- | libraries/ghc-compact/ghc-compact.cabal | 2 | ||||
-rw-r--r-- | libraries/ghci/ghci.cabal.in | 2 | ||||
m--------- | libraries/parsec | 0 | ||||
m--------- | libraries/process | 0 | ||||
m--------- | libraries/stm | 0 | ||||
-rw-r--r-- | libraries/template-haskell/template-haskell.cabal.in | 2 | ||||
m--------- | libraries/terminfo | 0 | ||||
m--------- | libraries/unix | 0 | ||||
-rw-r--r-- | testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout | 2 | ||||
-rw-r--r-- | testsuite/tests/cabal/t18567/T18567.stderr | 2 | ||||
m--------- | utils/haddock | 0 | ||||
m--------- | utils/hsc2hs | 0 |
20 files changed, 9 insertions, 9 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 2e2eb68ec1..ab320bfcac 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -76,7 +76,7 @@ Library if flag(build-tool-depends) build-tool-depends: alex:alex >= 3.2.6, happy:happy >= 1.20.0, genprimopcode:genprimopcode, deriveConstants:deriveConstants - Build-Depends: base >= 4.11 && < 4.18, + Build-Depends: base >= 4.11 && < 4.19, deepseq >= 1.4 && < 1.5, directory >= 1 && < 1.4, process >= 1 && < 1.7, diff --git a/libraries/array b/libraries/array -Subproject acd92ba77c205a039d9c6eaabb3e35d09e33016 +Subproject f7a498b880a1fff833699d8417bac155d58ed59 diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index 1af0d4b73b..a57335db1d 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: base -version: 4.17.0.0 +version: 4.18.0.0 -- NOTE: Don't forget to update ./changelog.md license: BSD-3-Clause diff --git a/libraries/deepseq b/libraries/deepseq -Subproject 28f4d5b00448239581ead0de9140ff4a6847c80 +Subproject 7e77698d6a78981bc2649df78021a6c33a5d391 diff --git a/libraries/directory b/libraries/directory -Subproject 102428041a44835b5446c329f746c7503c28319 +Subproject 7f9066137c694ab7cef9a4ebd8c19a281fad42e diff --git a/libraries/filepath b/libraries/filepath -Subproject 872e19fce06ddd40bd0771dbd3cad2c3c6ed5e7 +Subproject 7139cd3383a2aae440a57b5604a8182d9a98371 diff --git a/libraries/ghc-boot-th/ghc-boot-th.cabal.in b/libraries/ghc-boot-th/ghc-boot-th.cabal.in index 88b18d434b..d8f8ac1e5f 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.18 + build-depends: base >= 4.7 && < 4.19 diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in index 4a35fbf682..0b1569c9cf 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.18, + build-depends: base >= 4.7 && < 4.19, 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 bdb48de494..519e7db78e 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.18, + base >= 4.9.0 && < 4.19, 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 284c80438b..6980877ed9 100644 --- a/libraries/ghci/ghci.cabal.in +++ b/libraries/ghci/ghci.cabal.in @@ -70,7 +70,7 @@ library Build-Depends: rts, array == 0.5.*, - base >= 4.8 && < 4.18, + base >= 4.8 && < 4.19, ghc-prim >= 0.5.0 && < 0.11, binary == 0.8.*, bytestring >= 0.10 && < 0.12, diff --git a/libraries/parsec b/libraries/parsec -Subproject f1171a4b212070bb0299b636aeee7d0534a6c76 +Subproject 0e23b3246fd7f6d125129316dcbedd609e6d2dc diff --git a/libraries/process b/libraries/process -Subproject cb89d5079d29c38683bcb6feec7dc53ad3836ed +Subproject 7c6871d89bd87875b4e402de26d7267c11e617a diff --git a/libraries/stm b/libraries/stm -Subproject f4eb5a85c2732f8f5a03ef8af88d6aff9094541 +Subproject 4ac6ead642829c9c983ee3c96ba13fa0308891f diff --git a/libraries/template-haskell/template-haskell.cabal.in b/libraries/template-haskell/template-haskell.cabal.in index ac7d3a95ef..fb1a03f2e7 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.18, + base >= 4.11 && < 4.19, ghc-boot-th == @ProjectVersionMunged@, ghc-prim, pretty == 1.1.* diff --git a/libraries/terminfo b/libraries/terminfo -Subproject a21cc7e2d58f3e35a4ac3fb386738d9b448eaf1 +Subproject 0a05f06bc8a56c43578ce06d4ef1339ee70fb3f diff --git a/libraries/unix b/libraries/unix -Subproject 3be0223cee7395410915a127eba3acae5ff0b2f +Subproject 98adc732bfbfca4fef945d546ecbaae13952a95 diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout index 3b64910e4c..67e9c1df03 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout +++ b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout @@ -4,4 +4,4 @@ for bkpcabal01-0.1.0.0.. Preprocessing library 'q' for bkpcabal01-0.1.0.0.. Building library 'q' instantiated with H = <H> for bkpcabal01-0.1.0.0.. -[2 of 2] Instantiating bkpcabal01-0.1.0.0-4ArNecmPyDqFgQMPsq5SEg-p +[2 of 2] Instantiating bkpcabal01-0.1.0.0-3A0ecVFOxAgF5zqWrGYPfn-p diff --git a/testsuite/tests/cabal/t18567/T18567.stderr b/testsuite/tests/cabal/t18567/T18567.stderr index e6ec7ac6c9..7109c93c84 100644 --- a/testsuite/tests/cabal/t18567/T18567.stderr +++ b/testsuite/tests/cabal/t18567/T18567.stderr @@ -2,4 +2,4 @@ <no location info>: warning: [GHC-42258] [-Wunused-packages] The following packages were specified via -package or -package-id flags, but were not needed for compilation: - - internal-lib-0.1.0.0 (exposed by flag -package-id internal-lib-0.1.0.0-Dq740EWYmHcKhGKUMfjfaX-sublib-unused) + - internal-lib-0.1.0.0 (exposed by flag -package-id internal-lib-0.1.0.0-1v10MAkotpbGWvaODnEeBc-sublib-unused) diff --git a/utils/haddock b/utils/haddock -Subproject edc72530978d8a9ec92f51d288484986ec0051e +Subproject 37e3c3683ac70735ab211f59210c9abea8ae2c6 diff --git a/utils/hsc2hs b/utils/hsc2hs -Subproject ac11465d9aadbe24be4832a3775fbd434448440 +Subproject 219bba062e804db0bea4bf3ffcaaba2df46334f |