Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to GHC 9.10.1 #2991

Merged
merged 6 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ env:
CAIRO_VM_VERSION: 06e8ddbfa14eef85f56c4d7b7631c17c9b0a248e
RISC0_VM_VERSION: v1.0.1
JUST_ARGS: runtimeCcArg=$CC runtimeLibtoolArg=$LIBTOOL
STACK_BUILD_ARGS: --pedantic -j4 --ghc-options=-j
STACK_BUILD_ARGS: --pedantic -j4 --ghc-options=-j --stack-yaml=stack.yaml

jobs:
pre-commit:
Expand Down Expand Up @@ -77,6 +77,42 @@ jobs:
build-and-test-linux:
runs-on: ubuntu-22.04
steps:
- name: Free disk space
run: |
df -h
echo "/usr/local"
du -hsc /usr/local/*
sudo rm -rf \
/usr/local/aws-sam-cil \
/usr/local/julia* || :
echo "end /usr/local"
echo "/usr/local/lib"
du -hsc /usr/local/lib/*
sudo rm -rf \
/usr/local/lib/android \
/usr/local/lib/heroku \
/usr/local/lib/node_modules || :
echo "end /usr/local/lib"
echo "/usr/local/share"
du -hsc /usr/local/share/*
sudo rm -rf \
/usr/local/share/chromium \
/usr/local/share/powershell || :
echo "end /usr/local/share"
echo "/opt/hostedtoolcache/"
du -hsc /opt/hostedtoolcache/*
sudo rm -rf \
/opt/hostedtoolcache/CodeQL \
/opt/hostedtoolcache/go \
/opt/hostedtoolcache/PyPy \
/opt/hostedtoolcache/node || :
echo "end /opt/hostedtoolcache/*"
sudo apt purge -y \
firefox \
google-chrome-stable \
microsoft-edge-stable
df -h

- uses: extractions/setup-just@v2

- name: Checkout our repository
Expand Down
10 changes: 5 additions & 5 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ author:
Lukasz Czajka,
Github's contributors,
]
tested-with: ghc == 9.8.2
tested-with: ghc == 9.10.1
homepage: https://juvix.org
bug-reports: https://github.com/anoma/juvix/issues
description: The Juvix compiler
Expand Down Expand Up @@ -48,7 +48,7 @@ dependencies:
- aeson-better-errors == 0.9.*
- aeson == 2.2.*
- ansi-terminal == 1.1.*
- base == 4.19.*
- base == 4.20.*
- base16-bytestring == 1.0.*
- bitvec == 1.1.*
- blaze-html == 0.9.*
Expand All @@ -63,14 +63,14 @@ dependencies:
- edit-distance == 0.2.*
- effectful == 2.3.*
- effectful-core == 2.3.*
- effectful-th == 1.0.*
- effectful-th == 1.0.0.2
- exceptions == 0.10.*
- extra == 1.7.*
- file-embed == 0.0.*
- filelock == 0.1.*
- filepath == 1.4.*
- flatparse == 0.5.*
- ghc == 9.8.2
- ghc == 9.10.1
- githash == 0.1.*
- hashable == 1.4.*
- language-c == 0.9.*
Expand All @@ -95,7 +95,7 @@ dependencies:
- stm == 2.5.*
- Stream == 0.4.*
- string-interpolate == 0.3.*
- template-haskell == 2.21.*
- template-haskell == 2.22.*
- temporary == 1.3.*
- text == 2.1.*
- th-utilities == 0.2.*
Expand Down
1 change: 1 addition & 0 deletions src/Juvix/Data/Effect/Cache.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# OPTIONS_GHC -Wno-redundant-constraints #-}
{-# OPTIONS_GHC -Wno-unused-type-patterns #-}

module Juvix.Data.Effect.Cache
Expand Down
2 changes: 1 addition & 1 deletion src/Juvix/Prelude.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module Juvix.Prelude
where

import Juvix.Data
import Juvix.Prelude.Base
import Juvix.Prelude.Base hiding (List)
import Juvix.Prelude.Generic
import Juvix.Prelude.Lens
import Juvix.Prelude.Path
Expand Down
34 changes: 33 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,46 @@
ghc-options:
"$locals": -optP-Wno-nonportable-include-path
resolver: nightly-2024-05-31
compiler: ghc-9.10.1
compiler-check: match-exact
extra-deps:
- git: https://github.com/haskell-effectful/effectful.git
commit: 2037be9a4f4e8f8fd280d9359b1bc7feff9b29b9
commit: 2a8f0b3a0536c578ee1ff83311863a27e9d3e2e1
subdirs:
- effectful-th
- git: https://github.com/Vekhir/aeson-better-errors.git
commit: 1ec49ab7d1472046b680b5a64ae2930515b47714
- Cabal-syntax-3.10.3.0@sha256:c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe,7431
- directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166
- filepath-1.4.300.2@sha256:345cbb1afe414a09e47737e4d14cbd51891a734e67c0ef3d77a1439518bb81e8,5900
- haskeline-0.8.2.1@sha256:40096f75591b5391aa99c5ed87148da0e9288ca4be302dd9e5c4326f814089ba,6117
- process-1.6.21.0@sha256:685bc68759da31b5f152092fe664e1644e84f6dc0ae7a6c143e8564a1d6dafe8,2644
- unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808
- containers-0.6.8@sha256:bb2bec1bbc6b39a7c97cd95e056a5698ec45beb5d8feb6caae12af64e4bd823c,2670
- binary-0.8.9.2@sha256:03381e511429c44d13990c6d76281c4fc2468371cede4fe684b0c98d9b7d5f5a,6611
- parsec-3.1.17.0@sha256:8407cbd428d7f640a0fff8891bd2f7aca13cebe70a5e654856f8abec9a648b56,5149
- text-2.1.1@sha256:78c3fb91055d0607a80453327f087b9dc82168d41d0dca3ff410d21033b5e87d,10653
- th-abstraction-0.6.0.0@sha256:313760d630851a0eba6bdcb1a1eb543c4c9c583072d704067fa3248a5252a8ae,2303
- bytestring-0.12.1.0@sha256:98e79e1c97117143e4012983509ec95f7e5e4f6adff6914d07812a39f83404b9,9473
- exceptions-0.10.8@sha256:c31fd9b35d36196cbb14ffa5fca4de49868fd39acfeddd601fb77e742554aa67,2892
- template-haskell-2.22.0.0@sha256:463e87c76794859c861c95517329483282af8b079c02084755cc4bd1ae41d5ae,2151
- th-desugar-1.17
- polysemy-1.9.2.0
- singletons-th-3.4
- singletons-base-3.4
- lens-5.3.2
allow-newer: true
allow-newer-deps:
- aeson-better-errors
- effectful-th
- juvix
- cborg
- palette
- serialise
- string-interpolate
- tasty-hedgehog
- unicode-data
- unicode-transforms
- unliftio-core
- uuid-types
- versions
Loading