Merge branch 'nixpkgs-update' into master

2 files changed, 26 insertions, 25 deletions

diff --git a/pkgs/development/haskell-modules/patches/dyre-nix.patch b/pkgs/development/haskell-modules/patches/dyre-nix.patch
deleted file mode 100644
index 458e540e0c4..00000000000
--- a/pkgs/development/haskell-modules/patches/dyre-nix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- dyre-0.8.12/Config/Dyre/Compile.hs	2015-04-13 11:00:20.794278350 +0100
-+++ dyre-0.8.12-patched/Config/Dyre/Compile.hs	2015-04-13 11:07:26.938893502 +0100
-@@ -10,11 +10,13 @@
- import System.FilePath   ( (</>) )
- import System.Directory  ( getCurrentDirectory, doesFileExist
-                          , createDirectoryIfMissing )
-+import System.Environment ( lookupEnv )
-+import Control.Applicative ((<$>))
- import Control.Exception ( bracket )
--import GHC.Paths         ( ghc )
- 
- import Config.Dyre.Paths  ( getPaths )
- import Config.Dyre.Params ( Params(..) )
-+import Data.Maybe         ( fromMaybe )
- 
- -- | Return the path to the error file.
- getErrorPath :: Params cfgType -> IO FilePath
-@@ -47,6 +49,7 @@
-     errFile <- getErrorPath params
-     result <- bracket (openFile errFile WriteMode) hClose $ \errHandle -> do
-         ghcOpts <- makeFlags params configFile tempBinary cacheDir libsDir
-+        ghc <- fromMaybe "ghc" <$> lookupEnv "NIX_GHC"
-         ghcProc <- runProcess ghc ghcOpts (Just cacheDir) Nothing
-                               Nothing Nothing (Just errHandle)
-         waitForProcess ghcProc
diff --git a/pkgs/development/haskell-modules/patches/hasura-884-compat.patch b/pkgs/development/haskell-modules/patches/hasura-884-compat.patch
new file mode 100644
index 00000000000..bc000ba9cca
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/hasura-884-compat.patch
@@ -0,0 +1,26 @@
+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