Skip to content

Commit e1657a8

Browse files
committed
fix: admin server dies silently
Uses warp main branch yesodweb/wai@ad04121 since there's no release yet.
1 parent 4fc4775 commit e1657a8

4 files changed

Lines changed: 25 additions & 13 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file. From versio
2323
- Fix unexpected results when embedding and filtering the same table more than once by @laurenceisla in #4075
2424
- If the schema cache fails to reload, PostgREST will no longer stop serving requests and will continue doing so in a "best effort" basis by @mkleczek in #4873 #4869
2525
- Stop reporting 503s errors unnecessarily while the schema cache is loading at startup by @mkleczek in #4880
26+
- Fix admin server dying silently by @Vlix, @mkleczek, @steve-chavez in #5012
2627

2728
### Changed
2829

nix/overlays/haskell-packages.nix

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,15 @@ let
8787
{ };
8888

8989
warp =
90-
lib.dontCheck (prev.callHackageDirect
91-
{
92-
pkg = "warp";
93-
ver = "3.4.13";
94-
sha256 = "sha256-jmr8kpeSPDkOhT0i9PhozZapX4nUs92cOX7POAGb7/M=";
95-
}
96-
{ });
90+
lib.dontCheck
91+
(prev.callCabal2nixWithOptions "warp"
92+
(super.fetchFromGitHub {
93+
owner = "yesodweb";
94+
repo = "wai";
95+
rev = "ad041216b643f69a2a9c87cbf4c2988aa4633dd5";
96+
sha256 = "sha256-Dl3wLrGl1HvkF9MqGdY4dzx4z6SlCSiFZgCgprd7Cjg=";
97+
}) "--subpath=warp"
98+
{ });
9799
};
98100
in
99101
{

stack.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ extra-deps:
1515
- hasql-notifications-0.2.4.0
1616
- http-semantics-0.4.0
1717
- http2-5.4.0
18-
- warp-3.4.13
18+
- git: https://github.com/yesodweb/wai.git
19+
commit: ad041216b643f69a2a9c87cbf4c2988aa4633dd5
20+
subdirs:
21+
- warp
1922

2023
allow-newer: true
2124
allow-newer-deps:

stack.yaml.lock

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file was autogenerated by Stack.
22
# You should not edit this file by hand.
33
# For more information, please see the documentation at:
4-
# https://docs.haskellstack.org/en/stable/topics/lock_files
4+
# https://docs.haskellstack.org/en/stable/lock_files
55

66
packages:
77
- completed:
@@ -47,12 +47,18 @@ packages:
4747
original:
4848
hackage: http2-5.4.0
4949
- completed:
50-
hackage: warp-3.4.13@sha256:ccd1fb8765166ca31928635fffdab85569b7a0f2a81cc11c9a5b91eab663eda6,10066
50+
commit: ad041216b643f69a2a9c87cbf4c2988aa4633dd5
51+
git: https://github.com/yesodweb/wai.git
52+
name: warp
5153
pantry-tree:
52-
sha256: dfe50280b7d9549f7eebedc35f62d633ecb185ba0d9686146bb39074c3055df5
53-
size: 4175
54+
sha256: 02665f2d175a7fd683470e608b23e0d661f4e55dd13e073ed203e4b9a5801f8f
55+
size: 4975
56+
subdir: warp
57+
version: 3.4.13.1
5458
original:
55-
hackage: warp-3.4.13
59+
commit: ad041216b643f69a2a9c87cbf4c2988aa4633dd5
60+
git: https://github.com/yesodweb/wai.git
61+
subdir: warp
5662
snapshots:
5763
- completed:
5864
sha256: 3286bb954fe0e7e0291ca61fac01a689b7165da9d7e8ba3c3a045be989c860fd

0 commit comments

Comments
 (0)