Upgrade GHC 9.6.2 -> 9.6.5

- use lts-22.27 for ghc 9.6.5 - drop override for protoc and ghc-source-gen packages and use packages from hackage instead - re-pin stackage snapshots
tweag · Aug 5, 2024 · f2faa40 · f2faa40
1 parent 6012182
commit f2faa40
Show file tree

Hide file tree

Showing 19 changed files with 444 additions and 443 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -48,7 +48,7 @@ jobs:
         bzlmod: [true, false]
         ghc:
           - 9.4.6
-          - 9.6.2
+          - 9.6.5
           - 9.8.1
         exclude:
           - module: rules_haskell_nix
@@ -58,7 +58,7 @@ jobs:
           #       and stack config per GHC version
           - ghc: 9.8.1
             bzlmod: true
-          - ghc: 9.6.2
+          - ghc: 9.6.5
             bzlmod: true
     runs-on: ${{ matrix.os }}
     env:
@@ -144,14 +144,14 @@ jobs:
         bzlmod: [true, false]
         ghc:
           - 9.4.6
-          - 9.6.2
+          - 9.6.5
           - 9.8.1
         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.8.1
             bzlmod: true
-          - ghc: 9.6.2
+          - ghc: 9.6.5
             bzlmod: true
           # currently proto-lens-protoc fails with an access violation on Windows
           - ghc: 9.6.2

diff --git a/rules_haskell_tests/ghcide-snapshot_9.6.2.json b/rules_haskell_tests/ghcide-snapshot_9.6.2.json
diff --git a/rules_haskell_tests/ghcide-snapshot_9.6.5.json b/rules_haskell_tests/ghcide-snapshot_9.6.5.json
diff --git a/...ll_tests/ghcide-stack-snapshot_9.6.2.yaml → ...ll_tests/ghcide-stack-snapshot_9.6.5.yaml b/...ll_tests/ghcide-stack-snapshot_9.6.2.yaml → ...ll_tests/ghcide-stack-snapshot_9.6.5.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2023-09-03
+resolver: lts-22.27
 
 packages:
  - ghcide-2.2.0.0

diff --git a/...ll_tests/stackage-pinning-test_9.6.2.yaml → ...ll_tests/stackage-pinning-test_9.6.5.yaml b/...ll_tests/stackage-pinning-test_9.6.2.yaml → ...ll_tests/stackage-pinning-test_9.6.5.yaml
@@ -1,9 +1,9 @@
-resolver: nightly-2023-09-03
+resolver: lts-22.27
 packages:
   - github: hspec/hspec
     # NOTE Keep in sync with resolver version
-    commit: "a8c7472ca344fa5b87dfaea8f1dd760ec9feceb2"
-    sha256: "d8aac8b70bcd6208d59383fdb132fcbaaa3be650e17d8316476d75cc9d60b993"
+    commit: "c19f465d082b585e21f4e0d9f62691bdc9b0792a"
+    sha256: "114792383e60e91dc4d5a177c6c1c0a42ba200449e4294ab891d1b0a6b820739"
     subdirs:
       - .
       - hspec-contrib

diff --git a/rules_haskell_tests/stackage-pinning-test_snapshot_9.6.2.json b/rules_haskell_tests/stackage-pinning-test_snapshot_9.6.2.json