From 352291702155e5c712c2302cbfd505de95d0f802 Mon Sep 17 00:00:00 2001 From: steve-chavez Date: Mon, 6 Jul 2026 17:39:49 -0500 Subject: [PATCH] fix: admin server dies silently by upgrading warp Uses warp main branch https://github.com/yesodweb/wai/commit/ad041216b643f69a2a9c87cbf4c2988aa4633dd5 since there's no release yet. --- CHANGELOG.md | 1 + nix/overlays/haskell-packages.nix | 16 +++++++++------- stack.yaml | 5 ++++- stack.yaml.lock | 16 +++++++++++----- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38367812c..77c13106b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file. From versio - Fix unexpected results when embedding and filtering the same table more than once by @laurenceisla in #4075 - 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 - Stop reporting 503s errors unnecessarily while the schema cache is loading at startup by @mkleczek in #4880 +- Fix admin server dying silently by @Vlix, @mkleczek, @steve-chavez in #5012 ### Changed diff --git a/nix/overlays/haskell-packages.nix b/nix/overlays/haskell-packages.nix index 85b6cf127..b46d6c451 100644 --- a/nix/overlays/haskell-packages.nix +++ b/nix/overlays/haskell-packages.nix @@ -87,13 +87,15 @@ let { }; warp = - lib.dontCheck (prev.callHackageDirect - { - pkg = "warp"; - ver = "3.4.13"; - sha256 = "sha256-jmr8kpeSPDkOhT0i9PhozZapX4nUs92cOX7POAGb7/M="; - } - { }); + lib.dontCheck + (prev.callCabal2nixWithOptions "warp" + (super.fetchFromGitHub { + owner = "yesodweb"; + repo = "wai"; + rev = "ad041216b643f69a2a9c87cbf4c2988aa4633dd5"; + sha256 = "sha256-Dl3wLrGl1HvkF9MqGdY4dzx4z6SlCSiFZgCgprd7Cjg="; + }) "--subpath=warp" + { }); }; in { diff --git a/stack.yaml b/stack.yaml index 7d48f3c8d..3b9a8a49a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,7 +15,10 @@ extra-deps: - hasql-notifications-0.2.4.0 - http-semantics-0.4.0 - http2-5.4.0 - - warp-3.4.13 + - git: https://github.com/yesodweb/wai.git + commit: ad041216b643f69a2a9c87cbf4c2988aa4633dd5 + subdirs: + - warp allow-newer: true allow-newer-deps: diff --git a/stack.yaml.lock b/stack.yaml.lock index 3177ac899..77dd61517 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -1,7 +1,7 @@ # This file was autogenerated by Stack. # You should not edit this file by hand. # For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/topics/lock_files +# https://docs.haskellstack.org/en/stable/lock_files packages: - completed: @@ -47,12 +47,18 @@ packages: original: hackage: http2-5.4.0 - completed: - hackage: warp-3.4.13@sha256:ccd1fb8765166ca31928635fffdab85569b7a0f2a81cc11c9a5b91eab663eda6,10066 + commit: ad041216b643f69a2a9c87cbf4c2988aa4633dd5 + git: https://github.com/yesodweb/wai.git + name: warp pantry-tree: - sha256: dfe50280b7d9549f7eebedc35f62d633ecb185ba0d9686146bb39074c3055df5 - size: 4175 + sha256: 02665f2d175a7fd683470e608b23e0d661f4e55dd13e073ed203e4b9a5801f8f + size: 4975 + subdir: warp + version: 3.4.13.1 original: - hackage: warp-3.4.13 + commit: ad041216b643f69a2a9c87cbf4c2988aa4633dd5 + git: https://github.com/yesodweb/wai.git + subdir: warp snapshots: - completed: sha256: 3286bb954fe0e7e0291ca61fac01a689b7165da9d7e8ba3c3a045be989c860fd