unix 2.8.4.0 → 2.8.5.0
raw patch · 7 files changed
+55/−9 lines, 7 filesdep +os-stringdep ~filepathdep ~time
Dependencies added: os-string
Dependency ranges changed: filepath, time
Files
- System/Posix/Env/PosixString.hsc +6/−1
- System/Posix/PosixPath/FilePath.hsc +6/−1
- System/Posix/Process/PosixString.hsc +6/−1
- System/Posix/Temp/PosixString.hsc +6/−1
- changelog.md +4/−0
- tests/T13660.hs +6/−1
- unix.cabal +21/−4
System/Posix/Env/PosixString.hsc view
@@ -1,4 +1,5 @@ {-# LANGUAGE CApiFFI #-}+{-# LANGUAGE PackageImports #-} ----------------------------------------------------------------------------- -- |@@ -42,7 +43,11 @@ import System.Posix.Env ( clearEnv ) import System.OsPath.Posix import System.OsString.Internal.Types-import qualified System.OsPath.Data.ByteString.Short as B+#if MIN_VERSION_filepath(1, 5, 0)+import qualified "os-string" System.OsString.Data.ByteString.Short as B+#else+import qualified "filepath" System.OsPath.Data.ByteString.Short as B+#endif import Data.ByteString.Short.Internal ( copyToPtr ) import qualified System.Posix.Env.Internal as Internal
System/Posix/PosixPath/FilePath.hsc view
@@ -1,6 +1,7 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE PatternSynonyms #-}+{-# LANGUAGE PackageImports #-} ----------------------------------------------------------------------------- -- |@@ -45,7 +46,11 @@ import Control.Monad import Control.Exception import System.OsPath.Posix as PS-import System.OsPath.Data.ByteString.Short as BSS+#if MIN_VERSION_filepath(1, 5, 0)+import "os-string" System.OsString.Data.ByteString.Short as BSS+#else+import "filepath" System.OsPath.Data.ByteString.Short as BSS+#endif import Prelude hiding (FilePath) import System.OsString.Internal.Types (PosixString(..), pattern PS) import GHC.IO.Exception
System/Posix/Process/PosixString.hsc view
@@ -1,3 +1,4 @@+{-# LANGUAGE PackageImports #-} ----------------------------------------------------------------------------- -- | -- Module : System.Posix.Process.PosixString@@ -79,7 +80,11 @@ import System.OsPath.Types import System.OsString.Internal.Types (PosixString(..))-import qualified System.OsPath.Data.ByteString.Short as BC+#if MIN_VERSION_filepath(1, 5, 0)+import qualified "os-string" System.OsString.Data.ByteString.Short as BC+#else+import qualified "filepath" System.OsPath.Data.ByteString.Short as BC+#endif import System.Posix.PosixPath.FilePath
System/Posix/Temp/PosixString.hsc view
@@ -1,4 +1,5 @@ {-# LANGUAGE CApiFFI #-}+{-# LANGUAGE PackageImports #-} ----------------------------------------------------------------------------- -- | -- Module : System.Posix.Temp.PosixString@@ -20,7 +21,11 @@ #include "HsUnix.h" -import qualified System.OsPath.Data.ByteString.Short as BC+#if MIN_VERSION_filepath(1, 5, 0)+import qualified "os-string" System.OsString.Data.ByteString.Short as BC+#else+import qualified "filepath" System.OsPath.Data.ByteString.Short as BC+#endif import Data.Word import Foreign.C
changelog.md view
@@ -1,5 +1,9 @@ # Changelog for [`unix` package](http://hackage.haskell.org/package/unix) +## 2.8.5.0 *Dec 2023*++ * allow building with newer filepath/os-string+ ## 2.8.4.0 *Dec 2023* * add `haveStatx`
tests/T13660.hs view
@@ -1,5 +1,6 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE PackageImports #-} module Main where @@ -15,7 +16,11 @@ import System.Posix.ByteString.FilePath import qualified Data.ByteString.Char8 as C-import qualified System.OsPath.Data.ByteString.Short as SBS+#if MIN_VERSION_filepath(1, 5, 0)+import qualified "os-string" System.OsString.Data.ByteString.Short as SBS+#else+import qualified "filepath" System.OsPath.Data.ByteString.Short as SBS+#endif import qualified System.Posix.Env.PosixString as PS import qualified System.Posix.IO.PosixString as PS import qualified System.Posix.IO.ByteString as BS
unix.cabal view
@@ -1,6 +1,6 @@ cabal-version: 1.12 name: unix-version: 2.8.4.0+version: 2.8.5.0 -- NOTE: Don't forget to update ./changelog.md license: BSD3@@ -45,6 +45,11 @@ include/HsUnixConfig.h unix.buildinfo +flag os-string+ description: Use the new os-string package+ default: False+ manual: False+ source-repository head type: git location: https://github.com/haskell/unix.git@@ -71,9 +76,13 @@ build-depends: base >= 4.12.0.0 && < 4.20, bytestring >= 0.9.2 && < 0.13,- filepath >= 1.4.100.0 && < 1.5, time >= 1.9.1 && < 1.13 + if flag(os-string)+ build-depends: filepath >= 1.5.0.0, os-string >= 2.0.0+ else+ build-depends: filepath >= 1.4.100.0 && < 1.5.0.0+ exposed-modules: System.Posix System.Posix.ByteString@@ -172,7 +181,11 @@ Signals001 type: exitcode-stdio-1.0 default-language: Haskell2010- build-depends: base, bytestring, filepath, tasty, tasty-hunit, tasty-quickcheck, unix+ build-depends: base, bytestring, tasty, tasty-hunit, tasty-quickcheck, unix+ if flag(os-string)+ build-depends: filepath >= 1.5.0.0, os-string >= 2.0.0+ else+ build-depends: filepath >= 1.4.100.0 && < 1.5.0.0 ghc-options: -Wall -with-rtsopts=-V0 test-suite FdReadBuf001@@ -362,5 +375,9 @@ main-is: T13660.hs type: exitcode-stdio-1.0 default-language: Haskell2010- build-depends: base, unix, filepath >= 1.4.100.0 && < 1.5, bytestring+ build-depends: base, unix, bytestring+ if flag(os-string)+ build-depends: filepath >= 1.5.0.0, os-string >= 2.0.0+ else+ build-depends: filepath >= 1.4.100.0 && < 1.5.0.0 ghc-options: -Wall