From 3828a9591c095651d3eb12c7b9edf564b21451d4 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:32:03 +0100 Subject: [PATCH 1/2] unpin unix package (#850) --- package.yaml | 1 - simplexmq.cabal | 7 ------- 2 files changed, 8 deletions(-) diff --git a/package.yaml b/package.yaml index 6e8b69715..c1e726683 100644 --- a/package.yaml +++ b/package.yaml @@ -67,7 +67,6 @@ dependencies: - time-manager == 0.0.* - tls >= 1.6.0 && < 1.7 - transformers == 0.6.* - - unix == 2.8.1.1 - unliftio == 0.2.* - unliftio-core == 0.2.* - websockets == 0.12.* diff --git a/simplexmq.cabal b/simplexmq.cabal index d1f2d4591..cb304b4b0 100644 --- a/simplexmq.cabal +++ b/simplexmq.cabal @@ -189,7 +189,6 @@ library , time-manager ==0.0.* , tls >=1.6.0 && <1.7 , transformers ==0.6.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , websockets ==0.12.* @@ -255,7 +254,6 @@ executable ntf-server , time-manager ==0.0.* , tls >=1.6.0 && <1.7 , transformers ==0.6.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , websockets ==0.12.* @@ -321,7 +319,6 @@ executable smp-agent , time-manager ==0.0.* , tls >=1.6.0 && <1.7 , transformers ==0.6.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , websockets ==0.12.* @@ -387,7 +384,6 @@ executable smp-server , time-manager ==0.0.* , tls >=1.6.0 && <1.7 , transformers ==0.6.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , websockets ==0.12.* @@ -453,7 +449,6 @@ executable xftp , time-manager ==0.0.* , tls >=1.6.0 && <1.7 , transformers ==0.6.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , websockets ==0.12.* @@ -519,7 +514,6 @@ executable xftp-server , time-manager ==0.0.* , tls >=1.6.0 && <1.7 , transformers ==0.6.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , websockets ==0.12.* @@ -620,7 +614,6 @@ test-suite simplexmq-test , timeit ==2.0.* , tls >=1.6.0 && <1.7 , transformers ==0.6.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , websockets ==0.12.* From 8d47f690838371bc848e4b31a4b09ef6bf67ccc5 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Thu, 21 Sep 2023 11:57:00 +0100 Subject: [PATCH 2/2] agent: fix creating empty file for XFTP to close file (#851) --- src/Simplex/FileTransfer/Agent.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Simplex/FileTransfer/Agent.hs b/src/Simplex/FileTransfer/Agent.hs index 50478e724..106c61011 100644 --- a/src/Simplex/FileTransfer/Agent.hs +++ b/src/Simplex/FileTransfer/Agent.hs @@ -134,9 +134,7 @@ toFSFilePath :: AgentMonad m => FilePath -> m FilePath toFSFilePath f = ( f) <$> getXFTPWorkPath createEmptyFile :: AgentMonad m => FilePath -> m () -createEmptyFile fPath = do - h <- openFile fPath AppendMode - liftIO $ B.hPut h "" >> hFlush h +createEmptyFile fPath = liftIO $ B.writeFile fPath "" addXFTPRcvWorker :: AgentMonad m => AgentClient -> Maybe XFTPServer -> m () addXFTPRcvWorker c = addWorker c xftpRcvWorkers runXFTPRcvWorker runXFTPRcvLocalWorker