diff --git a/.fdignore b/.fdignore deleted file mode 100644 index 6b8710a71..000000000 --- a/.fdignore +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/cabal.project.freeze b/cabal.project.freeze index 026d4be91..2d06cc173 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -1 +1 @@ -index-state: hackage.haskell.org 2026-04-18T18:42:36Z +index-state: hackage.haskell.org 2026-06-02T04:24:44Z diff --git a/flake.lock b/flake.lock index 3790b4d6a..075ff9cc9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1776949667, - "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=", + "lastModified": 1780336545, + "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30", + "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", "type": "github" }, "original": { diff --git a/nix/tools/devTools.nix b/nix/tools/devTools.nix index 039c0bfd5..59c8976fb 100644 --- a/nix/tools/devTools.nix +++ b/nix/tools/devTools.nix @@ -41,7 +41,7 @@ let } '' while true; do - (! ${fd}/bin/fd -H | ${entr}/bin/entr -dr "$_arg_command" "''${_arg_leftovers[@]}") + (! ${fd}/bin/fd -H -E .git | ${entr}/bin/entr -dr "$_arg_command" "''${_arg_leftovers[@]}") done ''; diff --git a/src/PostgREST/App.hs b/src/PostgREST/App.hs index 010362573..ada773c23 100644 --- a/src/PostgREST/App.hs +++ b/src/PostgREST/App.hs @@ -68,7 +68,7 @@ import qualified Data.List as L import Data.Streaming.Network (bindPortTCP) import qualified Data.Text as T import qualified Network.HTTP.Types as HTTP -import qualified Network.HTTP.Types.Header as HTTP (hVary) +import Network.HTTP.Types.Header (hVary) import qualified Network.Socket as NS import PostgREST.Unix (createAndBindDomainSocket) import Protolude hiding (Handler) @@ -223,10 +223,10 @@ postgrestResponse appState conf@AppConfig{..} maybeSchemaCache jwtTime authResul serverTimingHeaders timing = [serverTimingHeader timing | configServerTimingEnabled] varyHeader :: HTTP.Header - varyHeader = (HTTP.hVary, "Accept, Prefer, Range") + varyHeader = (hVary, "Accept, Prefer, Range") varyHeaderPresent :: [HTTP.Header] -> Bool - varyHeaderPresent = any (\(h, _v) -> h == HTTP.hVary) + varyHeaderPresent = any (\(h, _v) -> h == hVary) withTiming :: (MonadError e m, MonadIO m) => AppConfig -> m a -> m (Maybe Double, a) withTiming AppConfig{configServerTimingEnabled} f = if configServerTimingEnabled diff --git a/stack.yaml b/stack.yaml index 34ef0f6c8..1ea29d7d6 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,5 +1,5 @@ # When updating, update GHC version in .github/workflows/build.yaml as well. -resolver: lts-24.37 # 2026-04-15, GHC 9.10.3 +resolver: lts-24.43 # 2026-05-29, GHC 9.10.3 nix: packages: diff --git a/stack.yaml.lock b/stack.yaml.lock index 5afe87881..28f7faca7 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -48,7 +48,7 @@ packages: hackage: warp-3.4.13 snapshots: - completed: - sha256: 655e468f774beee1badf07dc4c45fb50288d5c66ce7bef6f487b7f92891a90b0 - size: 728965 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/37.yaml - original: lts-24.37 + sha256: 3c412a7c13dba6d3d808455a458e0776c58b6cf99b8a7961a2f5e55589d6f1d6 + size: 729011 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/43.yaml + original: lts-24.43