diff options
author | Ben Gamari <ben@smart-cactus.org> | 2022-06-16 12:19:31 -0400 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-06-27 08:01:03 -0400 |
commit | 0aa0ce69d835e2fef49cbd2d8f344182c07adc63 (patch) | |
tree | 4437f17d45b0dae4c4b3db2c59d4486fcfb20b8e /libraries | |
parent | 75f0091bc59437c96fc076a31f389735f7302c9a (diff) | |
download | haskell-0aa0ce69d835e2fef49cbd2d8f344182c07adc63.tar.gz |
Bump ghc-prim and base versions
To 0.9.0 and 4.17.0 respectively.
Bumps array, deepseq, directory, filepath, haskeline, hpc, parsec, stm,
terminfo, text, unix, haddock, and hsc2hs submodules.
(cherry picked from commit ba47b95122b7b336ce1cc00896a47b584ad24095)
Diffstat (limited to 'libraries')
m--------- | libraries/array | 0 | ||||
-rw-r--r-- | libraries/base/base.cabal | 4 | ||||
-rw-r--r-- | libraries/base/tools/ucd2haskell/ucd2haskell.cabal | 2 | ||||
m--------- | libraries/deepseq | 0 | ||||
m--------- | libraries/directory | 0 | ||||
m--------- | libraries/filepath | 0 | ||||
-rw-r--r-- | libraries/ghc-bignum/ghc-bignum.cabal | 2 | ||||
-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 | 4 | ||||
-rw-r--r-- | libraries/ghc-heap/ghc-heap.cabal.in | 2 | ||||
-rw-r--r-- | libraries/ghc-prim/changelog.md | 43 | ||||
-rw-r--r-- | libraries/ghc-prim/ghc-prim.cabal | 2 | ||||
-rw-r--r-- | libraries/ghci/ghci.cabal.in | 4 | ||||
m--------- | libraries/haskeline | 0 | ||||
m--------- | libraries/hpc | 0 | ||||
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/text | 0 | ||||
m--------- | libraries/unix | 0 |
23 files changed, 35 insertions, 34 deletions
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 |