diff options
| author | Dennis Gosnell <cdep.illabout@gmail.com> | 2021-08-17 10:02:08 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 10:02:08 +0900 |
| commit | cc8c5ba53e35a2fb5b7f6dcf627194d4fb0d65ad (patch) | |
| tree | 70c8ed0c77b9b340407701cfdac9a90893f44877 /pkgs/development/haskell-modules/patches | |
| parent | 585575043f4251dd676fcd537042fc0aa75b1db5 (diff) | |
| parent | da03c8aadd59a497bbe5435febfc1f9c13f0a59d (diff) | |
Merge pull request #133621 from Lassulus/hasura
hasura graphql-engine: 1.0.0 -> 2.0.5
Diffstat (limited to 'pkgs/development/haskell-modules/patches')
| -rw-r--r-- | pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/patches/hasura-884-compat.patch | 26 |
2 files changed, 13 insertions, 26 deletions
diff --git a/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch b/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch new file mode 100644 index 0000000000000..5fcf408b2b0e2 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch @@ -0,0 +1,13 @@ +diff --git a/server/src-lib/Data/HashMap/Strict/Extended.hs b/server/src-lib/Data/HashMap/Strict/Extended.hs +index eaff0dfba..5047a0e9d 100644 +--- a/src-lib/Data/HashMap/Strict/Extended.hs ++++ b/src-lib/Data/HashMap/Strict/Extended.hs +@@ -17,7 +17,7 @@ import qualified Data.Align as A + import qualified Data.Foldable as F + + import Data.Function +-import Data.HashMap.Strict as M ++import Data.HashMap.Strict as M hiding (mapKeys) + import Data.Hashable + import Data.List.NonEmpty (NonEmpty (..)) + import Data.These diff --git a/pkgs/development/haskell-modules/patches/hasura-884-compat.patch b/pkgs/development/haskell-modules/patches/hasura-884-compat.patch deleted file mode 100644 index bc000ba9cca21..0000000000000 --- a/pkgs/development/haskell-modules/patches/hasura-884-compat.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs -index 6cb70cf0..0c3789cd 100644 ---- server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs -+++ server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs -@@ -45,7 +45,7 @@ import GHC.AssertNF - import qualified ListT - import qualified Network.WebSockets as WS - import qualified StmContainers.Map as STMMap --import qualified System.IO.Error as E -+--import qualified System.IO.Error as E - - import qualified Hasura.Logging as L - -@@ -287,12 +287,6 @@ createServerApp (WSServer logger@(L.Logger writeLog) serverStatus) wsHandlers !p - let rcv = forever $ do - -- Process all messages serially (important!), in a separate thread: - msg <- liftIO $ -- -- Re-throw "receiveloop: resource vanished (Connection reset by peer)" : -- -- https://github.com/yesodweb/wai/blob/master/warp/Network/Wai/Handler/Warp/Recv.hs#L112 -- -- as WS exception signaling cleanup below. It's not clear why exactly this gets -- -- raised occasionally; I suspect an equivalent handler is missing from WS itself. -- -- Regardless this should be safe: -- handleJust (guard . E.isResourceVanishedError) (\()-> throw WS.ConnectionClosed) $ - WS.receiveData conn - writeLog $ WSLog wsId (EMessageReceived $ TBS.fromLBS msg) Nothing - _hOnMessage wsHandlers wsConn msg |