Skip to content

Commit 782c6f6

Browse files
authored
Merge pull request #664 from haskell-CI/update-dps
Update dependencies
2 parents 98d3b24 + c60424c commit 782c6f6

File tree

3 files changed

+26
-14
lines changed

3 files changed

+26
-14
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 0.16.5 - 2023-06-13
2+
3+
- Use optparse-applicative-0.18.1.
4+
When using older optparse-applicative with prettyprinter,
5+
`--help` appeared to hang.
6+
- Update other dependencies as well.
7+
8+
## 0.16.4 - 2023-06-09
9+
10+
- Add GHC-9.2.8
11+
112
## 0.16.3 - 2023-05-25
213

314
- Add GHC-9.6.2

cabal-install-parsers/cabal-install-parsers.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: cabal-install-parsers
3-
version: 0.6.1
3+
version: 0.6.1.1
44
synopsis: Utilities to work with cabal-install files
55
description:
66
@cabal-install-parsers@ provides parsers for @cabal-install@ files:
@@ -129,7 +129,7 @@ test-suite cabal-parsers-golden
129129

130130
-- dependencies needing explicit constraints
131131
build-depends:
132-
, ansi-terminal >=0.10 && <0.12
132+
, ansi-terminal >=1.0 && <1.1
133133
, tasty ^>=1.4
134134
, tasty-golden ^>=2.3.1.1
135135
, tree-diff >=0.2 && <0.4

haskell-ci.cabal

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: haskell-ci
3-
version: 0.16.4
3+
version: 0.16.5
44
synopsis: Cabal package script generator for Travis-CI
55
description:
66
Script generator (@haskell-ci@) for
@@ -81,6 +81,7 @@ library haskell-ci-internal
8181
HaskellCI.Auxiliary
8282
HaskellCI.Bash
8383
HaskellCI.Bash.Template
84+
HaskellCI.Cabal
8485
HaskellCI.Cli
8586
HaskellCI.Compiler
8687
HaskellCI.Config
@@ -101,7 +102,6 @@ library haskell-ci-internal
101102
HaskellCI.Diagnostics
102103
HaskellCI.Error
103104
HaskellCI.Ghcup
104-
HaskellCI.Cabal
105105
HaskellCI.GitConfig
106106
HaskellCI.GitHub
107107
HaskellCI.GitHub.Yaml
@@ -125,7 +125,6 @@ library haskell-ci-internal
125125
HaskellCI.YamlSyntax
126126

127127
default-extensions:
128-
NoImplicitPrelude
129128
BangPatterns
130129
DeriveAnyClass
131130
DeriveFoldable
@@ -134,6 +133,7 @@ library haskell-ci-internal
134133
DeriveTraversable
135134
DerivingStrategies
136135
GeneralizedNewtypeDeriving
136+
NoImplicitPrelude
137137
ScopedTypeVariables
138138
TypeOperators
139139

@@ -144,29 +144,29 @@ library haskell-ci-internal
144144
ViewPatterns
145145

146146
build-depends:
147-
, base >=4.10 && <4.18
147+
, base >=4.10 && <4.18
148148
, binary ^>=0.8.5.1
149149
, bytestring ^>=0.10.8.1 || ^>=0.11.1.0
150150
, Cabal-syntax ^>=3.10.1.0
151-
, containers ^>=0.5.7.1 || ^>=0.6.0.1
151+
, containers ^>=0.5.7.1 || ^>=0.6.0.1
152152
, deepseq ^>=1.4.2.0
153153
, directory ^>=1.3.0.0
154154
, filepath ^>=1.4.1.1
155155
, mtl ^>=2.2.2
156156
, parsec ^>=3.1.13.0
157157
, pretty ^>=1.1.3.3
158-
, process ^>=1.4.3.0 || ^>=1.6.1.0
159-
, text ^>=1.2.3.0 || ^>=2.0.1
158+
, process ^>=1.4.3.0 || ^>=1.6.1.0
159+
, text ^>=1.2.3.0 || ^>=2.0.1
160160
, transformers ^>=0.5.2.0
161161

162162
if !impl(ghc >=8.2)
163163
build-depends: bifunctors ^>=5.5.4
164164

165165
-- other dependencies
166166
build-depends:
167-
, aeson ^>=1.5.6.0 || ^>=2.0.0.0 || ^>=2.1.0.0
167+
, aeson ^>=1.5.6.0 || ^>=2.0.0.0 || ^>=2.1.0.0
168168
, attoparsec ^>=0.14.1
169-
, base-compat ^>=0.12
169+
, base-compat ^>=0.13.0
170170
, base16-bytestring ^>=1.0.1.0
171171
, cabal-install-parsers ^>=0.6
172172
, cryptohash-sha256 ^>=0.11.101.0
@@ -176,9 +176,9 @@ library haskell-ci-internal
176176
, indexed-traversable ^>=0.1.1
177177
, indexed-traversable-instances ^>=0.1
178178
, ini ^>=0.4.1
179-
, lattices ^>=2
179+
, lattices ^>=2.2
180180
, network-uri ^>=2.6.1.0
181-
, optparse-applicative ^>=0.17.0.0
181+
, optparse-applicative ^>=0.18.1.0
182182
, temporary ^>=1.3
183183
, unordered-containers ^>=0.2.10.0
184184
, zinza ^>=0.2
@@ -189,6 +189,7 @@ library haskell-ci-internal
189189

190190
executable haskell-ci
191191
main-is: Main.hs
192+
ghc-options: -threaded -rtsopts
192193
hs-source-dirs: cli
193194
build-depends:
194195
, base
@@ -215,7 +216,7 @@ test-suite golden
215216

216217
-- dependencies needing explicit constraints
217218
build-depends:
218-
, ansi-terminal >=0.10 && <0.12
219+
, ansi-terminal >=1.0 && <1.1
219220
, Diff ^>=0.4.0
220221
, tasty ^>=1.4.1
221222
, tasty-golden ^>=2.3.1.1

0 commit comments

Comments
 (0)