Skip to content

Commit b26f93f

Browse files
robinheghanrobinheghan
committed
Update to GHC 9.6 and Cabal 3.10
1 parent 22bec11 commit b26f93f

File tree

4 files changed

+34
-34
lines changed

4 files changed

+34
-34
lines changed

‎.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: Cache cabal store
7171
uses: actions/cache@v4
7272
with:
73-
path: ~/.cabal/store
73+
path: ~/.local/state/cabal
7474
key: deps-linux-${{ env.ghc }}-${{ hashFiles('cabal.project.freeze') }}
7575

7676
- name: Cache build artifacts
@@ -128,7 +128,7 @@ jobs:
128128
- name: Cache cabal store
129129
uses: actions/cache@v4
130130
with:
131-
path: ~/.cabal/store
131+
path: ~/.local/state/cabal
132132
key: deps-${{ matrix.os }}-${{ hashFiles('devbox.lock', 'cabal.project.freeze') }}
133133

134134
- name: Cache build artifacts

‎devbox.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.13.4/.schema/devbox.schema.json",
33
"packages": [
44
"nodejs@20",
5-
"ghc@9.4.8",
6-
"cabal-install@3.8.1.0",
7-
"ormolu@0.7"
5+
"ormolu@0.7",
6+
"ghc@9.6",
7+
"cabal-install@3.10"
88
],
99
"shell": {
1010
"init_hook": [

‎devbox.lock

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
11
{
22
"lockfile_version": "1",
33
"packages": {
4-
"cabal-install@3.8.1.0": {
5-
"last_modified": "2023-03-28T10:29:13Z",
6-
"resolved": "github:NixOS/nixpkgs/98f3b08f58ff125ef02d55cd52a83f44f245f2ea#cabal-install",
4+
"cabal-install@3.10": {
5+
"last_modified": "2024-07-31T08:48:38Z",
6+
"resolved": "github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce#cabal-install",
77
"source": "devbox-search",
8-
"version": "3.8.1.0",
8+
"version": "3.10.3.0",
99
"systems": {
1010
"aarch64-darwin": {
1111
"outputs": [
1212
{
1313
"name": "out",
14-
"path": "/nix/store/060dvanq07yffbjqqard255g3rf80npk-cabal-install-3.8.1.0",
14+
"path": "/nix/store/dd543dbn0mhj7674q1xja84xcw00791w-cabal-install-3.10.3.0",
1515
"default": true
1616
}
1717
],
18-
"store_path": "/nix/store/060dvanq07yffbjqqard255g3rf80npk-cabal-install-3.8.1.0"
18+
"store_path": "/nix/store/dd543dbn0mhj7674q1xja84xcw00791w-cabal-install-3.10.3.0"
1919
},
2020
"aarch64-linux": {
2121
"outputs": [
2222
{
2323
"name": "out",
24-
"path": "/nix/store/8wkk6h4bd8sdwnllp2dfhrra2sjss6a5-cabal-install-3.8.1.0",
24+
"path": "/nix/store/i4j48x90xwygm4vvjgy6gal50lnpm1yl-cabal-install-3.10.3.0",
2525
"default": true
2626
}
2727
],
28-
"store_path": "/nix/store/8wkk6h4bd8sdwnllp2dfhrra2sjss6a5-cabal-install-3.8.1.0"
28+
"store_path": "/nix/store/i4j48x90xwygm4vvjgy6gal50lnpm1yl-cabal-install-3.10.3.0"
2929
},
3030
"x86_64-darwin": {
3131
"outputs": [
3232
{
3333
"name": "out",
34-
"path": "/nix/store/2r5gydfgs3lg3f928q0ch11x2kwz2nj5-cabal-install-3.8.1.0",
34+
"path": "/nix/store/3jgzbgacsjlvs7y4xgqxwdk8p62f22vq-cabal-install-3.10.3.0",
3535
"default": true
3636
}
3737
],
38-
"store_path": "/nix/store/2r5gydfgs3lg3f928q0ch11x2kwz2nj5-cabal-install-3.8.1.0"
38+
"store_path": "/nix/store/3jgzbgacsjlvs7y4xgqxwdk8p62f22vq-cabal-install-3.10.3.0"
3939
},
4040
"x86_64-linux": {
4141
"outputs": [
4242
{
4343
"name": "out",
44-
"path": "/nix/store/wx9yy9mq1psqzqnmqnvrchgqgfhvaz7q-cabal-install-3.8.1.0",
44+
"path": "/nix/store/7275af4qndabxgw7nnzsz8g2xgigrs1b-cabal-install-3.10.3.0",
4545
"default": true
4646
}
4747
],
48-
"store_path": "/nix/store/wx9yy9mq1psqzqnmqnvrchgqgfhvaz7q-cabal-install-3.8.1.0"
48+
"store_path": "/nix/store/7275af4qndabxgw7nnzsz8g2xgigrs1b-cabal-install-3.10.3.0"
4949
}
5050
}
5151
},
52-
"ghc@9.4.8": {
53-
"last_modified": "2024-03-08T13:51:52Z",
52+
"ghc@9.6": {
53+
"last_modified": "2024-10-06T02:39:15Z",
5454
"plugin_version": "0.0.2",
55-
"resolved": "github:NixOS/nixpkgs/a343533bccc62400e8a9560423486a3b6c11a23b#ghc",
55+
"resolved": "github:NixOS/nixpkgs/7d49afd36b5590f023ec56809c02e05d8164fbc4#ghc",
5656
"source": "devbox-search",
57-
"version": "9.4.8",
57+
"version": "9.6.6",
5858
"systems": {
5959
"aarch64-darwin": {
6060
"outputs": [
6161
{
6262
"name": "out",
63-
"path": "/nix/store/ldgr8rqmkq941pwgi7zl80d3akil3va4-ghc-9.4.8",
63+
"path": "/nix/store/sfc83v75nfiz975cznwaswxvaz3dfdv2-ghc-9.6.6",
6464
"default": true
6565
},
6666
{
6767
"name": "doc",
68-
"path": "/nix/store/52c8i1i3xmnzygakwigam3npa8qkfdzw-ghc-9.4.8-doc"
68+
"path": "/nix/store/zjfzknvgab8jqvgji78a3s5s8c4a503f-ghc-9.6.6-doc"
6969
}
7070
],
71-
"store_path": "/nix/store/ldgr8rqmkq941pwgi7zl80d3akil3va4-ghc-9.4.8"
71+
"store_path": "/nix/store/sfc83v75nfiz975cznwaswxvaz3dfdv2-ghc-9.6.6"
7272
},
7373
"aarch64-linux": {
7474
"outputs": [
7575
{
7676
"name": "out",
77-
"path": "/nix/store/32y2ypndq67irn7ryhnsvabmcpypvnlx-ghc-9.4.8",
77+
"path": "/nix/store/b7j53r7dgl0iq47f5n7hv17iyz42yl96-ghc-9.6.6",
7878
"default": true
7979
},
8080
{
8181
"name": "doc",
82-
"path": "/nix/store/16d4chgy1ax686agmz7i46kxvml755z5-ghc-9.4.8-doc"
82+
"path": "/nix/store/lk6ybinvh9xqvnp5ml5812ncadnzpwpn-ghc-9.6.6-doc"
8383
}
8484
],
85-
"store_path": "/nix/store/32y2ypndq67irn7ryhnsvabmcpypvnlx-ghc-9.4.8"
85+
"store_path": "/nix/store/b7j53r7dgl0iq47f5n7hv17iyz42yl96-ghc-9.6.6"
8686
},
8787
"x86_64-darwin": {
8888
"outputs": [
8989
{
9090
"name": "out",
91-
"path": "/nix/store/j7lqyfkfbzkn1qna9mmfdz7m72n0s9r1-ghc-9.4.8",
91+
"path": "/nix/store/i3hw8rmihhjknhbmlcs3lyb2a1l73b3w-ghc-9.6.6",
9292
"default": true
9393
},
9494
{
9595
"name": "doc",
96-
"path": "/nix/store/mvb1r4mjw95z06pii94a10ly09fm1zpd-ghc-9.4.8-doc"
96+
"path": "/nix/store/pbxiq8jnkllp84alr6m063ffvy8xgw74-ghc-9.6.6-doc"
9797
}
9898
],
99-
"store_path": "/nix/store/j7lqyfkfbzkn1qna9mmfdz7m72n0s9r1-ghc-9.4.8"
99+
"store_path": "/nix/store/i3hw8rmihhjknhbmlcs3lyb2a1l73b3w-ghc-9.6.6"
100100
},
101101
"x86_64-linux": {
102102
"outputs": [
103103
{
104104
"name": "out",
105-
"path": "/nix/store/b29abywbk2yxl199nvf9b4b04fzqgzs0-ghc-9.4.8",
105+
"path": "/nix/store/f2hib3gih6fdvvnsyy5qs51adfz8j9d3-ghc-9.6.6",
106106
"default": true
107107
},
108108
{
109109
"name": "doc",
110-
"path": "/nix/store/011fj4igd8jd4wmhbn6rjfww91h908rz-ghc-9.4.8-doc"
110+
"path": "/nix/store/y18nmisn4xy9jymrwm9cg0pa1kijl9ii-ghc-9.6.6-doc"
111111
}
112112
],
113-
"store_path": "/nix/store/b29abywbk2yxl199nvf9b4b04fzqgzs0-ghc-9.4.8"
113+
"store_path": "/nix/store/f2hib3gih6fdvvnsyy5qs51adfz8j9d3-ghc-9.6.6"
114114
}
115115
}
116116
},

‎gren.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Common gren-common
196196
Build-depends:
197197
ansi-terminal >= 0.11 && < 0.12,
198198
ansi-wl-pprint >= 0.6.8 && < 0.7,
199-
base >= 4.17 && <5,
199+
base >= 4.18 && <5,
200200
binary >= 0.8 && < 0.9,
201201
bytestring >= 0.11 && < 0.12,
202202
containers >= 0.6 && < 0.7,

0 commit comments

Comments
 (0)