summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--compiler/ghc.cabal.in2
-rw-r--r--ghc/ghc-bin.cabal.in2
m---------libraries/array0
-rw-r--r--libraries/base/base.cabal4
-rw-r--r--libraries/base/tools/ucd2haskell/ucd2haskell.cabal2
m---------libraries/deepseq0
m---------libraries/directory0
m---------libraries/filepath0
-rw-r--r--libraries/ghc-bignum/ghc-bignum.cabal2
-rw-r--r--libraries/ghc-boot-th/ghc-boot-th.cabal.in2
-rw-r--r--libraries/ghc-boot/ghc-boot.cabal.in2
-rw-r--r--libraries/ghc-compact/ghc-compact.cabal4
-rw-r--r--libraries/ghc-heap/ghc-heap.cabal.in2
-rw-r--r--libraries/ghc-prim/changelog.md43
-rw-r--r--libraries/ghc-prim/ghc-prim.cabal2
-rw-r--r--libraries/ghci/ghci.cabal.in4
m---------libraries/haskeline0
m---------libraries/hpc0
m---------libraries/parsec0
m---------libraries/process0
m---------libraries/stm0
-rw-r--r--libraries/template-haskell/template-haskell.cabal.in2
m---------libraries/terminfo0
m---------libraries/text0
m---------libraries/unix0
-rw-r--r--testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout2
-rw-r--r--testsuite/tests/backpack/should_compile/bkp16.stderr6
-rw-r--r--testsuite/tests/cabal/t18567/T18567.stderr2
-rw-r--r--testsuite/tests/dependent/should_compile/T14729.stderr2
-rw-r--r--testsuite/tests/dependent/should_compile/T15743.stderr2
-rw-r--r--testsuite/tests/dependent/should_compile/T15743e.stderr2
-rw-r--r--testsuite/tests/indexed-types/should_compile/T15711.stderr2
-rw-r--r--testsuite/tests/indexed-types/should_compile/T15852.stderr2
-rw-r--r--testsuite/tests/package/T4806a.stderr2
-rw-r--r--testsuite/tests/polykinds/T15592.stderr2
-rw-r--r--testsuite/tests/polykinds/T15592b.stderr2
-rw-r--r--testsuite/tests/printer/T18052a.stderr2
-rw-r--r--testsuite/tests/typecheck/should_compile/T12763.stderr2
-rw-r--r--testsuite/tests/typecheck/should_compile/T18406b.stderr2
-rw-r--r--testsuite/tests/typecheck/should_compile/T18529.stderr2
-rw-r--r--testsuite/tests/typecheck/should_compile/T21023.stderr2
-rw-r--r--testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr4
m---------utils/hsc2hs0
43 files changed, 57 insertions, 56 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index bc38dbeaa8..fd2db90f17 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.17,
+ Build-Depends: base >= 4.11 && < 4.18,
deepseq >= 1.4 && < 1.5,
directory >= 1 && < 1.4,
process >= 1 && < 1.7,
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 946086b305..7a4f604e0f 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -57,7 +57,7 @@ Executable ghc
-- NB: this is never built by the bootstrapping GHC+libraries
Build-depends:
deepseq == 1.4.*,
- ghc-prim >= 0.5.0 && < 0.9,
+ ghc-prim >= 0.5.0 && < 0.10,
ghci == @ProjectVersionMunged@,
haskeline == 0.8.*,
exceptions == 0.10.*,
diff --git a/libraries/array b/libraries/array
-Subproject 3e4334a6f39d92090bf3ded86b84d7cd1817ce2
+Subproject 77990b2132ba688f6282822891da2b9455e33c2
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 7ff667b0dc..a8223bbce8 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: base
-version: 4.16.0.0
+version: 4.17.0.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD-3-Clause
@@ -86,7 +86,7 @@ Library
build-depends:
rts == 1.0.*,
- ghc-prim >= 0.5.1.0 && < 0.9,
+ ghc-prim >= 0.5.1.0 && < 0.10,
ghc-bignum >= 1.0 && < 2.0
exposed-modules:
diff --git a/libraries/base/tools/ucd2haskell/ucd2haskell.cabal b/libraries/base/tools/ucd2haskell/ucd2haskell.cabal
index 79460935b1..eb5600f49a 100644
--- a/libraries/base/tools/ucd2haskell/ucd2haskell.cabal
+++ b/libraries/base/tools/ucd2haskell/ucd2haskell.cabal
@@ -52,7 +52,7 @@ executable ucd2haskell
main-is: UCD2Haskell.hs
other-modules: Parser.Text
build-depends:
- base >= 4.7 && < 4.17
+ base >= 4.7 && < 4.18
, streamly >= 0.8 && < 0.9
, split >= 0.2.3 && < 0.3
, getopt-generics >= 0.13 && < 0.14
diff --git a/libraries/deepseq b/libraries/deepseq
-Subproject cc5852e2e19fa5d62b732c9a572a6a6013544a4
+Subproject f241315f4cc905076d5c988c27c7db9fbde8bbe
diff --git a/libraries/directory b/libraries/directory
-Subproject f0da64307959fcd2225c01f97df851ff45285e6
+Subproject 4556d3cb689b8ef7c0f433de3c957559613e342
diff --git a/libraries/filepath b/libraries/filepath
-Subproject e60969e693ffea59725cc3ebcae415343ddd069
+Subproject 4d7092ad3a8357b18a8fcbeb6fcf38045460eb9
diff --git a/libraries/ghc-bignum/ghc-bignum.cabal b/libraries/ghc-bignum/ghc-bignum.cabal
index 59ba847272..58d7a527de 100644
--- a/libraries/ghc-bignum/ghc-bignum.cabal
+++ b/libraries/ghc-bignum/ghc-bignum.cabal
@@ -77,7 +77,7 @@ library
ForeignFunctionInterface
build-depends:
- ghc-prim >= 0.5.1.0 && < 0.9
+ ghc-prim >= 0.5.1.0 && < 0.10
hs-source-dirs: src/
include-dirs: include/
diff --git a/libraries/ghc-boot-th/ghc-boot-th.cabal.in b/libraries/ghc-boot-th/ghc-boot-th.cabal.in
index 7a0fa8634e..88b18d434b 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.17
+ build-depends: base >= 4.7 && < 4.18
diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in
index efac404501..3ca83a5e1c 100644
--- a/libraries/ghc-boot/ghc-boot.cabal.in
+++ b/libraries/ghc-boot/ghc-boot.cabal.in
@@ -69,7 +69,7 @@ Library
GHC.Version
GHC.Platform.Host
- build-depends: base >= 4.7 && < 4.17,
+ build-depends: base >= 4.7 && < 4.18,
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 2b84d61c6a..12a5e509b4 100644
--- a/libraries/ghc-compact/ghc-compact.cabal
+++ b/libraries/ghc-compact/ghc-compact.cabal
@@ -39,8 +39,8 @@ library
UnboxedTuples
CPP
- build-depends: ghc-prim >= 0.5.3 && < 0.9,
- base >= 4.9.0 && < 4.17,
+ build-depends: ghc-prim >= 0.5.3 && < 0.10,
+ base >= 4.9.0 && < 4.18,
bytestring >= 0.10.6.0 && <0.12
ghc-options: -Wall
diff --git a/libraries/ghc-heap/ghc-heap.cabal.in b/libraries/ghc-heap/ghc-heap.cabal.in
index 8937b4aa46..2c6e6794c1 100644
--- a/libraries/ghc-heap/ghc-heap.cabal.in
+++ b/libraries/ghc-heap/ghc-heap.cabal.in
@@ -23,7 +23,7 @@ library
default-language: Haskell2010
build-depends: base >= 4.9.0 && < 5.0
- , ghc-prim > 0.2 && < 0.9
+ , ghc-prim > 0.2 && < 0.10
, rts == 1.0.*
, containers >= 0.6.2.1 && < 0.7
diff --git a/libraries/ghc-prim/changelog.md b/libraries/ghc-prim/changelog.md
index 049b254743..6f665f3fcb 100644
--- a/libraries/ghc-prim/changelog.md
+++ b/libraries/ghc-prim/changelog.md
@@ -1,24 +1,25 @@
-## next (edit as necessary)
+## 0.9.0
+
+- Shipped with GHC 9.4.1
- `magicDict` has been renamed to `withDict` and is now defined in
`GHC.Magic.Dict` instead of `GHC.Prim`. `withDict` now has the type:
- ```
- class WithDict cls meth where
- withDict :: forall {rr :: RuntimeRep} (r :: TYPE rr). meth -> (cls => r) -> r
+ ```haskell
+ withDict :: forall {rr :: RuntimeRep} st dt (r :: TYPE rr). st -> (dt => r) -> r
```
Unlike `magicDict`, `withDict` can be used without defining an
intermediate data type. For example, the `withTypeable` function from the
`Data.Typeable` module can now be defined as:
- ```
+ ```haskell
withTypeable :: forall k (a :: k) rep (r :: TYPE rep). ()
=> TypeRep a -> (Typeable a => r) -> r
- withTypeable rep k = withDict @(Typeable a) rep k
+ withTypeable rep k = withDict @(TypeRep a) @(Typeable a) rep k
```
- Note that the explicit type application is required, as the call to
+ Note that the explicit type applications are required, as the call to
`withDict` would be ambiguous otherwise.
- Primitive types and functions which handle boxed values are now levity-polymorphic,
@@ -34,25 +35,25 @@
For example, `Array#` used to have kind:
- ```
+ ```haskell
Type -> UnliftedType
```
but it now has kind:
- ```
+ ```haskell
forall {l :: Levity}. TYPE (BoxedRep l) -> UnliftedType
```
Similarly, `MutVar#` used to have kind:
- ```
+ ```haskell
Type -> Type -> UnliftedType
```
but it now has kind:
- ```
+ ```haskell
forall {l :: Levity}. Type -> TYPE (BoxedRep l) -> UnliftedType
```
@@ -95,7 +96,7 @@
For example, the full type of `newMutVar#` is now:
- ```
+ ```haskell
newMutVar#
:: forall {l :: Levity} s (a :: TYPE (BoxedRep l)).
a -> State# s -> (# State# s, MVar# s a #)
@@ -103,7 +104,7 @@
and the full type of `writeSmallArray#` is:
- ```
+ ```haskell
writeSmallArray#
:: forall {l :: Levity} s (a :: TYPE ('BoxedRep l)).
SmallMutableArray# s a -> Int# -> a -> State# s -> State# s
@@ -116,7 +117,7 @@
- `mkWeak#`, `mkWeakNoFinalizer#`, `touch#` and `keepAlive#` are now
levity-polymorphic instead of representation-polymorphic. For instance:
- ```
+ ```haskell
mkWeakNoFinalizer#
:: forall {l :: Levity} {k :: Levity}
(a :: TYPE ('BoxedRep l))
@@ -133,7 +134,7 @@
- Primitive functions for throwing and catching exceptions are now more polymorphic
than before. For example, `catch#` now has type:
- ```
+ ```haskell
catch#
:: forall {r :: RuntimeRep} {l :: Levity}
(a :: TYPE r)
@@ -154,7 +155,7 @@
Note in particular that `raise#` is now both representation-polymorphic
(with an inferred `RuntimeRep` argument) and levity-polymorphic, with type:
- ```
+ ```haskell
raise# :: forall {l :: Levity} {r :: RuntimeRep}
(a :: TYPE (BoxedRep l))
(b :: TYPE r).
@@ -171,7 +172,7 @@
- `reallyUnsafePtrEquality#` has been made more general, as it is now
both levity-polymorphic and heterogeneous:
- ```
+ ```haskell
reallyUnsafePtrEquality#
:: forall {l :: Levity} {k :: Levity}
(a :: TYPE (BoxedRep l))
@@ -192,14 +193,14 @@
- The following functions have been added to `GHC.Exts`:
- ```
+ ```haskell
sameArray# :: Array# a -> Array# a -> Int#
sameSmallArray# :: SmallArray# a -> SmallArray# a -> Int#
sameByteArray# :: ByteArray# -> ByteArray# -> Int#
sameArrayArray# :: ArrayArray# -> ArrayArray# -> Int#
```
-## 0.8.0 (edit as necessary)
+## 0.8.0
- Change array access primops to use type with size maxing the element size:
@@ -228,7 +229,7 @@
atomicCasWord32Addr# :: Addr# -> Word32# -> Word32# -> State# s -> (# State# s, Word32# #)
atomicCasWord64Addr# :: Addr# -> WORD64 -> WORD64 -> State# s -> (# State# s, WORD64 #)
-## 0.7.0 (edit as necessary)
+## 0.7.0
- Shipped with GHC 9.0.1
@@ -267,7 +268,7 @@
the soundness issues of the latter (see
[#17760](https://gitlab.haskell.org/ghc/ghc/-/issues/17760)).
-## 0.6.1 (edit as necessary)
+## 0.6.1
- Shipped with GHC 8.10.1
diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
index 4be29843ae..e2918ccaf2 100644
--- a/libraries/ghc-prim/ghc-prim.cabal
+++ b/libraries/ghc-prim/ghc-prim.cabal
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: ghc-prim
-version: 0.8.0
+version: 0.9.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD-3-Clause
license-file: LICENSE
diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in
index 06f7eca0c5..c323387801 100644
--- a/libraries/ghci/ghci.cabal.in
+++ b/libraries/ghci/ghci.cabal.in
@@ -70,8 +70,8 @@ library
Build-Depends:
rts,
array == 0.5.*,
- base >= 4.8 && < 4.17,
- ghc-prim >= 0.5.0 && < 0.9,
+ base >= 4.8 && < 4.18,
+ ghc-prim >= 0.5.0 && < 0.10,
binary == 0.8.*,
bytestring >= 0.10 && < 0.12,
containers >= 0.5 && < 0.7,
diff --git a/libraries/haskeline b/libraries/haskeline
-Subproject 2a5d9451ab7a0602b604a4bf0b9f950e913b865
+Subproject aae0bfeec7ae767e3c30844ca2f99b682518546
diff --git a/libraries/hpc b/libraries/hpc
-Subproject 8adc9d2438f29c133dab3396c96020d143d34cf
+Subproject 7d400662546a262b64af49b5707db22e20b8b9d
diff --git a/libraries/parsec b/libraries/parsec
-Subproject 9a1f72c1c77e3bb9ac2a3ca9b0aedd66f3c7f35
+Subproject a74c68e948c99621100447014f48ccac7ee0448
diff --git a/libraries/process b/libraries/process
-Subproject 2ee9f1d8412de2150cb636b524290ceceed682b
+Subproject 7a7431a0ef586c0f1e602e382398b988c699dfc
diff --git a/libraries/stm b/libraries/stm
-Subproject a58fdfadbcfd2743944e6a3c4bc734cfbca8913
+Subproject d4da9d83d1eab562460aa89cedac61abc884d93
diff --git a/libraries/template-haskell/template-haskell.cabal.in b/libraries/template-haskell/template-haskell.cabal.in
index 097e5bae24..58d0d70d7d 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.17,
+ base >= 4.11 && < 4.18,
ghc-boot-th == @ProjectVersionMunged@,
ghc-prim,
filepath,
diff --git a/libraries/terminfo b/libraries/terminfo
-Subproject 5c75033414f7232b007e7dd50d1ea2b0f2147ff
+Subproject a21cc7e2d58f3e35a4ac3fb386738d9b448eaf1
diff --git a/libraries/text b/libraries/text
-Subproject 89feee7e8a3b7e55dc8544cd21ea5f908cc8aea
+Subproject 7d68087bd90c7b6721910d00e9fe309d4148a5a
diff --git a/libraries/unix b/libraries/unix
-Subproject 1f72ccec55c1b61299310b994754782103a617f
+Subproject f018fe126c5f1dbbd3431c7214337ccbb38230c
diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
index e4c791fc0e..3b64910e4c 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-8qvodD6NJy6K0RGaf4qK7Y-p
+[2 of 2] Instantiating bkpcabal01-0.1.0.0-4ArNecmPyDqFgQMPsq5SEg-p
diff --git a/testsuite/tests/backpack/should_compile/bkp16.stderr b/testsuite/tests/backpack/should_compile/bkp16.stderr
index 5d105c204b..06d2865c24 100644
--- a/testsuite/tests/backpack/should_compile/bkp16.stderr
+++ b/testsuite/tests/backpack/should_compile/bkp16.stderr
@@ -2,8 +2,8 @@
[1 of 1] Compiling Int[sig] ( p/Int.hsig, nothing )
[2 of 2] Processing q
Instantiating q
- [1 of 1] Including p[Int=base-4.13.0.0:GHC.Exts]
- Instantiating p[Int=base-4.13.0.0:GHC.Exts]
- [1 of 1] Including ghc-prim-0.8.0
+ [1 of 1] Including p[Int=base-4.17.0.0:GHC.Exts]
+ Instantiating p[Int=base-4.17.0.0:GHC.Exts]
+ [1 of 1] Including ghc-prim-0.9.0
[1 of 1] Compiling Int[sig] ( p/Int.hsig, bkp16.out/p/p-97PZnzqiJmd2hTwUNGdjod/Int.o )
[1 of 1] Instantiating p
diff --git a/testsuite/tests/cabal/t18567/T18567.stderr b/testsuite/tests/cabal/t18567/T18567.stderr
index 4330d06d80..bda761bc38 100644
--- a/testsuite/tests/cabal/t18567/T18567.stderr
+++ b/testsuite/tests/cabal/t18567/T18567.stderr
@@ -2,4 +2,4 @@
<no location info>: warning: [-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-1ShKL1eXB3aGPfTSujH0Bv-sublib-unused)
+ - internal-lib-0.1.0.0 (exposed by flag -package-id internal-lib-0.1.0.0-Dq740EWYmHcKhGKUMfjfaX-sublib-unused)
diff --git a/testsuite/tests/dependent/should_compile/T14729.stderr b/testsuite/tests/dependent/should_compile/T14729.stderr
index ac0108be7c..0aa6ad7f10 100644
--- a/testsuite/tests/dependent/should_compile/T14729.stderr
+++ b/testsuite/tests/dependent/should_compile/T14729.stderr
@@ -11,4 +11,4 @@ COERCION AXIOMS
FAMILY INSTANCES
type instance F Int = Bool -- Defined at T14729.hs:10:15
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
diff --git a/testsuite/tests/dependent/should_compile/T15743.stderr b/testsuite/tests/dependent/should_compile/T15743.stderr
index c9c95159a3..65309767f3 100644
--- a/testsuite/tests/dependent/should_compile/T15743.stderr
+++ b/testsuite/tests/dependent/should_compile/T15743.stderr
@@ -3,4 +3,4 @@ TYPE CONSTRUCTORS
forall {k1} k2 (k3 :: k2). Proxy k3 -> k1 -> k2 -> *
roles nominal nominal nominal phantom phantom phantom
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
diff --git a/testsuite/tests/dependent/should_compile/T15743e.stderr b/testsuite/tests/dependent/should_compile/T15743e.stderr
index 0fad2d93fc..76ee6eea93 100644
--- a/testsuite/tests/dependent/should_compile/T15743e.stderr
+++ b/testsuite/tests/dependent/should_compile/T15743e.stderr
@@ -54,4 +54,4 @@ DATA CONSTRUCTORS
(d :: Proxy k5) (e :: Proxy k7).
f c -> T k8 a b f c d e
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
diff --git a/testsuite/tests/indexed-types/should_compile/T15711.stderr b/testsuite/tests/indexed-types/should_compile/T15711.stderr
index 39545a9c28..4815ee0496 100644
--- a/testsuite/tests/indexed-types/should_compile/T15711.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T15711.stderr
@@ -3,4 +3,4 @@ TYPE CONSTRUCTORS
associated type family F{2} :: forall a. Maybe a -> *
roles nominal nominal
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
diff --git a/testsuite/tests/indexed-types/should_compile/T15852.stderr b/testsuite/tests/indexed-types/should_compile/T15852.stderr
index eb3d88f323..41dba2100e 100644
--- a/testsuite/tests/indexed-types/should_compile/T15852.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T15852.stderr
@@ -9,4 +9,4 @@ FAMILY INSTANCES
data instance forall {k1} {k2} {c :: k1} {j :: k2}.
DF (Proxy c) -- Defined at T15852.hs:10:15
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
diff --git a/testsuite/tests/package/T4806a.stderr b/testsuite/tests/package/T4806a.stderr
index 37530527ea..e16315199f 100644
--- a/testsuite/tests/package/T4806a.stderr
+++ b/testsuite/tests/package/T4806a.stderr
@@ -3,5 +3,5 @@ T4806a.hs:1:1: error:
Could not load module ‘Data.Map’
It is a member of the package ‘containers-0.6.0.1’
which is unusable because the -ignore-package flag was used to ignore at least one of its dependencies:
- deepseq-1.4.7.0
+ deepseq-1.4.8.0
Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/polykinds/T15592.stderr b/testsuite/tests/polykinds/T15592.stderr
index f04d4f56f3..8ac2d3e185 100644
--- a/testsuite/tests/polykinds/T15592.stderr
+++ b/testsuite/tests/polykinds/T15592.stderr
@@ -5,4 +5,4 @@ DATA CONSTRUCTORS
MkT :: forall {k} k1 (f :: k1 -> k -> *) (a :: k1) (b :: k).
f a b -> T f a b -> T f a b
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
diff --git a/testsuite/tests/polykinds/T15592b.stderr b/testsuite/tests/polykinds/T15592b.stderr
index 3b56a07ab0..4353292f2c 100644
--- a/testsuite/tests/polykinds/T15592b.stderr
+++ b/testsuite/tests/polykinds/T15592b.stderr
@@ -4,4 +4,4 @@ TYPE CONSTRUCTORS
forall k (f :: k -> *) (a :: k). f a -> *
roles nominal nominal nominal nominal
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
diff --git a/testsuite/tests/printer/T18052a.stderr b/testsuite/tests/printer/T18052a.stderr
index 7b7ccfa571..6b59a80fc0 100644
--- a/testsuite/tests/printer/T18052a.stderr
+++ b/testsuite/tests/printer/T18052a.stderr
@@ -6,7 +6,7 @@ TYPE CONSTRUCTORS
PATTERN SYNONYMS
(:||:) :: forall {a} {b}. a -> b -> (a, b)
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
==================== Tidy Core ====================
Result size of Tidy Core
diff --git a/testsuite/tests/typecheck/should_compile/T12763.stderr b/testsuite/tests/typecheck/should_compile/T12763.stderr
index d918ca9690..648ebe25f3 100644
--- a/testsuite/tests/typecheck/should_compile/T12763.stderr
+++ b/testsuite/tests/typecheck/should_compile/T12763.stderr
@@ -8,4 +8,4 @@ COERCION AXIOMS
CLASS INSTANCES
instance C Int -- Defined at T12763.hs:9:10
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
diff --git a/testsuite/tests/typecheck/should_compile/T18406b.stderr b/testsuite/tests/typecheck/should_compile/T18406b.stderr
index 4f7a47ea0e..1faf158c36 100644
--- a/testsuite/tests/typecheck/should_compile/T18406b.stderr
+++ b/testsuite/tests/typecheck/should_compile/T18406b.stderr
@@ -6,7 +6,7 @@ TYPE CONSTRUCTORS
COERCION AXIOMS
axiom Bug.N:C :: forall a b. C a b = a -> a
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
==================== Typechecker ====================
Bug.$tcC
diff --git a/testsuite/tests/typecheck/should_compile/T18529.stderr b/testsuite/tests/typecheck/should_compile/T18529.stderr
index a0273795d7..48f66e43c9 100644
--- a/testsuite/tests/typecheck/should_compile/T18529.stderr
+++ b/testsuite/tests/typecheck/should_compile/T18529.stderr
@@ -6,7 +6,7 @@ TYPE CONSTRUCTORS
COERCION AXIOMS
axiom Bug.N:C :: forall a b. C a b = a -> b -> ()
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
==================== Typechecker ====================
Bug.$tcC
diff --git a/testsuite/tests/typecheck/should_compile/T21023.stderr b/testsuite/tests/typecheck/should_compile/T21023.stderr
index fa7034f598..5a21342a4e 100644
--- a/testsuite/tests/typecheck/should_compile/T21023.stderr
+++ b/testsuite/tests/typecheck/should_compile/T21023.stderr
@@ -2,4 +2,4 @@ TYPE SIGNATURES
f :: forall {a}. a -> (a, Integer)
x :: Integer
Dependent modules: []
-Dependent packages: [base-4.16.0.0]
+Dependent packages: [base-4.17.0.0]
diff --git a/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr b/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr
index a081a78582..d9d577f5dd 100644
--- a/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr
+++ b/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr
@@ -8,10 +8,10 @@ subsumption_sort_hole_fits.hs:2:5: warning: [-Wtyped-holes (in -Wdefault)]
Valid hole fits include
lines :: String -> [String]
(imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1
- (and originally defined in ‘base-4.16.0.0:Data.OldList’))
+ (and originally defined in ‘base-4.17.0.0:Data.OldList’))
words :: String -> [String]
(imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1
- (and originally defined in ‘base-4.16.0.0:Data.OldList’))
+ (and originally defined in ‘base-4.17.0.0:Data.OldList’))
read :: forall a. Read a => String -> a
with read @[String]
(imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1
diff --git a/utils/hsc2hs b/utils/hsc2hs
-Subproject fe518b0e86a45826b5b1f4642037981bac7413d
+Subproject ac11465d9aadbe24be4832a3775fbd434448440