Skip to content

Commit 7ba1dda

Browse files
authored
Merge pull request #6031 from cabalism/bump/cabal-for-lts-20.0
Bump the cabal project to match lts-20.0 in stack.yaml.
2 parents a676142 + 4f36c63 commit 7ba1dda

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

cabal.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
constraints:
2-
, Cabal ==3.6.3.0
3-
, Cabal-syntax ==3.6.0.0
2+
, Cabal ==3.8.1.0
3+
, Cabal-syntax ==3.8.1.0
44
, Glob ==0.10.2
55
, OneTuple ==0.3.1
66
, QuickCheck ==2.14.2
77
, StateVar ==1.2.2
8-
, Win32 ==2.12.0.1
98
, aeson ==2.0.3.0
109
, annotated-wl-pprint ==0.7.0
1110
, ansi-terminal ==0.11.3
@@ -77,6 +76,7 @@ constraints:
7776
, hackage-security ==0.6.2.2
7877
, hashable ==1.4.1.0
7978
, hi-file-parser ==0.1.3.0
79+
, hinotify ==0.4.1
8080
, hourglass ==0.2.12
8181
, hpack ==0.35.1
8282
, hpc ==0.6.1.0

cabal.project

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
--
1414
-- > stack ls dependencies cabal > cabal.config
1515
--
16+
-- From the resolver in `stack.yaml` be sure to set `with-compiler: ghc-x.y.z`.
17+
-- This can be checked in the cabal.config from stackage that matches the
18+
-- resolver, such as:
19+
-- https://www.stackage.org/lts-20.0/cabal.config
20+
--
1621
-- However, be aware that, in respect of the `unix` package or the `Win32`
1722
-- package (that may come with GHC, depending on the operating system):
1823
--
@@ -26,5 +31,6 @@
2631
-- the other. A comprehensive `cabal.config` will need to be created by editing
2732
-- the command's output.
2833

34+
with-compiler: ghc-9.2.5
2935
import: cabal.config
3036
packages: .

0 commit comments

Comments
 (0)