Skip to content

Commit bcfdbe3

Browse files
committed
Revisit lower bounds in package.yaml, on move to GHC 9.2.4
Also sorts dependencies in alphabetical order, to assist discovery.
1 parent e9942f7 commit bcfdbe3

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

package.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ github: commercialhaskell/stack
2222
homepage: http://haskellstack.org
2323
custom-setup:
2424
dependencies:
25-
- base >=4.13 && < 5
25+
- base >= 4.16.3.0 && < 5
2626
- Cabal
2727
- filepath
2828
extra-source-files:
@@ -48,16 +48,18 @@ ghc-options:
4848
- -fwarn-incomplete-record-updates
4949
- -optP-Wno-nonportable-include-path # workaround [Filename case on macOS · Issue #4739 · haskell/cabal](https://github.com/haskell/cabal/issues/4739)
5050
dependencies:
51-
- Cabal
52-
- aeson
51+
- base >= 4.16.3.0 && < 5
52+
- Cabal >= 3.6.3.0
53+
- aeson >= 2.0.3.0
5354
- annotated-wl-pprint
5455
- ansi-terminal
5556
- array
5657
- async
5758
- attoparsec
58-
- base >=4.10 && < 5
5959
- base64-bytestring
6060
- bytestring
61+
- casa-client
62+
- casa-types
6163
- colour
6264
- conduit
6365
- conduit-extra
@@ -93,24 +95,22 @@ dependencies:
9395
- neat-interpolation
9496
- network-uri
9597
- open-browser
96-
- optparse-applicative >= 0.14.3.0
98+
- optparse-applicative >= 0.17.0.0
9799
- pantry >= 0.5.6
98-
- casa-client
99-
- casa-types
100100
- path
101101
- path-io
102102
# In order for Cabal (the tool) to build Stack, it needs to be told of the
103103
# upper bound on persistent. See
104104
# https://github.com/commercialhaskell/stack/pull/5677#issuecomment-1193318542
105-
- persistent < 2.14
105+
- persistent >= 2.13.3.5 && < 2.14
106106
- persistent-sqlite
107107
- persistent-template
108108
- pretty
109109
- primitive
110-
- process
110+
- process >= 1.6.13.2
111111
- project-template
112112
- retry
113-
- rio >= 0.1.21.0
113+
- rio >= 0.1.22.0
114114
- rio-prettyprint >= 0.1.1.0
115115
- semigroups
116116
- split

stack.cabal

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ source-repository head
7474
custom-setup
7575
setup-depends:
7676
Cabal
77-
, base >=4.13 && <5
77+
, base >=4.16.3.0 && <5
7878
, filepath
7979

8080
flag developer-mode
@@ -225,14 +225,14 @@ library
225225
src/
226226
ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -optP-Wno-nonportable-include-path -fwarn-identities
227227
build-depends:
228-
Cabal
229-
, aeson
228+
Cabal >=3.6.3.0
229+
, aeson >=2.0.3.0
230230
, annotated-wl-pprint
231231
, ansi-terminal
232232
, array
233233
, async
234234
, attoparsec
235-
, base >=4.10 && <5
235+
, base >=4.16.3.0 && <5
236236
, base64-bytestring
237237
, bytestring
238238
, casa-client
@@ -272,19 +272,19 @@ library
272272
, neat-interpolation
273273
, network-uri
274274
, open-browser
275-
, optparse-applicative >=0.14.3.0
275+
, optparse-applicative >=0.17.0.0
276276
, pantry >=0.5.6
277277
, path
278278
, path-io
279-
, persistent <2.14
279+
, persistent >=2.13.3.5 && <2.14
280280
, persistent-sqlite
281281
, persistent-template
282282
, pretty
283283
, primitive
284-
, process
284+
, process >=1.6.13.2
285285
, project-template
286286
, retry
287-
, rio >=0.1.21.0
287+
, rio >=0.1.22.0
288288
, rio-prettyprint >=0.1.1.0
289289
, semigroups
290290
, split
@@ -348,14 +348,14 @@ executable stack
348348
src/main
349349
ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -optP-Wno-nonportable-include-path -threaded -rtsopts
350350
build-depends:
351-
Cabal
352-
, aeson
351+
Cabal >=3.6.3.0
352+
, aeson >=2.0.3.0
353353
, annotated-wl-pprint
354354
, ansi-terminal
355355
, array
356356
, async
357357
, attoparsec
358-
, base >=4.10 && <5
358+
, base >=4.16.3.0 && <5
359359
, base64-bytestring
360360
, bytestring
361361
, casa-client
@@ -395,19 +395,19 @@ executable stack
395395
, neat-interpolation
396396
, network-uri
397397
, open-browser
398-
, optparse-applicative >=0.14.3.0
398+
, optparse-applicative >=0.17.0.0
399399
, pantry >=0.5.6
400400
, path
401401
, path-io
402-
, persistent <2.14
402+
, persistent >=2.13.3.5 && <2.14
403403
, persistent-sqlite
404404
, persistent-template
405405
, pretty
406406
, primitive
407-
, process
407+
, process >=1.6.13.2
408408
, project-template
409409
, retry
410-
, rio >=0.1.21.0
410+
, rio >=0.1.22.0
411411
, rio-prettyprint >=0.1.1.0
412412
, semigroups
413413
, split
@@ -470,14 +470,14 @@ executable stack-integration-test
470470
test/integration/lib
471471
ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-N
472472
build-depends:
473-
Cabal
474-
, aeson
473+
Cabal >=3.6.3.0
474+
, aeson >=2.0.3.0
475475
, annotated-wl-pprint
476476
, ansi-terminal
477477
, array
478478
, async
479479
, attoparsec
480-
, base >=4.10 && <5
480+
, base >=4.16.3.0 && <5
481481
, base64-bytestring
482482
, bytestring
483483
, casa-client
@@ -518,20 +518,20 @@ executable stack-integration-test
518518
, neat-interpolation
519519
, network-uri
520520
, open-browser
521-
, optparse-applicative >=0.14.3.0
521+
, optparse-applicative >=0.17.0.0
522522
, optparse-generic
523523
, pantry >=0.5.6
524524
, path
525525
, path-io
526-
, persistent <2.14
526+
, persistent >=2.13.3.5 && <2.14
527527
, persistent-sqlite
528528
, persistent-template
529529
, pretty
530530
, primitive
531-
, process
531+
, process >=1.6.13.2
532532
, project-template
533533
, retry
534-
, rio >=0.1.21.0
534+
, rio >=0.1.22.0
535535
, rio-prettyprint >=0.1.1.0
536536
, semigroups
537537
, split
@@ -599,15 +599,15 @@ test-suite stack-test
599599
src/test
600600
ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -optP-Wno-nonportable-include-path -threaded
601601
build-depends:
602-
Cabal
602+
Cabal >=3.6.3.0
603603
, QuickCheck
604-
, aeson
604+
, aeson >=2.0.3.0
605605
, annotated-wl-pprint
606606
, ansi-terminal
607607
, array
608608
, async
609609
, attoparsec
610-
, base >=4.10 && <5
610+
, base >=4.16.3.0 && <5
611611
, base64-bytestring
612612
, bytestring
613613
, casa-client
@@ -648,20 +648,20 @@ test-suite stack-test
648648
, neat-interpolation
649649
, network-uri
650650
, open-browser
651-
, optparse-applicative >=0.14.3.0
651+
, optparse-applicative >=0.17.0.0
652652
, pantry >=0.5.6
653653
, path
654654
, path-io
655-
, persistent <2.14
655+
, persistent >=2.13.3.5 && <2.14
656656
, persistent-sqlite
657657
, persistent-template
658658
, pretty
659659
, primitive
660-
, process
660+
, process >=1.6.13.2
661661
, project-template
662662
, raw-strings-qq
663663
, retry
664-
, rio >=0.1.21.0
664+
, rio >=0.1.22.0
665665
, rio-prettyprint >=0.1.1.0
666666
, semigroups
667667
, smallcheck

0 commit comments

Comments
 (0)