diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### 3.9.5 [2023.03.05] +* Allow building with `unix-2.8.*`. + ### 3.9.4 [2022.12.30] * Allow building with `aeson-2.1.*`. diff --git a/src/TextShow/System/Posix.hs b/src/TextShow/System/Posix.hs --- a/src/TextShow/System/Posix.hs +++ b/src/TextShow/System/Posix.hs @@ -23,7 +23,12 @@ #if !defined(mingw32_HOST_OS) import System.Posix.DynamicLinker (RTLDFlags, DL) import System.Posix.Process (ProcessStatus) -import System.Posix.User (GroupEntry, UserEntry) +# if MIN_VERSION_unix(2,8,0) +import System.Posix.User.ByteString +# else +import System.Posix.User +# endif + (GroupEntry, UserEntry) import TextShow.TH (deriveTextShow) diff --git a/tests/Instances/System/Posix.hs b/tests/Instances/System/Posix.hs --- a/tests/Instances/System/Posix.hs +++ b/tests/Instances/System/Posix.hs @@ -29,7 +29,12 @@ import System.Posix.DynamicLinker (RTLDFlags(..), DL(..)) import System.Posix.Process (ProcessStatus(..)) -import System.Posix.User (GroupEntry(..), UserEntry(..)) +# if MIN_VERSION_unix(2,8,0) +import System.Posix.User.ByteString +# else +import System.Posix.User +# endif + (GroupEntry(..), UserEntry(..)) import Test.QuickCheck (Arbitrary(..), arbitraryBoundedEnum) import Test.QuickCheck.Instances () diff --git a/tests/Instances/Trace/Hpc.hs b/tests/Instances/Trace/Hpc.hs --- a/tests/Instances/Trace/Hpc.hs +++ b/tests/Instances/Trace/Hpc.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE TemplateHaskell #-} @@ -31,10 +32,12 @@ import Trace.Hpc.Util (HpcPos, Hash, toHpcPos) $(Generics.deriveAll0 ''BoxLabel) +$(Generics.deriveAll0 ''HpcPos) +#if !(MIN_VERSION_hpc(0,6,2)) $(Generics.deriveAll0 ''Tix) $(Generics.deriveAll0 ''TixModule) -$(Generics.deriveAll0 ''HpcPos) $(Generics.deriveAll0 ''Hash) +#endif instance Arbitrary Mix where arbitrary = Mix <$> arbitrary <*> arbitrary <*> arbitrary diff --git a/tests/Spec/System/PosixSpec.hs b/tests/Spec/System/PosixSpec.hs --- a/tests/Spec/System/PosixSpec.hs +++ b/tests/Spec/System/PosixSpec.hs @@ -25,7 +25,12 @@ import System.Posix.DynamicLinker (RTLDFlags, DL) import System.Posix.Process (ProcessStatus) -import System.Posix.User (GroupEntry, UserEntry) +# if MIN_VERSION_unix(2,8,0) +import System.Posix.User.ByteString +# else +import System.Posix.User +# endif + (GroupEntry, UserEntry) import Test.Hspec (describe) diff --git a/text-show-instances.cabal b/text-show-instances.cabal --- a/text-show-instances.cabal +++ b/text-show-instances.cabal @@ -1,5 +1,5 @@ name: text-show-instances -version: 3.9.4 +version: 3.9.5 synopsis: Additional instances for text-show description: @text-show-instances@ is a supplemental library to @text-show@ that provides additional @Show@ instances for data types in @@ -78,7 +78,9 @@ , GHC == 8.8.4 , GHC == 8.10.7 , GHC == 9.0.2 - , GHC == 9.2.2 + , GHC == 9.2.7 + , GHC == 9.4.4 + , GHC == 9.6.1 extra-source-files: CHANGELOG.md, README.md cabal-version: >=1.10 @@ -125,13 +127,13 @@ TextShow.System.Posix other-modules: TextShow.Utils build-depends: aeson >= 2.0.3 && < 2.2 - , base >= 4.9 && < 4.18 + , base >= 4.9 && < 4.19 , base-compat >= 0.10 && < 1 , bifunctors >= 5.2 && < 6 , binary >= 0.8.3 && < 0.9 , containers >= 0.5.7.1 && < 0.7 , directory >= 1.3 && < 1.4 - , ghc-boot-th >= 8.0 && < 9.5 + , ghc-boot-th >= 8.0 && < 9.7 , haskeline >= 0.7.3 && < 0.9 , hpc >= 0.6 && < 0.7 , old-locale >= 1 && < 1.1 @@ -141,7 +143,7 @@ , scientific >= 0.3.7 && < 0.4 , semigroups >= 0.16.2 && < 1 , tagged >= 0.4.4 && < 1 - , template-haskell >= 2.11 && < 2.20 + , template-haskell >= 2.11 && < 2.21 , text >= 0.11.1 && < 2.1 , text-short >= 0.1 && < 0.2 , text-show >= 3.4 && < 4 @@ -161,7 +163,7 @@ build-depends: Win32 >= 2.3.1.1 && < 2.13 else build-depends: terminfo >= 0.4 && < 0.5 - , unix >= 2.7 && < 2.8 + , unix >= 2.7 && < 2.9 test-suite spec type: exitcode-stdio-1.0 @@ -233,14 +235,14 @@ Spec.System.Console.TerminfoSpec Spec.System.PosixSpec build-depends: aeson >= 2.0.3 && < 2.2 - , base >= 4.9 && < 4.18 + , base >= 4.9 && < 4.19 , base-compat >= 0.10 && < 1 , bifunctors >= 5.5.5 && < 6 , binary >= 0.8.3 && < 0.9 , containers >= 0.5.7.1 && < 0.7 , directory >= 1.3 && < 1.4 , generic-deriving >= 1.9 && < 2 - , ghc-boot-th >= 8.0 && < 9.5 + , ghc-boot-th >= 8.0 && < 9.7 , ghc-prim , haskeline >= 0.7.3 && < 0.9 , hpc >= 0.6 && < 0.7 @@ -253,7 +255,7 @@ , random >= 1.0.1 && < 1.3 , tagged >= 0.4.4 && < 1 , scientific >= 0.3.7 && < 0.4 - , template-haskell >= 2.11 && < 2.20 + , template-haskell >= 2.11 && < 2.21 , text-short >= 0.1 && < 0.2 , text-show >= 3.10 && < 4 , text-show-instances @@ -279,4 +281,4 @@ build-depends: Win32 >= 2.3.1.1 && < 2.13 else build-depends: terminfo >= 0.4 && < 0.5 - , unix >= 2.7 && < 2.8 + , unix >= 2.7 && < 2.9