Skip to content

Commit d28df83

Browse files
authored
Merge pull request #140 from commercialhaskell/fix139
Fix #139 Accommodate GHC 9.12.1
2 parents 191ab87 + 5651874 commit d28df83

File tree

7 files changed

+21
-17
lines changed

7 files changed

+21
-17
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ on:
77
- master
88
workflow_dispatch:
99

10-
# As of 13 December 2024, ubuntu-latest and windows-latest come with Stack 3.1.1.
11-
# However, macos-13 and macos-latest do not come with Haskell tools.
10+
# As of 15 February 2025, ubuntu-latest and windows-latest come with
11+
# Stack 3.1.1. However, macos-13 and macos-latest do not come with Haskell
12+
# tools.
1213

1314
jobs:
1415
build:
@@ -20,10 +21,10 @@ jobs:
2021
os:
2122
- ubuntu-latest
2223
snapshot:
23-
- stack-ghc-9.4.8.yaml
2424
- stack-ghc-9.6.6.yaml
2525
- stack-ghc-9.8.4.yaml
2626
- stack-ghc-9.10.1.yaml
27+
- stack-ghc-9.12.1.yaml
2728
include:
2829
- os: macos-13
2930
snapshot: stack-ghc-9.8.4.yaml

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies:
2929
- aeson-warning-parser >= 0.1.1
3030
- ansi-terminal
3131
- bytestring
32-
- Cabal >= 3 && < 3.13
32+
- Cabal >= 3 && < 3.15
3333
- casa-client >= 0.0.2
3434
- casa-types
3535
- companion

pantry.cabal

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

stack-ghc-9.10.1.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
# Snapshot specification for GHC 9.10.1.
2-
snapshot: nightly-2024-12-13 # GHC 9.10.1
3-
4-
packages:
5-
- aeson-warning-parser-0.1.1@sha256:e5b81492d39bfe5de99fdc838e54e0fc0f2e290eb9fcfd4531cabf24baeada76,1353
6-
- http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716
7-
- path-0.9.6@sha256:63c2783d76c425514b2904e392f487921de823d883dcc629d7eaad36930198ce,5531
8-
- path-io-1.8.2@sha256:97725811b06f3fea7c1f2b0b39f21806c2f90470fc571acd75d3606b49b0f0d9,2009
9-
- rio-prettyprint-0.1.8.0@sha256:28a034bfa2842043d4603800e47943027677746cca0b3b8088aee10168870105,1428
2+
snapshot: nightly-2025-02-15 # GHC 9.10.1
103

114
flags:
125
path:

stack-ghc-9.12.1.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Snapshot specification for GHC 9.12.1.
2+
snapshot: nightly-2025-02-15 # GHC 9.10.1
3+
compiler: ghc-9.12.1
4+
5+
flags:
6+
path:
7+
os-string: true

stack-ghc-9.8.4.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Snapshot specification for GHC 9.8.4.
2-
snapshot: lts-23.0 # GHC 9.8.4
2+
snapshot: lts-23.8 # GHC 9.8.4

stack.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
snapshot: stack-ghc-9.8.4.yaml
2+
3+
# Added to allow testing of snapshot: stack-ghc-9.12.1.yaml:
4+
allow-newer: true

0 commit comments

Comments
 (0)