Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade stackage to LTS 21.14 #95

Merged
merged 2 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use Alpine Linux as base image
FROM alpine:3.17
FROM alpine:edge

# Install libpq and gmp dependencies (dynamic libraries required by the project)
RUN apk update && apk add libpq gmp libffi
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:edge

RUN apk add --update ca-certificates openssl && update-ca-certificates

Expand Down
22 changes: 11 additions & 11 deletions postgres-websockets.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ library
, PostgresWebsockets.Middleware
, PostgresWebsockets.Context
build-depends: base >= 4.7 && < 5
, hasql-pool >= 0.8 && < 0.9
, text >= 1.2 && < 1.3
, hasql-pool >= 0.8 && < 0.10
, text >= 1.2 && < 2.1
, wai >= 3.2 && < 4
, websockets >= 0.9 && < 0.13
, wai-websockets >= 3.0 && < 4
Expand All @@ -38,15 +38,15 @@ library
, lens >= 4.17.1
, jose >= 0.6
, unordered-containers >= 0.2
, aeson >= 2.0 && < 2.1
, aeson >= 2.0 && < 2.2
, protolude >= 0.2.3 && < 0.4
, hasql >= 1.4.1
, hasql-notifications >= 0.1.0.0 && < 0.3
, either >= 5.0.1.1 && < 5.1
, stm-containers >= 1.1.0.2 && < 1.2
, stm-containers >= 1.1.0.2 && < 1.3
, stm >= 2.5.0.0 && < 2.6
, retry >= 0.8.1.0 && < 0.9
, time >= 1.8.0.2 && < 1.12
, retry >= 0.8.1.0 && < 0.10
, time >= 1.8.0.2 && < 1.13
, alarmclock >= 0.7.0.2 && < 0.8
, envparse >= 0.4.1
, base64-bytestring >= 1.0.0.3 && < 1.3
Expand Down Expand Up @@ -82,19 +82,19 @@ test-suite postgres-websockets-test
build-depends: base
, protolude >= 0.2.3 && < 0.4
, postgres-websockets
, hspec >= 2.7.1 && < 2.10
, aeson >= 2.0 && < 2.1
, hspec >= 2.7.1 && < 2.11
, aeson >= 2.0 && < 2.2
, hasql >= 0.19
, hasql-pool >= 0.8 && < 0.9
, hasql-pool >= 0.8 && < 0.10
, hasql-notifications >= 0.1.0.0 && < 0.3
, http-types >= 0.9
, time >= 1.8.0.2 && < 1.12
, time >= 1.8.0.2 && < 1.13
, unordered-containers >= 0.2
, wai-extra >= 3.0.29 && < 3.2
, stm >= 2.5.0.0 && < 2.6
, websockets >= 0.12.7.0 && < 0.13
, network >= 2.8.0.1 && < 3.2
, lens >= 4.17.1 && < 5.2
, lens >= 4.17.1 && < 5.3
, lens-aeson
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
default-language: Haskell2010
Expand Down
2 changes: 1 addition & 1 deletion src/PostgresWebsockets/Context.hs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data Context = Context
mkContext :: AppConfig -> IO () -> IO Context
mkContext conf@AppConfig {..} shutdownServer = do
Context conf
<$> P.acquire configPool (Just 10000) pgSettings
<$> P.acquire configPool 10000 10000 pgSettings
<*> newHasqlBroadcaster shutdown (toS configListenChannel) configRetries configReconnectInterval pgSettings
<*> mkGetTime
where
Expand Down
5 changes: 1 addition & 4 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
resolver: lts-20.12
resolver: lts-21.14
extra-deps:
- exceptions-0.10.4@sha256:7ed09aed03683d5b4337088061106c2389d274b3472031a330ff1b220bad2b2d,2796
- retry-0.8.1.2@sha256:b81e7d7e5f068da82349a3c157a2ab25d399c9ca4841d1b6e54e8c4050cb065f,2189
- stm-containers-1.1.0.5@sha256:dffad326e360cf937840bf61f00c6e7dcc4fe62b4db420bf51266b08559f5020,3248
packages:
- .

Expand Down
31 changes: 5 additions & 26 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,10 @@
# For more information, please see the documentation at:
# https://docs.haskellstack.org/en/stable/lock_files

packages:
- completed:
hackage: exceptions-0.10.4@sha256:7ed09aed03683d5b4337088061106c2389d274b3472031a330ff1b220bad2b2d,2796
pantry-tree:
sha256: f1eb6efc7f747444de23771bef8ac4d4c2f0e2f99bb149d72a9441d8df022263
size: 908
original:
hackage: exceptions-0.10.4@sha256:7ed09aed03683d5b4337088061106c2389d274b3472031a330ff1b220bad2b2d,2796
- completed:
hackage: retry-0.8.1.2@sha256:b81e7d7e5f068da82349a3c157a2ab25d399c9ca4841d1b6e54e8c4050cb065f,2189
pantry-tree:
sha256: a9ebf74c0fce47b4e743c4d1a2c72fcc949a702e5790fa2784c835db17492012
size: 433
original:
hackage: retry-0.8.1.2@sha256:b81e7d7e5f068da82349a3c157a2ab25d399c9ca4841d1b6e54e8c4050cb065f,2189
- completed:
hackage: stm-containers-1.1.0.5@sha256:dffad326e360cf937840bf61f00c6e7dcc4fe62b4db420bf51266b08559f5020,3248
pantry-tree:
sha256: e09db5d8233874c789dad634896b0240e40c6a5fcdce055730cd62b1a6f94cb4
size: 761
original:
hackage: stm-containers-1.1.0.5@sha256:dffad326e360cf937840bf61f00c6e7dcc4fe62b4db420bf51266b08559f5020,3248
packages: []
snapshots:
- completed:
sha256: af5d667f6096e535b9c725a72cffe0f6c060e0568d9f9eeda04caee70d0d9d2d
size: 649133
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/12.yaml
original: lts-20.12
sha256: 60e54c1ba3c1e7163acf6dafa9d56b2d3b23f88a31ad53a1c9d888f32561f8da
size: 639819
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/14.yaml
original: lts-21.14
Loading