Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump GHC 9.4 to version 9.4.6 #1998

Merged
merged 2 commits into from
Nov 13, 2023
Merged

Bump GHC 9.4 to version 9.4.6 #1998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bad1b9b
Upgrade GHC 9.4 to version 9.4.6
avdv Oct 25, 2023
540aa48
Merge branch 'master' into ghc-9.4.6
mergify[bot] Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:
bzlmod: [true, false]
ghc:
- 9.2.8
- 9.4.5
- 9.4.6
exclude:
- module: rules_haskell_nix
bzlmod: false
# TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
# and stack config per GHC version
- ghc: 9.4.5
- ghc: 9.4.6
bzlmod: true
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -123,11 +123,11 @@ jobs:
bzlmod: [true, false]
ghc:
- 9.2.8
- 9.4.5
- 9.4.6
exclude:
# TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
# and stack config per GHC version
- ghc: 9.4.5
- ghc: 9.4.6
bzlmod: true
env:
GHC_VERSION: ${{ matrix.ghc }}
Expand Down
100 changes: 50 additions & 50 deletions ..._haskell_tests/ghcide-snapshot_9.4.5.json → ..._haskell_tests/ghcide-snapshot_9.4.6.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions ...ll_tests/ghcide-stack-snapshot_9.4.5.yaml → ...ll_tests/ghcide-stack-snapshot_9.4.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
resolver: lts-21.5
resolver: lts-21.11

packages:
- algebraic-graphs-0.6
- co-log-core-0.3.2.0
Expand Down Expand Up @@ -31,7 +32,7 @@ drop-packages:
- Win32


# stackage lts-21.5/ghc 9.4.5 only contains Win32-2.12.0.1
# stackage lts-21.11/ghc 9.4.6 only contains Win32-2.12.0.1
flags:
ansi-terminal:
Win32-2-13-1: false
5 changes: 3 additions & 2 deletions ...ll_tests/stackage-pinning-test_9.4.5.yaml → ...ll_tests/stackage-pinning-test_9.4.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
resolver: "lts-21.5"
resolver: "lts-21.11"

packages:
- github: hspec/hspec
# NOTE Keep in sync with resolver version
Expand Down Expand Up @@ -26,7 +27,7 @@ packages:
drop-packages:
- Win32

# stackage lts-21.5/ghc 9.4.5 only contains Win32-2.12.0.1
# stackage lts-21.11/ghc 9.4.6 only contains Win32-2.12.0.1
flags:
ansi-terminal:
Win32-2-13-1: false
12 changes: 6 additions & 6 deletions ...stackage-pinning-test_snapshot_9.4.5.json → ...stackage-pinning-test_snapshot_9.4.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"__GENERATED_FILE_DO_NOT_MODIFY_MANUALLY": -581364955,
"all-cabal-hashes": "https://raw.githubusercontent.com/commercialhaskell/all-cabal-hashes/f37b128b53c16cf6dcd8eedb523d7a71985510a6",
"__GENERATED_FILE_DO_NOT_MODIFY_MANUALLY": -845694083,
"all-cabal-hashes": "https://raw.githubusercontent.com/commercialhaskell/all-cabal-hashes/f9852bf631dd415e0fd690bc50f17abb12c618a6",
"resolved": {
"Cabal": {"dependencies":["Cabal-syntax","array","base","bytestring","containers","deepseq","directory","filepath","mtl","parsec","pretty","process","text","time","transformers","unix"],"location":{"type":"git","url":"https://github.com/tweag/cabal","commit":"4f8c4ab8274320c1a00992c9aa7c6559ff190fa9","subdir":"Cabal"},"name":"Cabal","version":"3.8.1.0"},
"Cabal-syntax": {"dependencies":[],"location":{"type":"core"},"name":"Cabal-syntax","version":"3.8.1.0"},
Expand All @@ -9,8 +9,8 @@
"ansi-terminal": {"dependencies":["ansi-terminal-types","base","colour"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/ansi-terminal-0.11.5/ansi-terminal-0.11.5.tar.gz"},"name":"ansi-terminal","pinned":{"url":["https://hackage.haskell.org/package/ansi-terminal-0.11.5/ansi-terminal-0.11.5.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/ansi-terminal-0.11.5.tar.gz"],"sha256":"5b4acedc55eb558381f0b694c2d31a50c332856b823db44cbbf2df78e8c097cb","cabal-sha256":"2fe3d006b9ea0dc1a5537a029edb0bc2bbe56a33a6d95264b38b54c58e931e51"},"version":"0.11.5"},
"ansi-terminal-types": {"dependencies":["base","colour"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/ansi-terminal-types-0.11.5/ansi-terminal-types-0.11.5.tar.gz"},"name":"ansi-terminal-types","pinned":{"url":["https://hackage.haskell.org/package/ansi-terminal-types-0.11.5/ansi-terminal-types-0.11.5.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/ansi-terminal-types-0.11.5.tar.gz"],"sha256":"bf7b230389f43105100a6d5740822598a88b38eaaf7d042de595ccf72db4fdd1","cabal-sha256":"f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a"},"version":"0.11.5"},
"array": {"dependencies":[],"location":{"type":"core"},"name":"array","version":"0.5.4.0"},
"base": {"dependencies":[],"location":{"type":"core"},"name":"base","version":"4.17.1.0"},
"bytestring": {"dependencies":[],"location":{"type":"core"},"name":"bytestring","version":"0.11.4.0"},
"base": {"dependencies":[],"location":{"type":"core"},"name":"base","version":"4.17.2.0"},
"bytestring": {"dependencies":[],"location":{"type":"core"},"name":"bytestring","version":"0.11.5.1"},
"call-stack": {"dependencies":["base"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/call-stack-0.4.0/call-stack-0.4.0.tar.gz"},"name":"call-stack","pinned":{"url":["https://hackage.haskell.org/package/call-stack-0.4.0/call-stack-0.4.0.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/call-stack-0.4.0.tar.gz"],"sha256":"430bcf8a3404f7e55319573c0b807b1356946f0c8f289bb3d9afb279c636b87b","cabal-sha256":"ac44d2c00931dc20b01750da8c92ec443eb63a7231e8550188cb2ac2385f7feb"},"version":"0.4.0"},
"colour": {"dependencies":["base"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/colour-2.3.6/colour-2.3.6.tar.gz"},"name":"colour","pinned":{"url":["https://hackage.haskell.org/package/colour-2.3.6/colour-2.3.6.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/colour-2.3.6.tar.gz"],"sha256":"2cd35dcd6944a5abc9f108a5eb5ee564b6b1fa98a9ec79cefcc20b588991f871","cabal-sha256":"ebdcbf15023958838a527e381ab3c3b1e99ed12d1b25efeb7feaa4ad8c37664a"},"version":"2.3.6"},
"containers": {"dependencies":[],"location":{"type":"core"},"name":"containers","version":"0.6.7"},
Expand All @@ -27,9 +27,9 @@
"parsec": {"dependencies":[],"location":{"type":"core"},"name":"parsec","version":"3.1.16.1"},
"pretty": {"dependencies":[],"location":{"type":"core"},"name":"pretty","version":"1.1.3.6"},
"primitive": {"dependencies":["base","deepseq","template-haskell","transformers"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/primitive-0.8.0.0/primitive-0.8.0.0.tar.gz"},"name":"primitive","pinned":{"url":["https://hackage.haskell.org/package/primitive-0.8.0.0/primitive-0.8.0.0.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/primitive-0.8.0.0.tar.gz"],"sha256":"5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f","cabal-sha256":"d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670"},"version":"0.8.0.0"},
"process": {"dependencies":[],"location":{"type":"core"},"name":"process","version":"1.6.16.0"},
"process": {"dependencies":[],"location":{"type":"core"},"name":"process","version":"1.6.17.0"},
"quickcheck-io": {"dependencies":["HUnit","QuickCheck","base"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/quickcheck-io-0.2.0/quickcheck-io-0.2.0.tar.gz"},"name":"quickcheck-io","pinned":{"url":["https://hackage.haskell.org/package/quickcheck-io-0.2.0/quickcheck-io-0.2.0.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/quickcheck-io-0.2.0.tar.gz"],"sha256":"fb779119d79fe08ff4d502fb6869a70c9a8d5fd8ae0959f605c3c937efd96422","cabal-sha256":"7bf0b68fb90873825eb2e5e958c1b76126dcf984debb998e81673e6d837e0b2d"},"version":"0.2.0"},
"random": {"dependencies":["base","bytestring","deepseq","mtl","splitmix"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/random-1.2.1.1/random-1.2.1.1.tar.gz"},"name":"random","pinned":{"url":["https://hackage.haskell.org/package/random-1.2.1.1/random-1.2.1.1.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/random-1.2.1.1.tar.gz"],"sha256":"3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76","cabal-sha256":"dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9"},"version":"1.2.1.1"},
"random": {"dependencies":["base","bytestring","deepseq","mtl","splitmix"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/random-1.2.1.1/random-1.2.1.1.tar.gz"},"name":"random","pinned":{"url":["https://hackage.haskell.org/package/random-1.2.1.1/random-1.2.1.1.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/random-1.2.1.1.tar.gz"],"sha256":"3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76","cabal-sha256":"e7c1f881159d5cc788619c9ee8b8f340ba2ff0db571cdf3d1a1968ebc5108789"},"version":"1.2.1.1"},
"setenv": {"dependencies":["base","unix"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/setenv-0.1.1.3/setenv-0.1.1.3.tar.gz"},"name":"setenv","pinned":{"url":["https://hackage.haskell.org/package/setenv-0.1.1.3/setenv-0.1.1.3.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/setenv-0.1.1.3.tar.gz"],"sha256":"e358df39afc03d5a39e2ec650652d845c85c80cc98fe331654deafb4767ecb32","cabal-sha256":"c5916ac0d2a828473cd171261328a290afe0abd799db1ac8c310682fe778c45b"},"version":"0.1.1.3"},
"splitmix": {"dependencies":["base","deepseq"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz"},"name":"splitmix","pinned":{"url":["https://hackage.haskell.org/package/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/splitmix-0.1.0.4.tar.gz"],"sha256":"6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa","cabal-sha256":"db25c2e17967aa6b6046ab8b1b96ba3f344ca59a62b60fb6113d51ea305a3d8e"},"version":"0.1.0.4"},
"stm": {"dependencies":[],"location":{"type":"core"},"name":"stm","version":"2.5.1.0"},
Expand Down
10 changes: 5 additions & 5 deletions ...l_tests/stackage-zlib-snapshot_9.4.5.json → ...l_tests/stackage-zlib-snapshot_9.4.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"__GENERATED_FILE_DO_NOT_MODIFY_MANUALLY": -120601176,
"all-cabal-hashes": "https://raw.githubusercontent.com/commercialhaskell/all-cabal-hashes/7006661dda3a3e0824a789264c3bd5098a069b30",
"__GENERATED_FILE_DO_NOT_MODIFY_MANUALLY": -1266958347,
"all-cabal-hashes": "https://raw.githubusercontent.com/commercialhaskell/all-cabal-hashes/f9852bf631dd415e0fd690bc50f17abb12c618a6",
"resolved": {
"base": {"dependencies":[],"location":{"type":"core"},"name":"base","version":"4.16.4.0"},
"bytestring": {"dependencies":[],"location":{"type":"core"},"name":"bytestring","version":"0.11.3.1"},
"zlib": {"dependencies":["base","bytestring"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz"},"name":"zlib","pinned":{"url":["https://hackage.haskell.org/package/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/zlib-0.6.3.0.tar.gz"],"sha256":"9eaa989ad4534438b5beb51c1d3a4c8f6a088fdff0b259a5394fbf39aaee04da","cabal-sha256":"cf2a8edc1f4086934638d11882423780dd096c4e77d9c6639ccc469c6c26f041"},"version":"0.6.3.0"}
"base": {"dependencies":[],"location":{"type":"core"},"name":"base","version":"4.17.2.0"},
"bytestring": {"dependencies":[],"location":{"type":"core"},"name":"bytestring","version":"0.11.5.1"},
"zlib": {"dependencies":["base","bytestring"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz"},"name":"zlib","pinned":{"url":["https://hackage.haskell.org/package/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/zlib-0.6.3.0.tar.gz"],"sha256":"9eaa989ad4534438b5beb51c1d3a4c8f6a088fdff0b259a5394fbf39aaee04da","cabal-sha256":"19eb7759af71957811d5ec10ddb1e2f4c98700ddb9c0da6860c0441d811f0e6d"},"version":"0.6.3.0"}
}
}
Loading