Skip to content

Commit 87adaf4

Browse files
lukaszczpaulcadman
andauthored
Update to GHC 9.10.1 (#2991)
Since GHC 9.8.2 has a bug which blocks our development (see #2977 (comment)), I made a PR to update to GHC 9.10.1. Because stackage doesn't yet support GHC 9.10.1, I had to add some explicit dependencies and use `allow-newer-deps` in `stack.yaml`. I think we should merge this not to get blocked by the bug, and later clean up `stack.yaml` when GHC 9.10.1 becomes supported on stackage. --------- Co-authored-by: Paul Cadman <[email protected]>
1 parent 9d95916 commit 87adaf4

File tree

5 files changed

+77
-8
lines changed

5 files changed

+77
-8
lines changed

.github/workflows/ci.yml

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929
CAIRO_VM_VERSION: 06e8ddbfa14eef85f56c4d7b7631c17c9b0a248e
3030
RISC0_VM_VERSION: v1.0.1
3131
JUST_ARGS: runtimeCcArg=$CC runtimeLibtoolArg=$LIBTOOL
32-
STACK_BUILD_ARGS: --pedantic -j4 --ghc-options=-j
32+
STACK_BUILD_ARGS: --pedantic -j4 --ghc-options=-j --stack-yaml=stack.yaml
3333

3434
jobs:
3535
pre-commit:
@@ -77,6 +77,42 @@ jobs:
7777
build-and-test-linux:
7878
runs-on: ubuntu-22.04
7979
steps:
80+
- name: Free disk space
81+
run: |
82+
df -h
83+
echo "/usr/local"
84+
du -hsc /usr/local/*
85+
sudo rm -rf \
86+
/usr/local/aws-sam-cil \
87+
/usr/local/julia* || :
88+
echo "end /usr/local"
89+
echo "/usr/local/lib"
90+
du -hsc /usr/local/lib/*
91+
sudo rm -rf \
92+
/usr/local/lib/android \
93+
/usr/local/lib/heroku \
94+
/usr/local/lib/node_modules || :
95+
echo "end /usr/local/lib"
96+
echo "/usr/local/share"
97+
du -hsc /usr/local/share/*
98+
sudo rm -rf \
99+
/usr/local/share/chromium \
100+
/usr/local/share/powershell || :
101+
echo "end /usr/local/share"
102+
echo "/opt/hostedtoolcache/"
103+
du -hsc /opt/hostedtoolcache/*
104+
sudo rm -rf \
105+
/opt/hostedtoolcache/CodeQL \
106+
/opt/hostedtoolcache/go \
107+
/opt/hostedtoolcache/PyPy \
108+
/opt/hostedtoolcache/node || :
109+
echo "end /opt/hostedtoolcache/*"
110+
sudo apt purge -y \
111+
firefox \
112+
google-chrome-stable \
113+
microsoft-edge-stable
114+
df -h
115+
80116
- uses: extractions/setup-just@v2
81117

82118
- name: Checkout our repository

package.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ author:
1212
Lukasz Czajka,
1313
Github's contributors,
1414
]
15-
tested-with: ghc == 9.8.2
15+
tested-with: ghc == 9.10.1
1616
homepage: https://juvix.org
1717
bug-reports: https://github.com/anoma/juvix/issues
1818
description: The Juvix compiler
@@ -48,7 +48,7 @@ dependencies:
4848
- aeson-better-errors == 0.9.*
4949
- aeson == 2.2.*
5050
- ansi-terminal == 1.1.*
51-
- base == 4.19.*
51+
- base == 4.20.*
5252
- base16-bytestring == 1.0.*
5353
- bitvec == 1.1.*
5454
- blaze-html == 0.9.*
@@ -63,14 +63,14 @@ dependencies:
6363
- edit-distance == 0.2.*
6464
- effectful == 2.3.*
6565
- effectful-core == 2.3.*
66-
- effectful-th == 1.0.*
66+
- effectful-th == 1.0.0.2
6767
- exceptions == 0.10.*
6868
- extra == 1.7.*
6969
- file-embed == 0.0.*
7070
- filelock == 0.1.*
7171
- filepath == 1.4.*
7272
- flatparse == 0.5.*
73-
- ghc == 9.8.2
73+
- ghc == 9.10.1
7474
- githash == 0.1.*
7575
- hashable == 1.4.*
7676
- language-c == 0.9.*
@@ -95,7 +95,7 @@ dependencies:
9595
- stm == 2.5.*
9696
- Stream == 0.4.*
9797
- string-interpolate == 0.3.*
98-
- template-haskell == 2.21.*
98+
- template-haskell == 2.22.*
9999
- temporary == 1.3.*
100100
- text == 2.1.*
101101
- th-utilities == 0.2.*

src/Juvix/Data/Effect/Cache.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# OPTIONS_GHC -Wno-redundant-constraints #-}
12
{-# OPTIONS_GHC -Wno-unused-type-patterns #-}
23

34
module Juvix.Data.Effect.Cache

src/Juvix/Prelude.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module Juvix.Prelude
1111
where
1212

1313
import Juvix.Data
14-
import Juvix.Prelude.Base
14+
import Juvix.Prelude.Base hiding (List)
1515
import Juvix.Prelude.Generic
1616
import Juvix.Prelude.Lens
1717
import Juvix.Prelude.Path

stack.yaml

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,46 @@
11
ghc-options:
22
"$locals": -optP-Wno-nonportable-include-path
33
resolver: nightly-2024-05-31
4+
compiler: ghc-9.10.1
5+
compiler-check: match-exact
46
extra-deps:
57
- git: https://github.com/haskell-effectful/effectful.git
6-
commit: 2037be9a4f4e8f8fd280d9359b1bc7feff9b29b9
8+
commit: 2a8f0b3a0536c578ee1ff83311863a27e9d3e2e1
79
subdirs:
810
- effectful-th
911
- git: https://github.com/Vekhir/aeson-better-errors.git
1012
commit: 1ec49ab7d1472046b680b5a64ae2930515b47714
13+
- Cabal-syntax-3.10.3.0@sha256:c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe,7431
14+
- directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166
15+
- filepath-1.4.300.2@sha256:345cbb1afe414a09e47737e4d14cbd51891a734e67c0ef3d77a1439518bb81e8,5900
16+
- haskeline-0.8.2.1@sha256:40096f75591b5391aa99c5ed87148da0e9288ca4be302dd9e5c4326f814089ba,6117
17+
- process-1.6.21.0@sha256:685bc68759da31b5f152092fe664e1644e84f6dc0ae7a6c143e8564a1d6dafe8,2644
18+
- unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808
19+
- containers-0.6.8@sha256:bb2bec1bbc6b39a7c97cd95e056a5698ec45beb5d8feb6caae12af64e4bd823c,2670
20+
- binary-0.8.9.2@sha256:03381e511429c44d13990c6d76281c4fc2468371cede4fe684b0c98d9b7d5f5a,6611
21+
- parsec-3.1.17.0@sha256:8407cbd428d7f640a0fff8891bd2f7aca13cebe70a5e654856f8abec9a648b56,5149
22+
- text-2.1.1@sha256:78c3fb91055d0607a80453327f087b9dc82168d41d0dca3ff410d21033b5e87d,10653
23+
- th-abstraction-0.6.0.0@sha256:313760d630851a0eba6bdcb1a1eb543c4c9c583072d704067fa3248a5252a8ae,2303
24+
- bytestring-0.12.1.0@sha256:98e79e1c97117143e4012983509ec95f7e5e4f6adff6914d07812a39f83404b9,9473
25+
- exceptions-0.10.8@sha256:c31fd9b35d36196cbb14ffa5fca4de49868fd39acfeddd601fb77e742554aa67,2892
26+
- template-haskell-2.22.0.0@sha256:463e87c76794859c861c95517329483282af8b079c02084755cc4bd1ae41d5ae,2151
27+
- th-desugar-1.17
28+
- polysemy-1.9.2.0
29+
- singletons-th-3.4
30+
- singletons-base-3.4
31+
- lens-5.3.2
1132
allow-newer: true
1233
allow-newer-deps:
1334
- aeson-better-errors
1435
- effectful-th
36+
- juvix
37+
- cborg
38+
- palette
39+
- serialise
40+
- string-interpolate
41+
- tasty-hedgehog
42+
- unicode-data
43+
- unicode-transforms
44+
- unliftio-core
45+
- uuid-types
46+
- versions

0 commit comments

Comments
 (0)