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.

Sign up for GitHub

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

Support building with GHC 9.4 #1073

Merged
merged 5 commits into from
Apr 3, 2023
Merged

Support building with GHC 9.4 #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89a3562
Support building with GHC 9.4
RyanGlScott Mar 20, 2023
28dfa8d
Remove uses of NoMonoLocalBinds after GADTs/TypeFamilies pragmas
RyanGlScott Mar 20, 2023
93aa885
Fix -Wtype-equality-requires-operators warnings
RyanGlScott Mar 20, 2023
e10dfea
Regenerate cabal.GHC-*.config files
RyanGlScott Mar 28, 2023
fc48952
CI: Test GHC 9.4.4 and 9.2.7, drop 9.0.2
RyanGlScott Mar 28, 2023
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
14 changes: 9 additions & 5 deletions .github/workflows/crucible-go-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
ghc: ["8.10.7", "9.0.2", "9.2.4"]
cabal: ["3.8.1.0"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
include:
- os: macos-12
ghc: 9.2.4
cabal: 3.8.1.0
ghc: 9.4.4
- os: windows-2019
ghc: 9.2.4
cabal: 3.8.1.0
ghc: 9.4.4
name: crucible-go - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -43,6 +46,7 @@ jobs:
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- name: Post-GHC installation fixups on Windows
shell: bash
Expand Down Expand Up @@ -82,8 +86,8 @@ jobs:
run: |
GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
case ${{ matrix.ghc }} in
9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
9.2.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
*) GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
esac
echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/crucible-jvm-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
ghc: ["8.10.7", "9.0.2", "9.2.4"]
cabal: ["3.8.1.0"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
include:
- os: macos-12
ghc: 9.2.4
cabal: 3.8.1.0
ghc: 9.4.4
- os: windows-2019
ghc: 9.2.4
cabal: 3.8.1.0
ghc: 9.4.4
name: crucible-jvm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -43,6 +46,7 @@ jobs:
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- name: Post-GHC installation fixups on Windows
shell: bash
Expand Down Expand Up @@ -82,8 +86,8 @@ jobs:
run: |
GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
case ${{ matrix.ghc }} in
9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
9.2.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
*) GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
esac
echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/crucible-wasm-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
ghc: ["8.10.7", "9.0.2", "9.2.4"]
cabal: ["3.8.1.0"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
include:
- os: macos-12
ghc: 9.2.4
cabal: 3.8.1.0
ghc: 9.4.4
- os: windows-2019
ghc: 9.2.4
cabal: 3.8.1.0
ghc: 9.4.4
name: crucible-wasm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -43,6 +46,7 @@ jobs:
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- name: Post-GHC installation fixups on Windows
shell: bash
Expand Down Expand Up @@ -82,8 +86,8 @@ jobs:
run: |
GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
case ${{ matrix.ghc }} in
9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
9.2.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
*) GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
esac
echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/crux-llvm-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,21 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
ghc: ["8.10.7", "9.0.2", "9.2.4"]
cabal: ["3.8.1.0"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
include:
- os: ubuntu-22.04
cabal: 3.8.1.0
ghc: 8.8.4
- os: ubuntu-20.04
ghc: 9.2.4
cabal: 3.8.1.0
ghc: 9.4.4
- os: macos-12
ghc: 9.2.4
cabal: 3.8.1.0
ghc: 9.2.7
- os: windows-2019
ghc: 9.2.4
cabal: 3.8.1.0
ghc: 9.2.7
name: crux-llvm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -64,6 +69,7 @@ jobs:
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- name: Post-GHC installation fixups on Windows
shell: bash
Expand Down Expand Up @@ -103,9 +109,8 @@ jobs:
run: |
GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
case ${{ matrix.ghc }} in
9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
9.2.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
9.2.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
*) GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
esac
echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/crux-mir-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
ghc: ["8.10.7", "9.0.2", "9.2.4"]
cabal: ["3.8.1.0"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
# include:
# Disable the macOS build for now due to
# https://github.com/GaloisInc/crucible/issues/1050
#
# - os: macos-12
# cabal: 3.8.1.0
# ghc: 9.2.4

# We want Windows soon, but it doesn't need to be now
Expand All @@ -62,6 +64,7 @@ jobs:
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- name: Post-GHC installation fixups on Windows
shell: bash
Expand Down Expand Up @@ -108,8 +111,8 @@ jobs:
run: |
GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
case ${{ matrix.ghc }} in
9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-22.05 ;;
9.2.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
*) GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
esac
echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV
Expand Down
32 changes: 17 additions & 15 deletions cabal.GHC-8.10.7.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ constraints: any.BoundedChan ==1.0.3.0,
GraphSCC -use-maps,
any.HUnit ==1.6.2.0,
any.IntervalMap ==0.6.2.0,
any.OneTuple ==0.3.1,
any.OneTuple ==0.4.1.1,
any.QuickCheck ==2.14.2,
QuickCheck -old-random +templatehaskell,
any.SHA ==1.6.4.4,
SHA -exe,
any.StateVar ==1.2.2,
any.adjunctions ==4.4.2,
any.aeson ==2.0.3.0,
any.aeson ==2.1.2.1,
aeson -cffi +ordered-keymap,
any.aeson-typescript ==0.5.0.0,
any.alex ==3.2.7.1,
Expand All @@ -23,7 +23,8 @@ constraints: any.BoundedChan ==1.0.3.0,
any.ansi-wl-pprint ==0.6.9,
ansi-wl-pprint -example,
any.array ==0.5.4.0,
any.assoc ==1.0.2,
any.assoc ==1.1,
assoc +tagged,
any.async ==2.2.4,
async -bench,
any.atomic-primops ==0.8.4,
Expand All @@ -32,13 +33,13 @@ constraints: any.BoundedChan ==1.0.3.0,
attoparsec -developer,
any.barbies ==2.0.4.0,
any.base ==4.14.3.0,
any.base-compat ==0.12.2,
any.base-compat-batteries ==0.12.2,
any.base-compat ==0.13.0,
any.base-compat-batteries ==0.13.0,
any.base-orphans ==0.8.8.2,
any.base16-bytestring ==1.0.2.0,
any.base64-bytestring ==1.2.1.0,
any.bifunctors ==5.5.15,
bifunctors +semigroups +tagged,
any.bifunctors ==5.6.1,
bifunctors +tagged,
any.bimap ==0.5.0,
any.binary ==0.8.8.0,
any.bitvec ==1.1.4.0,
Expand Down Expand Up @@ -98,13 +99,16 @@ constraints: any.BoundedChan ==1.0.3.0,
any.filemanip ==0.3.6.3,
any.filepath ==1.4.2.1,
any.fingertree ==0.1.5.0,
any.foldable1-classes-compat ==0.1,
foldable1-classes-compat +tagged,
any.free ==5.2,
any.generic-deriving ==1.14.3,
generic-deriving +base-4-9,
any.generic-lens ==2.2.1.0,
any.generic-lens-core ==2.2.1.0,
any.generic-random ==1.5.0.1,
generic-random -enable-inspect,
any.generically ==0.1.1,
any.ghc-boot-th ==8.10.7,
any.ghc-prim ==0.6.1,
any.githash ==0.1.6.3,
Expand All @@ -118,7 +122,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.haskell-lexer ==1.1.1,
any.haskell-src-exts ==1.23.1,
any.haskell-src-meta ==0.8.12,
any.hedgehog ==1.1.1,
any.hedgehog ==1.2,
any.hsc2hs ==0.68.9,
hsc2hs -in-ghc-tree,
any.hspec ==2.10.10,
Expand Down Expand Up @@ -152,7 +156,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.logict ==0.8.0.0,
any.lucid ==2.11.1,
any.lumberjack ==1.0.2.0,
any.megaparsec ==9.0.1,
any.megaparsec ==9.2.1,
megaparsec -dev,
any.microlens ==0.4.13.1,
any.microlens-th ==0.4.3.12,
Expand Down Expand Up @@ -202,7 +206,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.scheduler ==2.0.0.1,
any.scientific ==0.3.7.0,
scientific -bytestring-builder -integer-simple,
any.semialign ==1.2.0.1,
any.semialign ==1.3,
semialign +semigroupoids,
any.semigroupoids ==5.3.7,
semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
Expand All @@ -217,8 +221,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.stm ==2.5.0.1,
any.streaming-commons ==0.2.2.6,
streaming-commons -use-bytestring-builder,
any.strict ==0.4.0.1,
strict +assoc,
any.strict ==0.5,
any.string-interpolate ==0.3.2.0,
string-interpolate -bytestring-builder -extended-benchmarks -text-builder,
any.syb ==0.7.2.3,
Expand All @@ -231,7 +234,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.tasty-expected-failure ==0.12.3,
any.tasty-golden ==2.3.5,
tasty-golden -build-example,
any.tasty-hedgehog ==1.2.0.0,
any.tasty-hedgehog ==1.4.0.1,
any.tasty-hspec ==1.2.0.3,
any.tasty-hunit ==0.10.0.3,
any.tasty-quickcheck ==0.10.2,
Expand All @@ -253,8 +256,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.th-lift-instances ==0.1.20,
any.th-orphans ==0.13.14,
any.th-reify-many ==0.1.10,
any.these ==1.1.1.1,
these +assoc,
any.these ==1.2,
any.time ==1.9.3,
any.time-compat ==1.9.6.1,
time-compat -old-locale,
Expand Down
Loading