From 92a30415fad1f497c3c2d8ceb5867950b08b1d43 Mon Sep 17 00:00:00 2001 From: Steve Chavez Date: Wed, 9 Feb 2022 17:27:29 -0500 Subject: [PATCH] fix: Keep working when EMFILE is reached (#2158) Done by upgrading to warp 3.3.19 --- CHANGELOG.md | 5 +++++ nix/overlays/haskell-packages.nix | 9 +++++++++ postgrest.cabal | 2 +- stack.yaml | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4181805eeb..85408341f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,11 @@ This project adheres to [Semantic Versioning](http://semver.org/). - #2101, Remove aggregates, procedures and window functions from the schema cache and OpenAPI output. - @wolfgangwalther - #2145, Fix accessing json array fields with -> and ->> in ?select= and ?order=. - @wolfgangwalther - #2153, Fix --dump-schema running with a wrong PG version. - @wolfgangwalther + - #2101, Remove aggregates, procedures and window functions from the schema cache and OpenAPI output. - @wolfgangwalther + - #2152, Remove functions, which are uncallable because of unnamend arguments from schema cache and OpenAPI output. - @wolfgangwalther + - #2145, Fix accessing json array fields with -> and ->> in ?select= and ?order=. - @wolfgangwalther + - #2153, Fix --dump-schema running with a wrong PG version. - @wolfgangwalther + - #2042, Keep working when EMFILE(Too many open files) is reached. - @steve-chavez ### Changed diff --git a/nix/overlays/haskell-packages.nix b/nix/overlays/haskell-packages.nix index 75d27d7613..665a993cfa 100644 --- a/nix/overlays/haskell-packages.nix +++ b/nix/overlays/haskell-packages.nix @@ -50,6 +50,15 @@ let } { }; + warp = + lib.dontCheck (prev.callHackageDirect + { + pkg = "warp"; + ver = "3.3.19"; + sha256 = "0y3jj4bhviss6ff9lwxki0zbdcl1rb398bk4s80zvfpnpy7p94cx"; + } + { }); + hasql-dynamic-statements = lib.dontCheck (lib.unmarkBroken prev.hasql-dynamic-statements); diff --git a/postgrest.cabal b/postgrest.cabal index 9a634d6ec4..5d0653556d 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -110,7 +110,7 @@ library , wai >= 3.2.1 && < 3.3 , wai-cors >= 0.2.5 && < 0.3 , wai-extra >= 3.1.8 && < 3.2 - , warp >= 3.2.12 && < 3.4 + , warp >= 3.3.19 && < 3.4 -- -fno-spec-constr may help keep compile time memory use in check, -- see https://gitlab.haskell.org/ghc/ghc/issues/16017#note_219304 -- -optP-Wno-nonportable-include-path diff --git a/stack.yaml b/stack.yaml index fd03c455de..8e2426c588 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,3 +15,4 @@ extra-deps: - ptr-0.16.8.1@sha256:525219ec5f5da5c699725f7efcef91b00a7d44120fc019878b85c09440bf51d6,2686 - wai-extra-3.1.8@sha256:bf3dbe8f4c707b502b2a88262ed71c807220651597b76b56983f864af6197890,7280 - wai-logger-2.3.7@sha256:19a0dc5122e22d274776d80786fb9501956f5e75b8f82464bbdad5604d154d82,1671 + - warp-3.3.19@sha256:c6a47029537d42844386170d732cdfe6d85b2f4279bbaefdd9b50caff6faeebb,10910