synchronise atomic locking with commercialhaskell/release

breaks WSL1 and removes the original reason this fork exists

Author: dten

src/Stack/Prelude.hs

@@ -83,7 +83,6 @@ module Stack.Prelude
   , vsep
   ) where
 
-import           Conduit
 import           Data.Monoid as X
                    ( Any (..), Endo (..), First (..), Sum (..) )
 import           Data.Conduit as X ( ConduitM, runConduit, (.|) )
@@ -125,10 +124,8 @@ import           RIO.Process
                    , workingDirL
                    )
 import qualified RIO.Text as T
-import           System.Permissions (osIsWindows)
 import           System.IO.Echo ( withoutInputEcho )
 
-
 -- | Path version
 withSystemTempDir :: MonadUnliftIO m => String -> (Path Abs Dir -> m a) -> m a
 withSystemTempDir str inner = withRunInIO $ \run ->
@@ -303,24 +300,10 @@ defaultFirstFalse :: (a -> FirstFalse) -> Bool
 defaultFirstFalse _ = False
 
 -- | Write a @Builder@ to a file and atomically rename.
---
--- In the future: replace with a function in rio
 writeBinaryFileAtomic :: MonadIO m => Path absrel File -> Builder -> m ()
-writeBinaryFileAtomic fp builder
-  -- Atomic file writing is not supported on Windows yet, unfortunately.
-  -- withSinkFileCautious needs to be implemented properly for Windows to make
-  -- this work.
-  | osIsWindows =
-      liftIO $
-      withBinaryFile (toFilePath fp) WriteMode $ \h ->
-      hPutBuilder h builder
-  | otherwise =
-      liftIO $
-      withSinkFileCautious (toFilePath fp) $ \sink ->
-      runConduit $
-      yield builder .|
-      unsafeBuilderToByteString .|
-      sink
+writeBinaryFileAtomic fp builder =
+  liftIO $
+  withBinaryFileAtomic (toFilePath fp) WriteMode (`hPutBuilder` builder)
 
 newtype PrettyRawSnapshotLocation
   = PrettyRawSnapshotLocation RawSnapshotLocation

stack.yaml

@@ -38,8 +38,6 @@ nix:
   - unzip
 
 flags:
-  lukko:
-    ofd-locking: false
   hackage-security:
     Cabal-syntax: true
   mintty: