diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for streamly-posix +## 0.1.0.2 -- 2021-08-12 + +* Make compatible with streamly 0.8.0 +* Update bounds + ## 0.1.0.1 -- 2020-05-09 * fix build with older GHCs diff --git a/src/Streamly/External/Posix/DirStream.hs b/src/Streamly/External/Posix/DirStream.hs --- a/src/Streamly/External/Posix/DirStream.hs +++ b/src/Streamly/External/Posix/DirStream.hs @@ -28,8 +28,6 @@ ) import Data.Word8 import Prelude hiding ( readFile ) -import Streamly -import Streamly.Internal.Data.Unfold.Types import System.Posix.ByteString import System.Posix.Directory.ByteString as PosixBS @@ -42,7 +40,14 @@ #if MIN_VERSION_streamly(0,7,1) import qualified Streamly.Internal.Data.Unfold as SIU #endif +#if MIN_VERSION_streamly(0,8,0) +import Streamly.Prelude +import Streamly.Internal.Data.Unfold.Type +#else +import Streamly +import Streamly.Internal.Data.Unfold.Types import qualified Streamly.Internal.Prelude as S +#endif -- | Create an 'Unfold' of directory contents. @@ -68,11 +73,15 @@ => DirStream -> SerialT m (DirType, RawFilePath) dirContentsStream ds = +#if MIN_VERSION_streamly(0,8,0) + unfold (SIU.finally (liftIO . PosixBS.closeDirStream) unfoldDirContents) $ ds +#else #if MIN_VERSION_streamly(0,7,1) S.unfold (SIU.finallyIO (liftIO . PosixBS.closeDirStream) unfoldDirContents) $ ds #else S.finally (liftIO . PosixBS.closeDirStream $ ds) . S.unfold unfoldDirContents $ ds #endif +#endif -- | Read the directory contents strictly as a list. @@ -81,5 +90,9 @@ dirContents :: (MonadCatch m, MonadAsync m, MonadMask m) => DirStream -> m [(DirType, RawFilePath)] +#if MIN_VERSION_streamly(0,8,0) +dirContents = toList . dirContentsStream +#else dirContents = S.toList . dirContentsStream +#endif diff --git a/streamly-posix.cabal b/streamly-posix.cabal --- a/streamly-posix.cabal +++ b/streamly-posix.cabal @@ -1,57 +1,60 @@ -cabal-version: >=1.10 +cabal-version: >=1.10 +name: streamly-posix +version: 0.1.0.2 +license: BSD3 +license-file: LICENSE +copyright: Julian Ospald 2020 +maintainer: Julian Ospald +author: Julian Ospald +bug-reports: https://github.com/hasufell/streamly-posix/issues +synopsis: Posix related streaming APIs +description: Posix related streaming APIs (such as file reading/writing) +category: Streaming +build-type: Simple +extra-source-files: CHANGELOG.md -name: streamly-posix -version: 0.1.0.1 -synopsis: Posix related streaming APIs -description: Posix related streaming APIs (such as file reading/writing) -bug-reports: https://github.com/hasufell/streamly-posix/issues -license: BSD3 -license-file: LICENSE -author: Julian Ospald -maintainer: Julian Ospald -copyright: Julian Ospald 2020 -category: Streaming -build-type: Simple -extra-source-files: CHANGELOG.md +source-repository head + type: git + location: https://github.com/hasufell/streamly-posix library + exposed-modules: Streamly.External.Posix.DirStream + hs-source-dirs: src + default-language: Haskell2010 + ghc-options: + -Wall -O2 -fspec-constr-recursive=16 -fmax-worker-args=16 + + build-depends: + base >=4.8 && <5 + , bytestring >=0.10 && <0.11 + , hpath-posix >=0.13 && <0.14 + , safe-exceptions >=0.1 && <0.2 + , streamly >=0.7 && <0.9 + , streamly-bytestring >=0.1.0.1 && <0.2 + , transformers >=0.5.6.2 && <0.6 + , unix >=2.7 && <2.8 + , word8 >=0.1.3 && <0.2 + if os(windows) - build-depends: unbuildable<0 - buildable: False - exposed-modules: Streamly.External.Posix.DirStream - -- other-modules: - -- other-extensions: - build-depends: base >= 4.8 && < 5 - , bytestring >= 0.10 - , hpath-posix >= 0.13 - , safe-exceptions >= 0.1 - , streamly >= 0.7 - , streamly-bytestring >= 0.1.0.1 - , transformers - , unix >= 2.7 - , word8 >= 0.1.3 - hs-source-dirs: src - default-language: Haskell2010 - GHC-Options: -Wall -O2 -fspec-constr-recursive=16 -fmax-worker-args=16 + buildable: False + build-depends: unbuildable <0 test-suite sf-test - if os(windows) - build-depends: unbuildable<0 - buildable: False - type: exitcode-stdio-1.0 - main-is: Main.hs - hs-source-dirs: test - build-depends: base >= 4.8 && < 5 - , filepath - , hpath-posix >= 0.13 - , hspec - , hspec-discover - , streamly-posix - , temporary - , unix >= 2.7 - default-language: Haskell2010 - GHC-Options: -Wall -threaded -rtsopts -with-rtsopts=-N + type: exitcode-stdio-1.0 + main-is: Main.hs + hs-source-dirs: test + default-language: Haskell2010 + ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N + build-depends: + base >=4.8 && <5 + , filepath >=1.4.2.1 && <1.5 + , hpath-posix >=0.13 && <0.14 + , hspec >=2.8.2 && <2.9 + , hspec-discover >=2.8.2 && <2.9 + , streamly-posix + , temporary >=1.3 && <1.4 + , unix >=2.7 && <2.8 -source-repository head - type: git - location: https://github.com/hasufell/streamly-posix + if os(windows) + buildable: False + build-depends: unbuildable <0