Skip to content

Commit bccf7ac

Browse files
taimoorzaeemwolfgangwalther
authored andcommitted
Revert "chore: remove unused haskell dependencies"
This reverts commit b6bb838.
1 parent ed8be34 commit bccf7ac

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

postgrest.cabal

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,10 @@ library
102102
, auto-update >= 0.1.4 && < 0.3
103103
, base64-bytestring >= 1 && < 1.3
104104
, bytestring >= 0.10.8 && < 0.13
105+
, cache >= 0.1.3 && < 0.2.0
105106
, case-insensitive >= 1.2 && < 1.3
106107
, cassava >= 0.4.5 && < 0.6
108+
, clock >= 0.8.3 && < 0.9.0
107109
, configurator-pg >= 0.2.11 && < 0.3
108110
, containers >= 0.5.7 && < 0.7
109111
, cookie >= 0.4.2 && < 0.6
@@ -116,9 +118,11 @@ library
116118
, hasql-notifications >= 0.2.2.2 && < 0.2.3
117119
, hasql-pool >= 1.0.1 && < 1.1
118120
, hasql-transaction >= 1.0.1 && < 1.2
121+
, heredoc >= 0.2 && < 0.3
119122
, http-client >= 0.7.19 && < 0.8
120123
, http-types >= 0.12.2 && < 0.13
121124
, insert-ordered-containers >= 0.2.2 && < 0.3
125+
, iproute >= 1.7.0 && < 1.8
122126
, jose-jwt >= 0.9.6 && < 0.11
123127
, lens >= 4.14 && < 5.4
124128
, lens-aeson >= 1.0.1 && < 1.3
@@ -128,6 +132,8 @@ library
128132
, network-uri >= 2.6.1 && < 2.8
129133
, optparse-applicative >= 0.13 && < 0.19
130134
, parsec >= 3.1.11 && < 3.2
135+
-- Technically unused, can be removed after updating to hasql >= 1.7
136+
, postgresql-libpq >= 0.10
131137
, prometheus-client >= 1.1.1 && < 1.2.0
132138
, protolude >= 0.3.1 && < 0.4
133139
, regex-tdfa >= 1.2.2 && < 1.4
@@ -145,6 +151,11 @@ library
145151
, wai >= 3.2.1 && < 3.3
146152
, wai-cors >= 0.2.5 && < 0.3
147153
, wai-extra >= 3.1.8 && < 3.2
154+
-- We already depend on wai-logger >= 2.3.7 indirectly via wai-extra,
155+
-- but we want to depend on 2.4.0 which fixes 'unknownSocket' log output
156+
-- for unix sockets; this is tested in test/io/test_io.py. See
157+
-- https://github.com/kazu-yamamoto/logger/commit/3a71ca70afdbb93d4ecf0083eeba1fbbbcab3fc3
158+
, wai-logger >= 2.4.0
148159
, warp >= 3.3.19 && < 3.5
149160
, stm >= 2.5 && < 3
150161
, stm-hamt >= 1.2 && < 2
@@ -155,7 +166,7 @@ library
155166
-- -optP-Wno-nonportable-include-path
156167
-- prevents build failures on case-insensitive filesystems (macos),
157168
-- see https://github.com/commercialhaskell/stack/issues/3918
158-
ghc-options: -Werror -Wall -fwarn-identities -Wunused-packages
169+
ghc-options: -Werror -Wall -fwarn-identities
159170
-fno-spec-constr -optP-Wno-nonportable-include-path
160171

161172
if flag(dev)
@@ -176,10 +187,11 @@ executable postgrest
176187
hs-source-dirs: main
177188
main-is: Main.hs
178189
build-depends: base >= 4.9 && < 4.20
190+
, containers >= 0.5.7 && < 0.7
179191
, postgrest
180192
, protolude >= 0.3.1 && < 0.4
181193
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -I0 -qg"
182-
-O2 -Werror -Wall -fwarn-identities -Wunused-packages
194+
-O2 -Werror -Wall -fwarn-identities
183195
-fno-spec-constr -optP-Wno-nonportable-include-path
184196

185197
if flag(dev)
@@ -279,7 +291,7 @@ test-suite spec
279291
, transformers-base >= 0.4.4 && < 0.5
280292
, wai >= 3.2.1 && < 3.3
281293
, wai-extra >= 3.0.19 && < 3.2
282-
ghc-options: -threaded -O0 -Werror -Wall -fwarn-identities -Wunused-packages
294+
ghc-options: -threaded -O0 -Werror -Wall -fwarn-identities
283295
-fno-spec-constr -optP-Wno-nonportable-include-path
284296
-fno-warn-missing-signatures
285297
-fwrite-ide-info

stack.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ extra-deps:
1313
- fuzzyset-0.2.4
1414
- hasql-pool-1.0.1
1515
- jose-jwt-0.10.0
16+
- postgresql-libpq-0.10.1.0
1617
- streaming-commons-0.2.3.1

stack.yaml.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ packages:
3232
size: 1231
3333
original:
3434
hackage: jose-jwt-0.10.0
35+
- completed:
36+
hackage: postgresql-libpq-0.10.1.0@sha256:6b580c9d5068e78eecc13e655b2885c8e79cdacfca513c5d1e5a6b9dc61d9758,3166
37+
pantry-tree:
38+
sha256: ae81e7628a8f3d1ef33ace71fa0845c073c003ca7f1150cc9d9ba1e55fc84236
39+
size: 1096
40+
original:
41+
hackage: postgresql-libpq-0.10.1.0
3542
- completed:
3643
hackage: streaming-commons-0.2.3.1@sha256:ed7999fea9e912b1211ea93d7e20a7998bf4753166370c94048885650f303bf0,4841
3744
pantry-tree:

0 commit comments

Comments
 (0)