Merge pull request #1102 from GaloisInc/ghc-9.6

Support building with GHC 9.6
GaloisInc · Aug 3, 2023 · bc64fda · bc64fda
2 parents 24b84ed + 64e0a39
commit bc64fda
Show file tree

Hide file tree

Showing 58 changed files with 353 additions and 281 deletions.
diff --git a/.github/Dockerfile-crux-llvm b/.github/Dockerfile-crux-llvm
@@ -26,9 +26,9 @@ RUN mkdir -p /root/ghcup-download/bin && \
     chmod +x /root/ghcup-download/bin/ghcup
 RUN mkdir -p /root/.ghcup && \
     ghcup --version && \
-    ghcup install cabal 3.6.2.0 && \
-    ghcup install ghc 8.8.4 && \
-    ghcup set ghc 8.8.4
+    ghcup install cabal 3.10.1.0 && \
+    ghcup install ghc 9.2.8 && \
+    ghcup set ghc 9.2.8
 RUN cabal v2-update
 
 ARG DIR=/crux-llvm
@@ -41,7 +41,7 @@ ADD crux ${DIR}/build/crux
 ADD crux-llvm ${DIR}/build/crux-llvm
 ADD dependencies ${DIR}/build/dependencies
 ADD .github/cabal.project.crux-llvm ${DIR}/build/cabal.project
-ADD cabal.GHC-8.8.4.config ${DIR}/build/cabal.project.freeze
+ADD cabal.GHC-9.2.8.config ${DIR}/build/cabal.project.freeze
 # Workaround until we have an LLVM 12 build available
 RUN cp $DIR/build/crux-llvm/c-src/libcxx-7.1.0.bc $DIR/build/crux-llvm/c-src/libcxx-12.0.1.bc
 

diff --git a/.github/Dockerfile-crux-mir b/.github/Dockerfile-crux-mir
@@ -42,9 +42,9 @@ RUN mkdir -p /root/ghcup-download/bin && \
     chmod +x /root/ghcup-download/bin/ghcup
 RUN mkdir -p /root/.ghcup && \
     ghcup --version && \
-    ghcup install cabal 3.6.2.0 && \
-    ghcup install ghc 8.8.4 && \
-    ghcup set ghc 8.8.4
+    ghcup install cabal 3.10.1.0 && \
+    ghcup install ghc 9.2.8 && \
+    ghcup set ghc 9.2.8
 RUN cabal v2-update
 
 ARG DIR=/crux-mir
@@ -57,7 +57,7 @@ ADD crux ${DIR}/build/crux
 ADD crux-mir ${DIR}/build/crux-mir
 ADD dependencies ${DIR}/build/dependencies
 ADD .github/cabal.project.crux-mir ${DIR}/build/cabal.project
-ADD cabal.GHC-8.8.4.config ${DIR}/build/cabal.project.freeze
+ADD cabal.GHC-9.2.8.config ${DIR}/build/cabal.project.freeze
 
 WORKDIR ${DIR}/build
 RUN cabal v2-build --only-dependencies crux-mir

diff --git a/.github/workflows/crucible-go-build.yml b/.github/workflows/crucible-go-build.yml
@@ -27,15 +27,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        cabal: ["3.8.1.0"]
-        ghc: ["8.10.7", "9.2.7", "9.4.4"]
+        cabal: ["3.10.1.0"]
+        ghc: ["9.2.8", "9.4.5", "9.6.2"]
         include:
           - os: macos-12
-            cabal: 3.8.1.0
-            ghc: 9.4.4
+            cabal: 3.10.1.0
+            ghc: 9.6.2
           - os: windows-2019
-            cabal: 3.8.1.0
-            ghc: 9.4.4
+            cabal: 3.10.1.0
+            ghc: 9.6.2
     name: crucible-go - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -86,8 +86,9 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
-            9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.2.8) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
+            9.4.5) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
+            9.6.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
             *)     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

diff --git a/.github/workflows/crucible-jvm-build.yml b/.github/workflows/crucible-jvm-build.yml
@@ -27,15 +27,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        cabal: ["3.8.1.0"]
-        ghc: ["8.10.7", "9.2.7", "9.4.4"]
+        cabal: ["3.10.1.0"]
+        ghc: ["9.2.8", "9.4.5", "9.6.2"]
         include:
           - os: macos-12
-            cabal: 3.8.1.0
-            ghc: 9.4.4
+            cabal: 3.10.1.0
+            ghc: 9.6.2
           - os: windows-2019
-            cabal: 3.8.1.0
-            ghc: 9.4.4
+            cabal: 3.10.1.0
+            ghc: 9.6.2
     name: crucible-jvm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -86,8 +86,9 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
-            9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.2.8) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
+            9.4.5) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
+            9.6.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
             *)     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

diff --git a/.github/workflows/crucible-wasm-build.yml b/.github/workflows/crucible-wasm-build.yml
@@ -27,15 +27,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        cabal: ["3.8.1.0"]
-        ghc: ["8.10.7", "9.2.7", "9.4.4"]
+        cabal: ["3.10.1.0"]
+        ghc: ["9.2.8", "9.4.5", "9.6.2"]
         include:
           - os: macos-12
-            cabal: 3.8.1.0
-            ghc: 9.4.4
+            cabal: 3.10.1.0
+            ghc: 9.6.2
           - os: windows-2019
-            cabal: 3.8.1.0
-            ghc: 9.4.4
+            cabal: 3.10.1.0
+            ghc: 9.6.2
     name: crucible-wasm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -86,8 +86,9 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
-            9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.2.8) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
+            9.4.5) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
+            9.6.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
             *)     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

diff --git a/.github/workflows/crux-llvm-build.yml b/.github/workflows/crux-llvm-build.yml
@@ -64,21 +64,21 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        cabal: ["3.8.1.0"]
-        ghc: ["8.10.7", "9.2.7", "9.4.4"]
+        cabal: ["3.10.1.0"]
+        ghc: ["9.2.8", "9.4.5", "9.6.2"]
         include:
           - os: ubuntu-22.04
-            cabal: 3.8.1.0
-            ghc: 8.8.4
+            cabal: 3.10.1.0
+            ghc: 8.10.7
           - os: ubuntu-20.04
-            cabal: 3.8.1.0
-            ghc: 9.4.4
+            cabal: 3.10.1.0
+            ghc: 9.6.2
           - os: macos-12
-            cabal: 3.8.1.0
-            ghc: 9.2.7
+            cabal: 3.10.1.0
+            ghc: 9.2.8
           - os: windows-2019
-            cabal: 3.8.1.0
-            ghc: 9.2.7
+            cabal: 3.10.1.0
+            ghc: 9.2.8
     name: crux-llvm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -129,8 +129,9 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
-            9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.2.8) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
+            9.4.5) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
+            9.6.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
             *)     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

diff --git a/.github/workflows/crux-mir-build.yml b/.github/workflows/crux-mir-build.yml
@@ -64,12 +64,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        cabal: ["3.8.1.0"]
-        ghc: ["8.10.7", "9.2.7", "9.4.4"]
+        cabal: ["3.10.1.0"]
+        ghc: ["9.2.8", "9.4.5", "9.6.2"]
         include:
           - os: macos-12
-            cabal: 3.8.1.0
-            ghc: 9.2.7
+            cabal: 3.10.1.0
+            ghc: 9.2.8
 
           # We want Windows soon, but it doesn't need to be now
     name: crux-mir - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
@@ -129,8 +129,9 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
-            9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
+            9.2.8) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
+            9.4.5) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
+            9.6.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
             *)     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