Skip to content

Commit 919e8ec

Browse files
committed
cabal: stopping GHC 8.4 support
#885
1 parent d8898ea commit 919e8ec

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.github/workflows/Cabal-Linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
strategy:
2020
matrix:
21-
ghc: [ "8.10", "8.4" ]
21+
ghc: [ "8.10", "8.6" ]
2222
steps:
2323

2424
- name: "Git checkout"

.github/workflows/On-Release-Cabal-Linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
# Since CI by default tests boundary GHCs, test middle versions of GHCs
19-
ghc: [ "8.8", "8.6"]
19+
ghc: [ "8.8" ]
2020
steps:
2121
- name: "Git checkout"
2222
uses: actions/checkout@v2

hnix.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ library
397397
build-depends:
398398
aeson >= 1.4.2 && < 1.6
399399
, array >= 0.4 && < 0.6
400-
, base >= 4.11 && < 5
400+
, base >= 4.12 && < 5
401401
, binary >= 0.8.5 && < 0.9
402402
, bytestring >= 0.10.8 && < 0.11
403403
, comonad >= 5.0.4 && < 5.1

src/Nix/Reduce.hs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@ import Control.Monad.Fail
4040
import Control.Monad.Fix
4141
import Control.Monad.IO.Class
4242
import Control.Monad.Reader
43-
import Control.Monad.State.Strict
43+
import Control.Monad.State.Strict ( MonadState
44+
, StateT
45+
, gets
46+
, modify
47+
, evalStateT
48+
)
4449
import Data.Bifunctor ( first )
4550
import Data.Fix ( Fix(..), foldFix, foldFixM )
4651
import Data.HashMap.Lazy ( HashMap )

0 commit comments

Comments
 (0)