Skip to content

Commit 901b67a

Browse files
committed
Revert cabal
1 parent f6b5c92 commit 901b67a

File tree

3 files changed

+18
-27
lines changed

3 files changed

+18
-27
lines changed

.github/workflows/build.yml

+5-14
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
ghc: "9.6.6"
11-
cabal: "3.10.3.0"
11+
cabal: "3.8.1.0"
1212

1313
jobs:
1414
validate-code-formatting:
@@ -70,14 +70,8 @@ jobs:
7070
- name: Cache cabal store
7171
uses: actions/cache@v4
7272
with:
73-
path: ~/.local
74-
key: state-linux-${{ env.ghc }}-${{ hashFiles('cabal.project.freeze') }}
75-
76-
- name: Cache cabal cache
77-
uses: actions/cache@v4
78-
with:
79-
path: ~/.cache
80-
key: cache-linux-${{ env.ghc }}-${{ hashFiles('cabal.project.freeze') }}
73+
path: ~/.cabal/store
74+
key: cabal-linux-${{ env.ghc }}-${{ hashFiles('cabal.project.freeze') }}
8175

8276
- name: Cache build artifacts
8377
uses: actions/cache@v4
@@ -126,9 +120,6 @@ jobs:
126120
with:
127121
enable-cache: true
128122

129-
- name: Make sure cabal dir exists
130-
run: mkdir -p ~/.cabal
131-
132123
- name: Update cabal registry
133124
run: devbox run -- cabal update
134125

@@ -140,8 +131,8 @@ jobs:
140131
- name: Cache cabal cache
141132
uses: actions/cache@v4
142133
with:
143-
path: ~/.cabal
144-
key: cache-${{ matrix.os }}-${{ hashFiles('devbox.lock', 'cabal.project.freeze') }}
134+
path: ~/.cabal/store
135+
key: cabal-${{ matrix.os }}-${{ hashFiles('devbox.lock', 'cabal.project.freeze') }}
145136

146137
- name: Cache build artifacts
147138
uses: actions/cache@v4

devbox.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"nodejs@20",
55
"ormolu@0.7",
66
"ghc@9.6",
7-
"cabal-install@3.10"
7+
"cabal-install@3.8"
88
],
99
"shell": {
1010
"init_hook": [

devbox.lock

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
{
22
"lockfile_version": "1",
33
"packages": {
4-
"cabal-install@3.10": {
5-
"last_modified": "2024-07-31T08:48:38Z",
6-
"resolved": "github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce#cabal-install",
4+
"cabal-install@3.8": {
5+
"last_modified": "2023-03-28T10:29:13Z",
6+
"resolved": "github:NixOS/nixpkgs/98f3b08f58ff125ef02d55cd52a83f44f245f2ea#cabal-install",
77
"source": "devbox-search",
8-
"version": "3.10.3.0",
8+
"version": "3.8.1.0",
99
"systems": {
1010
"aarch64-darwin": {
1111
"outputs": [
1212
{
1313
"name": "out",
14-
"path": "/nix/store/dd543dbn0mhj7674q1xja84xcw00791w-cabal-install-3.10.3.0",
14+
"path": "/nix/store/060dvanq07yffbjqqard255g3rf80npk-cabal-install-3.8.1.0",
1515
"default": true
1616
}
1717
],
18-
"store_path": "/nix/store/dd543dbn0mhj7674q1xja84xcw00791w-cabal-install-3.10.3.0"
18+
"store_path": "/nix/store/060dvanq07yffbjqqard255g3rf80npk-cabal-install-3.8.1.0"
1919
},
2020
"aarch64-linux": {
2121
"outputs": [
2222
{
2323
"name": "out",
24-
"path": "/nix/store/i4j48x90xwygm4vvjgy6gal50lnpm1yl-cabal-install-3.10.3.0",
24+
"path": "/nix/store/8wkk6h4bd8sdwnllp2dfhrra2sjss6a5-cabal-install-3.8.1.0",
2525
"default": true
2626
}
2727
],
28-
"store_path": "/nix/store/i4j48x90xwygm4vvjgy6gal50lnpm1yl-cabal-install-3.10.3.0"
28+
"store_path": "/nix/store/8wkk6h4bd8sdwnllp2dfhrra2sjss6a5-cabal-install-3.8.1.0"
2929
},
3030
"x86_64-darwin": {
3131
"outputs": [
3232
{
3333
"name": "out",
34-
"path": "/nix/store/3jgzbgacsjlvs7y4xgqxwdk8p62f22vq-cabal-install-3.10.3.0",
34+
"path": "/nix/store/2r5gydfgs3lg3f928q0ch11x2kwz2nj5-cabal-install-3.8.1.0",
3535
"default": true
3636
}
3737
],
38-
"store_path": "/nix/store/3jgzbgacsjlvs7y4xgqxwdk8p62f22vq-cabal-install-3.10.3.0"
38+
"store_path": "/nix/store/2r5gydfgs3lg3f928q0ch11x2kwz2nj5-cabal-install-3.8.1.0"
3939
},
4040
"x86_64-linux": {
4141
"outputs": [
4242
{
4343
"name": "out",
44-
"path": "/nix/store/7275af4qndabxgw7nnzsz8g2xgigrs1b-cabal-install-3.10.3.0",
44+
"path": "/nix/store/wx9yy9mq1psqzqnmqnvrchgqgfhvaz7q-cabal-install-3.8.1.0",
4545
"default": true
4646
}
4747
],
48-
"store_path": "/nix/store/7275af4qndabxgw7nnzsz8g2xgigrs1b-cabal-install-3.10.3.0"
48+
"store_path": "/nix/store/wx9yy9mq1psqzqnmqnvrchgqgfhvaz7q-cabal-install-3.8.1.0"
4949
}
5050
}
5151
},

0 commit comments

Comments
 (0)