Adaptations for gHC 9.8.

diku-dk · Nov 23, 2023 · 0413a79 · 0413a79
1 parent a45c12e
commit 0413a79
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -41,7 +41,7 @@ jobs:
 
     - uses: haskell-actions/setup@v2
       with:
-        ghc-version: '9.4.4'
+        ghc-version: '9.8.1'
 
     - uses: actions/cache@v3
       name: Cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle
@@ -68,9 +68,9 @@ jobs:
 
     - name: Install dependencies
       run: |
-        brew install cabal-install ghc@9.4 sphinx-doc
+        brew install cabal-install ghc sphinx-doc
         echo "/usr/local/opt/sphinx-doc/bin" >> $GITHUB_PATH
-        echo "/usr/local/opt/ghc@9/bin" >> $GITHUB_PATH
+        echo "/usr/local/opt/ghc/bin" >> $GITHUB_PATH
 
     - uses: actions/cache@v3
       name: Cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle

diff --git a/futhark.cabal b/futhark.cabal
@@ -100,7 +100,7 @@ source-repository head
   location: https://github.com/diku-dk/futhark
 
 common common
-  ghc-options: -Wall -Wcompat -Wno-incomplete-uni-patterns -Wredundant-constraints -Wincomplete-record-updates -Wmissing-export-lists -Wunused-packages
+  ghc-options: -Wall -Wcompat -Wno-incomplete-uni-patterns -Wno-x-partial -Wno-unrecognised-warning-flags  -Wredundant-constraints -Wincomplete-record-updates -Wmissing-export-lists -Wunused-packages
   default-language: Haskell2010
   default-extensions:
     OverloadedStrings

diff --git a/src/Futhark/CLI/Literate.hs b/src/Futhark/CLI/Literate.hs
@@ -10,7 +10,7 @@ import Data.Bits
 import Data.ByteString qualified as BS
 import Data.ByteString.Lazy qualified as LBS
 import Data.Char
-import Data.Functor
+import Data.Functor (($>))
 import Data.Int (Int64)
 import Data.List (foldl', transpose)
 import Data.Map qualified as M