[Git][ghc/ghc][wip/9.12.1-alpha1] 2 commits: Bump base bound to 4.21 for GHC 9.12
Zubin (@wz1000)
gitlab at gitlab.haskell.org
Mon Oct 14 09:00:10 UTC 2024
Zubin pushed to branch wip/9.12.1-alpha1 at Glasgow Haskell Compiler / GHC
Commits:
8122cf39 by Zubin Duggal at 2024-10-14T14:29:06+05:30
Bump base bound to 4.21 for GHC 9.12
- - - - -
49a1ce19 by Zubin Duggal at 2024-10-14T14:29:06+05:30
Prepare 9.12.1 alpha
- - - - -
29 changed files:
- compiler/ghc.cabal.in
- configure.ac
- libraries/Cabal
- libraries/array
- libraries/base/base.cabal.in
- libraries/deepseq
- libraries/directory
- libraries/filepath
- libraries/ghc-boot-th/ghc-boot-th.cabal.in
- libraries/ghc-boot/ghc-boot.cabal.in
- libraries/ghc-compact/ghc-compact.cabal
- libraries/ghc-experimental/ghc-experimental.cabal.in
- libraries/ghci/ghci.cabal.in
- libraries/haskeline
- libraries/hpc
- libraries/os-string
- libraries/parsec
- libraries/process
- libraries/semaphore-compat
- libraries/stm
- libraries/template-haskell/template-haskell.cabal.in
- libraries/terminfo
- libraries/unix
- testsuite/tests/ghc-e/should_fail/T9930fail.stderr
- utils/haddock/haddock-api/haddock-api.cabal
- utils/haddock/haddock-library/haddock-library.cabal
- utils/haddock/haddock-test/haddock-test.cabal
- utils/haddock/haddock.cabal
- utils/hsc2hs
Changes:
=====================================
compiler/ghc.cabal.in
=====================================
@@ -114,7 +114,7 @@ Library
extra-libraries: zstd
CPP-Options: -DHAVE_LIBZSTD
- Build-Depends: base >= 4.11 && < 4.21,
+ Build-Depends: base >= 4.11 && < 4.22,
deepseq >= 1.4 && < 1.6,
directory >= 1 && < 1.4,
process >= 1 && < 1.7,
=====================================
configure.ac
=====================================
@@ -22,7 +22,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12], [glasgow-hask
AC_CONFIG_MACRO_DIRS([m4])
# Set this to YES for a released version, otherwise NO
-: ${RELEASE=YES}
+: ${RELEASE=NO}
# The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line
# above. If this is not a released version, then we will append the
=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 2a48e40fdf320caa4240ce8eb28841e31f4f3de3
+Subproject commit 6eb0369e3f736ef62192a5760a9fce3b1a989543
=====================================
libraries/array
=====================================
@@ -1 +1 @@
-Subproject commit c9cb2c1e8762aa83b6e77af82c87a55e03e990e4
+Subproject commit a8ec1173bce79b12ad5a7d2581b8a0862432f311
=====================================
libraries/base/base.cabal.in
=====================================
@@ -4,7 +4,7 @@ cabal-version: 3.0
-- Make sure you are editing ghc-experimental.cabal.in, not ghc-experimental.cabal
name: base
-version: 4.20.0.0
+version: 4.21.0.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD-3-Clause
=====================================
libraries/deepseq
=====================================
@@ -1 +1 @@
-Subproject commit 7ce6e2d3760b23336fd5f9a36f50df6571606947
+Subproject commit af115cc226cc87fba89d0f6e2e9212e755c24983
=====================================
libraries/directory
=====================================
@@ -1 +1 @@
-Subproject commit 6045b93c4ef7a713c8f3d6837ca69f8e96b12bf1
+Subproject commit 0c88ffff883d33df96b50879d1983a67e9dfeb81
=====================================
libraries/filepath
=====================================
@@ -1 +1 @@
-Subproject commit 87a09e296ea6fc137a0b32edda1bd0f54332642e
+Subproject commit bf2374ddfd7b2e5ba4e69d5ffbf4ebf6286c9c22
=====================================
libraries/ghc-boot-th/ghc-boot-th.cabal.in
=====================================
@@ -49,7 +49,7 @@ Library
GHC.Lexeme
build-depends:
- base >= 4.7 && < 4.21,
+ base >= 4.7 && < 4.22,
ghc-prim,
pretty == 1.1.*
=====================================
libraries/ghc-boot/ghc-boot.cabal.in
=====================================
@@ -75,7 +75,7 @@ Library
GHC.Version
GHC.Platform.Host
- build-depends: base >= 4.7 && < 4.21,
+ build-depends: base >= 4.7 && < 4.22,
binary == 0.8.*,
bytestring >= 0.10 && < 0.13,
containers >= 0.5 && < 0.8,
=====================================
libraries/ghc-compact/ghc-compact.cabal
=====================================
@@ -40,7 +40,7 @@ library
CPP
build-depends: ghc-prim >= 0.5.3 && < 0.12,
- base >= 4.9.0 && < 4.21,
+ base >= 4.9.0 && < 4.22,
bytestring >= 0.10.6.0 && <0.13
ghc-options: -Wall
=====================================
libraries/ghc-experimental/ghc-experimental.cabal.in
=====================================
@@ -39,7 +39,7 @@ library
if arch(wasm32)
exposed-modules: GHC.Wasm.Prim
other-extensions:
- build-depends: base ^>=4.20,
+ build-depends: base >=4.20 && < 4.22,
ghc-internal == @ProjectVersionForLib at .*,
ghc-prim >= 0.11 && < 0.12
hs-source-dirs: src
=====================================
libraries/ghci/ghci.cabal.in
=====================================
@@ -84,7 +84,7 @@ library
Build-Depends:
rts,
array == 0.5.*,
- base >= 4.8 && < 4.21,
+ base >= 4.8 && < 4.22,
-- ghc-internal == @ProjectVersionForLib at .*
-- TODO: Use GHC.Internal.Desugar and GHC.Internal.Base from
-- ghc-internal instead of ignoring the deprecation warning in GHCi.TH
=====================================
libraries/haskeline
=====================================
@@ -1 +1 @@
-Subproject commit 76157646fb5836fc022e770f7db2156661e899c3
+Subproject commit 5f4bf62bf1f4846ad0b8d1fa9d45f902e3934511
=====================================
libraries/hpc
=====================================
@@ -1 +1 @@
-Subproject commit 4989c41b96c7c9ca09a6687da638ac28f3d3688b
+Subproject commit 9e29abb785ab4f82c37c7a4e73ec999083955b09
=====================================
libraries/os-string
=====================================
@@ -1 +1 @@
-Subproject commit 6d31aafde2f7b8c3050ffee7dd9f658225cfd1a4
+Subproject commit 1d0553e20499d4bbaefe30d0489a08bc3523d331
=====================================
libraries/parsec
=====================================
@@ -1 +1 @@
-Subproject commit 9c071b05fbb077afbaf0dd2dfdab21265859ae91
+Subproject commit 903f9d8561a23376d26a7b857aa9fa5b35531d6f
=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit a53f925e3ee246e2429418b7a088ecaa0976007b
+Subproject commit 8364eaa2c83f7918be41cf3bd520e4ede1b07c35
=====================================
libraries/semaphore-compat
=====================================
@@ -1 +1 @@
-Subproject commit e8719d3b8e7e069b8f9200004b3d8a77446c91d3
+Subproject commit 54882cd9a07322a4cf95d4fc0627107eaf1eb051
=====================================
libraries/stm
=====================================
@@ -1 +1 @@
-Subproject commit cb861ea10065f229bbc5b6a1e2b9bde998f18184
+Subproject commit 789f7b117c02aa380cb59186307dff913643b6d7
=====================================
libraries/template-haskell/template-haskell.cabal.in
=====================================
@@ -52,7 +52,7 @@ Library
Language.Haskell.TH.CodeDo
build-depends:
- base >= 4.11 && < 4.21,
+ base >= 4.11 && < 4.22,
ghc-boot-th == @ProjectVersionMunged@
other-modules:
=====================================
libraries/terminfo
=====================================
@@ -1 +1 @@
-Subproject commit 5b43c14f6843973d8704fb60486e6c458fc0ac8c
+Subproject commit a76fac0c60cf6db7ed724d9b5c5067d77a23efc7
=====================================
libraries/unix
=====================================
@@ -1 +1 @@
-Subproject commit 69552a5267c7dc5c46a8bceec5ec4b40d26b9463
+Subproject commit ca5b0b64aa36348b42416e1f59f55992c3f3d177
=====================================
testsuite/tests/ghc-e/should_fail/T9930fail.stderr
=====================================
@@ -3,46 +3,46 @@ ghc: Exception:
default output name would overwrite the input file; must specify -o explicitly
Usage: For basic information, try the `--help' option.
-Package: ghc-9.11-inplace
+Package: ghc-9.12-8fe2
Module: GHC.Utils.Panic
Type: GhcException
While handling default output name would overwrite the input file; must specify -o explicitly
| Usage: For basic information, try the `--help' option.
|
- | Package: ghc-9.11-inplace
+ | Package: ghc-9.12-8fe2
| Module: GHC.Utils.Panic
| Type: GhcException
|
| While handling default output name would overwrite the input file; must specify -o explicitly
| | Usage: For basic information, try the `--help' option.
| |
- | | Package: ghc-9.11-inplace
+ | | Package: ghc-9.12-8fe2
| | Module: GHC.Utils.Panic
| | Type: GhcException
| |
| | While handling default output name would overwrite the input file; must specify -o explicitly
| | | Usage: For basic information, try the `--help' option.
| | |
- | | | Package: ghc-9.11-inplace
+ | | | Package: ghc-9.12-8fe2
| | | Module: GHC.Utils.Panic
| | | Type: GhcException
| | |
| | | HasCallStack backtrace:
- | | | collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:92:13 in ghc-internal:GHC.Internal.Exception
- | | | toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:84:32 in ghc-internal:GHC.Internal.Exception
- | | | throw, called at compiler/GHC/Utils/Panic.hs:180:21 in ghc-9.11-inplace:GHC.Utils.Panic
+ | | | collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
+ | | | toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception
+ | | | throw, called at compiler/GHC/Utils/Panic.hs:180:21 in ghc-9.12-8fe2:GHC.Utils.Panic
| |
| | HasCallStack backtrace:
- | | bracket_, called at libraries/semaphore-compat/src/System/Semaphore.hs:320:23 in semaphore-compat-1.0.0-inplace:System.Semaphore
+ | | bracket_, called at libraries/semaphore-compat/src/System/Semaphore.hs:320:23 in semaphore-compat-1.0.0-c856:System.Semaphore
|
| HasCallStack backtrace:
- | collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:92:13 in ghc-internal:GHC.Internal.Exception
+ | collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
| toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:284:11 in ghc-internal:GHC.Internal.IO
- | throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:371:12 in exceptions-0.10.7-inplace:Control.Monad.Catch
- | throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:860:84 in exceptions-0.10.7-inplace:Control.Monad.Catch
- | onException, called at compiler/GHC/Driver/Make.hs:2986:23 in ghc-9.11-inplace:GHC.Driver.Make
+ | throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:371:12 in exceptions-0.10.7-71b0:Control.Monad.Catch
+ | throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:860:84 in exceptions-0.10.7-71b0:Control.Monad.Catch
+ | onException, called at compiler/GHC/Driver/Make.hs:2988:23 in ghc-9.12-8fe2:GHC.Driver.Make
HasCallStack backtrace:
- bracket, called at compiler/GHC/Driver/Make.hs:2953:3 in ghc-9.11-inplace:GHC.Driver.Make
+ bracket, called at compiler/GHC/Driver/Make.hs:2955:3 in ghc-9.12-8fe2:GHC.Driver.Make
=====================================
utils/haddock/haddock-api/haddock-api.cabal
=====================================
@@ -78,7 +78,7 @@ library
build-depends: ghc-paths ^>= 0.1.0.12
-- this package typically supports only single major versions
- build-depends: base >= 4.16 && < 4.21
+ build-depends: base >= 4.16 && < 4.22
, ghc ^>= 9.12
, haddock-library ^>= 1.11
, xhtml ^>= 3000.2.2
=====================================
utils/haddock/haddock-library/haddock-library.cabal
=====================================
@@ -46,7 +46,7 @@ common ghc-options
-Wnoncanonical-monad-instances -Wmissing-home-modules
build-depends:
- , base >= 4.10 && < 4.21
+ , base >= 4.10 && < 4.22
, containers ^>= 0.4.2.1 || ^>= 0.5.0.0 || ^>= 0.6.0.1 || ^>= 0.7
, text ^>= 1.2.3.0 || ^>= 2.0 || ^>= 2.1
, parsec ^>= 3.1.13.0
=====================================
utils/haddock/haddock-test/haddock-test.cabal
=====================================
@@ -16,7 +16,7 @@ library
default-language: Haskell2010
ghc-options: -Wall
hs-source-dirs: src
- build-depends: base >= 4.3 && < 4.21, bytestring, directory, process, filepath, Cabal
+ build-depends: base >= 4.3 && < 4.22, bytestring, directory, process, filepath, Cabal
exposed-modules:
Test.Haddock
=====================================
utils/haddock/haddock.cabal
=====================================
@@ -91,7 +91,7 @@ executable haddock
-- haddock typically only supports a single GHC major version
build-depends:
- base >= 4.13.0.0 && <4.21,
+ base >= 4.13.0.0 && <4.22,
-- in order for haddock's advertised version number to have proper meaning,
-- we pin down to a single haddock-api version.
haddock-api == 2.30.0
=====================================
utils/hsc2hs
=====================================
@@ -1 +1 @@
-Subproject commit b0b0cca3db42fc9bf8ebc7da8ddd6fa937c5aa25
+Subproject commit c3b21800a67366c9591dc85a471d1dfdb1efcf29
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/380d89bb917085ce4e8dadf441af5e583b488782...49a1ce190c071072cff68d9ad1f7d9bf02292696
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/380d89bb917085ce4e8dadf441af5e583b488782...49a1ce190c071072cff68d9ad1f7d9bf02292696
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241014/40447e16/attachment-0001.html>
More information about the ghc-commits
mailing list