From ecbcd3dd235474be75bb514f0387d7cdb1365aa0 Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <tom@codedown.io>
Date: Wed, 6 Nov 2024 20:04:15 -0800
Subject: [PATCH] Enable some contexts that require Unix sockets on Windows

---
 .../lib/Test/Sandwich/Contexts/PostgreSQL.hs              | 5 -----
 .../lib/Test/Sandwich/Contexts/ReverseProxy/TCP.hs        | 4 ----
 stack.yaml                                                | 2 +-
 stack.yaml.lock                                           | 8 ++++----
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/sandwich-contexts/lib/Test/Sandwich/Contexts/PostgreSQL.hs b/sandwich-contexts/lib/Test/Sandwich/Contexts/PostgreSQL.hs
index ec4ba461..74038494 100644
--- a/sandwich-contexts/lib/Test/Sandwich/Contexts/PostgreSQL.hs
+++ b/sandwich-contexts/lib/Test/Sandwich/Contexts/PostgreSQL.hs
@@ -22,7 +22,6 @@ test process and then run a proxy to forward packets to the Postgres server's Un
 -}
 
 module Test.Sandwich.Contexts.PostgreSQL (
-#ifndef mingw32_HOST_OS
   -- * Raw PostgreSQL via Nix (TCP socket)
   introducePostgresViaNix
   , withPostgresViaNix
@@ -47,10 +46,8 @@ module Test.Sandwich.Contexts.PostgreSQL (
 
   -- * Re-exports
   , NetworkAddress(..)
-#endif
   ) where
 
-#ifndef mingw32_HOST_OS
 import Control.Monad.Catch (MonadMask)
 import Control.Monad.IO.Unlift
 import Control.Monad.Logger
@@ -377,5 +374,3 @@ waitForPostgresDatabase (PostgresContainerOptions {..}) (containerName, p) = do
   -- waitForSimpleQuery pc
 
   return pc
-
-#endif
diff --git a/sandwich-contexts/lib/Test/Sandwich/Contexts/ReverseProxy/TCP.hs b/sandwich-contexts/lib/Test/Sandwich/Contexts/ReverseProxy/TCP.hs
index 837f2653..74478c35 100644
--- a/sandwich-contexts/lib/Test/Sandwich/Contexts/ReverseProxy/TCP.hs
+++ b/sandwich-contexts/lib/Test/Sandwich/Contexts/ReverseProxy/TCP.hs
@@ -6,8 +6,6 @@
 
 module Test.Sandwich.Contexts.ReverseProxy.TCP where
 
-#ifndef mingw32_HOST_OS
-
 import Control.Monad.IO.Unlift
 import Data.Conduit
 import qualified Data.Conduit.Network as DCN
@@ -39,5 +37,3 @@ withProxyToUnixSocket socketPath f = do
       concurrently_
         (runConduit $ DCN.appSource appdata .| DCN.appSink appdataServer)
         (runConduit $ DCN.appSource appdataServer .| DCN.appSink appdata)
-
-#endif
diff --git a/stack.yaml b/stack.yaml
index 2612dc80..23999756 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,5 +1,5 @@
 
-resolver: lts-22.27
+resolver: lts-22.40
 
 # ghc-options:
 #   "$locals": >-
diff --git a/stack.yaml.lock b/stack.yaml.lock
index 02d1e839..4c966cb6 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -87,7 +87,7 @@ packages:
     subdir: x509-validation
 snapshots:
 - completed:
-    sha256: bc144ddf301a5c99f2cf51c7de50279ba144fd4486cb3c66f87ed761d6bbf6e9
-    size: 719131
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/27.yaml
-  original: lts-22.27
+    sha256: 521009bd88879b6993fab5ea5abe1ee2a539dfd8ec2dfc7c57017a8eaee1e78b
+    size: 720262
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/40.yaml
+  original: lts-22.40