[Git][ghc/ghc][wip/9.12-forward-ports] 9 commits: Bump ghc-prim and template-haskell versions
Zubin (@wz1000)
gitlab at gitlab.haskell.org
Fri Dec 20 09:38:48 UTC 2024
Zubin pushed to branch wip/9.12-forward-ports at Glasgow Haskell Compiler / GHC
Commits:
f8ab0481 by Zubin Duggal at 2024-12-20T15:07:59+05:30
Bump ghc-prim and template-haskell versions
Also bump exceptions and text submodule
(cherry picked from commit 6fc1fa3bdc8f53acdb19e47145789274060e498f)
- - - - -
97f92984 by Zubin Duggal at 2024-12-20T15:08:33+05:30
Bump Cabal submodule to 3.14.1.0
(cherry picked from commit 5c9c3e3f79a79bb6d9a77a17c716dc3a0bcbd2aa)
- - - - -
786793bc by Zubin Duggal at 2024-12-20T15:08:33+05:30
Bump directory submodule to 0.12.2.0
(cherry picked from commit 897906265db37af34ae2aaa016cec417f263407b)
- - - - -
1b125ead by Zubin Duggal at 2024-12-20T15:08:33+05:30
Fix TH changelog
- - - - -
d81b28e9 by Zubin Duggal at 2024-12-20T15:08:33+05:30
release: copy index.html from correct directory
(cherry picked from commit cbfd0829cd61928976c9eb17ba4af18272466063)
- - - - -
e473b3f0 by Zubin Duggal at 2024-12-20T15:08:33+05:30
hadrian-multi: warn on unused imports
os-string has redundant imports
(cherry picked from commit dde3796be689ea57543936e22aa5ea4ef7ed995e)
- - - - -
8a634725 by Zubin Duggal at 2024-12-20T15:08:33+05:30
Bump array submodule for base bump
- - - - -
2bb9fcb6 by Zubin Duggal at 2024-12-20T15:08:33+05:30
Bump stm submodule for base bump
- - - - -
46a31b03 by Zubin Duggal at 2024-12-20T15:08:33+05:30
Bump process submodule for base bump
- - - - -
19 changed files:
- .gitlab-ci.yml
- .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py
- ghc/ghc-bin.cabal.in
- libraries/Cabal
- libraries/array
- libraries/bytestring
- libraries/exceptions
- libraries/ghc-bignum/ghc-bignum.cabal
- libraries/ghc-compact/ghc-compact.cabal
- libraries/ghc-experimental/ghc-experimental.cabal.in
- libraries/ghc-heap/ghc-heap.cabal.in
- libraries/ghc-internal/ghc-internal.cabal.in
- libraries/ghc-prim/ghc-prim.cabal
- libraries/ghci/ghci.cabal.in
- libraries/process
- libraries/stm
- libraries/template-haskell/changelog.md
- libraries/template-haskell/template-haskell.cabal.in
- libraries/text
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -444,7 +444,7 @@ hadrian-multi:
# workaround for docker permissions
- sudo chown ghc:ghc -R .
variables:
- GHC_FLAGS: "-Werror=-Wno-error=incomplete-record-selectors -Wwarn=deprecations"
+ GHC_FLAGS: "-Werror=-Wno-error=incomplete-record-selectors -Wwarn=deprecations -Wwarn=unused-imports"
# -Wno-error=incomplete-record-selectors is present because -Wall now
# includes -Wincomplete-record-selectors, and hadrian-multi has many, many
# warnings about incomplete record selectors. A better fix would be to
=====================================
.gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py
=====================================
@@ -132,7 +132,7 @@ def fetch_artifacts(release: str, pipeline_id: int,
for f in doc_files:
subprocess.run(['tar', '-xf', f, '-C', dest])
logging.info(f'extracted docs {f} to {dest}')
- index_path = destdir / 'index.html'
+ index_path = destdir / 'docs' / 'index.html'
index_path.replace(dest / 'index.html')
elif job.name == 'hackage-doc-tarball':
dest = dest_dir / 'hackage_docs'
=====================================
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 && < 1.6,
- ghc-prim >= 0.5.0 && < 0.12,
+ ghc-prim >= 0.5.0 && < 0.14,
ghci == @ProjectVersionMunged@,
haskeline == 0.8.*,
exceptions == 0.10.*,
=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 6eb0369e3f736ef62192a5760a9fce3b1a989543
+Subproject commit 269fd808e5d80223a229b6b19edfe6f5b109007a
=====================================
libraries/array
=====================================
@@ -1 +1 @@
-Subproject commit 18dd1439815e43c3e8142cca7b4735c8ad9850ab
+Subproject commit e7ffb82fd40134da21d7642a41568f32c77c1a04
=====================================
libraries/bytestring
=====================================
@@ -1 +1 @@
-Subproject commit 453c1dc110720a366f90ef84dc2d75a5cd8c28e0
+Subproject commit d984ad00644c0157bad04900434b9d36f23633c5
=====================================
libraries/exceptions
=====================================
@@ -1 +1 @@
-Subproject commit 0b6abb3ac433c7d1d5c6f6a5a45b37f7c486e33b
+Subproject commit 8e55b720f45db91f4895f710863ef9dbc10fe569
=====================================
libraries/ghc-bignum/ghc-bignum.cabal
=====================================
@@ -77,7 +77,7 @@ library
ForeignFunctionInterface
build-depends:
- ghc-prim >= 0.5.1.0 && < 0.12
+ ghc-prim >= 0.5.1.0 && < 0.14
hs-source-dirs: src/
include-dirs: include/
=====================================
libraries/ghc-compact/ghc-compact.cabal
=====================================
@@ -39,7 +39,7 @@ library
UnboxedTuples
CPP
- build-depends: ghc-prim >= 0.5.3 && < 0.12,
+ build-depends: ghc-prim >= 0.5.3 && < 0.14,
base >= 4.9.0 && < 4.22,
bytestring >= 0.10.6.0 && <0.13
ghc-options: -Wall
=====================================
libraries/ghc-experimental/ghc-experimental.cabal.in
=====================================
@@ -43,6 +43,6 @@ library
other-extensions:
build-depends: base >=4.20 && < 4.22,
ghc-internal == @ProjectVersionForLib at .*,
- ghc-prim >= 0.11 && < 0.12
+ ghc-prim >= 0.11 && < 0.14
hs-source-dirs: src
default-language: Haskell2010
=====================================
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.12
+ , ghc-prim > 0.2 && < 0.14
, rts == 1.0.*
, containers >= 0.6.2.1 && < 0.8
=====================================
libraries/ghc-internal/ghc-internal.cabal.in
=====================================
@@ -91,7 +91,7 @@ Library
build-depends:
rts == 1.0.*,
- ghc-prim >= 0.11 && < 0.12,
+ ghc-prim >= 0.11 && < 0.14,
ghc-bignum >= 1.0 && < 2.0
exposed-modules:
=====================================
libraries/ghc-prim/ghc-prim.cabal
=====================================
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: ghc-prim
-version: 0.11.0
+version: 0.13.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD-3-Clause
license-file: LICENSE
=====================================
libraries/ghci/ghci.cabal.in
=====================================
@@ -90,7 +90,7 @@ library
-- ghc-internal instead of ignoring the deprecation warning in GHCi.TH
-- and GHCi.CreateBCO when we require ghc-internal of the bootstrap
-- compiler
- ghc-prim >= 0.5.0 && < 0.12,
+ ghc-prim >= 0.5.0 && < 0.14,
binary == 0.8.*,
bytestring >= 0.10 && < 0.13,
containers >= 0.5 && < 0.8,
=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit b8c88fb5bbdebbcbb3e7c734f0c7515dd3cef84e
+Subproject commit 9c3bfc214c72bbd0c8a30a1c41465deed0feaf47
=====================================
libraries/stm
=====================================
@@ -1 +1 @@
-Subproject commit 07df1050ab5d45244f718eee8a512bb18e7066f6
+Subproject commit def18948f42a2eb8c34efdf65f7e614d1f6d5703
=====================================
libraries/template-haskell/changelog.md
=====================================
@@ -9,9 +9,6 @@
* Extend `Exp` with `ForallE`, `ForallVisE`, `ConstraintedE`,
introduce functions `forallE`, `forallVisE`, `constraintedE` (GHC Proposal #281).
* `template-haskell` is no longer wired-in. All wired-in identifiers have been moved to `ghc-internal`.
-
-## 2.22.1.0
-
* `Lift` instances were added for the `template-haskell` AST.
## 2.22.0.0
=====================================
libraries/template-haskell/template-haskell.cabal.in
=====================================
@@ -3,7 +3,7 @@
-- template-haskell.cabal.
name: template-haskell
-version: 2.22.1.0
+version: 2.23.0.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD3
license-file: LICENSE
=====================================
libraries/text
=====================================
@@ -1 +1 @@
-Subproject commit ee0a8f8b9a4bd3fdad23e9ac0db56e7f08ce35cd
+Subproject commit b86564cae8d7262c7c4e7afe7a9163c83de3f175
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/87664908800ca09e8a2228347b92e04f22a95a6e...46a31b0354e81795cdd5c3b78518dedfb4df0f1f
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/87664908800ca09e8a2228347b92e04f22a95a6e...46a31b0354e81795cdd5c3b78518dedfb4df0f1f
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/20241220/f718d450/attachment-0001.html>
More information about the ghc-commits
mailing list