From e8377ce32ff2f699156c04527233ce1ab1737caf Mon Sep 17 00:00:00 2001 From: Due Date: Mon, 3 Jun 2024 18:05:16 +0200 Subject: [PATCH] Newer version. --- .github/workflows/main.yml | 12 ++++++------ shell.nix | 2 +- src/Alpacc/LL.hs | 1 + src/Alpacc/LLP.hs | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d057d2d..74a7e96 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,12 +15,12 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up GHC 9.4.8 + - name: Set up GHC 9.6.5 uses: haskell/actions/setup@v2 id: setup with: - ghc-version: '9.4.8' - cabal-version: '3.10.2.1' + ghc-version: '9.6.5' + cabal-version: '3.10.3.0' cabal-update: true - name: Installed versions of GHC and Cabal @@ -52,12 +52,12 @@ jobs: with: version: 'nightly' - - name: Set up GHC 9.4.8 + - name: Set up GHC 9.6.5 uses: haskell/actions/setup@v2 id: setup with: - ghc-version: '9.4.8' - cabal-version: '3.10.2.1' + ghc-version: '9.6.5' + cabal-version: '3.10.3.0' cabal-update: true - name: Installed versions of GHC and Cabal diff --git a/shell.nix b/shell.nix index c353de1..ae47c67 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,7 @@ let pkgs = import { config.allowUnfree = true; }; unstable = import { }; - compilerVersion = "ghc94"; + compilerVersion = "ghc96"; compiler = pkgs.haskell.packages."${compilerVersion}"; in let pkg = diff --git a/src/Alpacc/LL.hs b/src/Alpacc/LL.hs index 7e855d6..f3972e1 100644 --- a/src/Alpacc/LL.hs +++ b/src/Alpacc/LL.hs @@ -29,6 +29,7 @@ module Alpacc.LL ) where +import Control.Monad (foldM, zipWithM) import Control.Monad.State hiding (state) import qualified Data.List as List import Data.Map (Map) diff --git a/src/Alpacc/LLP.hs b/src/Alpacc/LLP.hs index 0df1a24..13b7d39 100644 --- a/src/Alpacc/LLP.hs +++ b/src/Alpacc/LLP.hs @@ -13,6 +13,7 @@ module Alpacc.LLP ) where +import Control.Monad (foldM, join) import Control.DeepSeq import Control.Monad.State import Data.Bifunctor qualified as BI