diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +0.3.7.5 (2021-xx-xx): + - Updating maintainer emails/urls + - Removed the __HADDOCK__ hack + - Generally cleaning up old cruft +0.3.7.4 (2021-10-16): + - Started using GithubActions for CI. + - Corrected parsing errors with newer GHC. 0.3.7.3 (2015-05-30): - Moved VERSION to CHANGELOG 0.3.7 (2013-08-08): diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -23,23 +23,11 @@ In general, this is a simple package and should be easy to install. You must have hsc2hs installed in order to compile the package (but then you probably already do). With the cabal-install program you -can just do: +can just do the standard: $> cabal install unix-bytestring -Or if you don't have cabal-install, then you can use the Cabal library: - $> runhaskell Setup.hs configure - $> runhaskell Setup.hs build - $> runhaskell Setup.hs test - $> runhaskell Setup.hs haddock --hyperlink-source - $> runhaskell Setup.hs copy - $> runhaskell Setup.hs register - -The test step is optional and currently does nothing. The Haddock -step is also optional. - - ### FFI Problems The unix-bytestring package uses standard POSIX header files @@ -106,11 +94,8 @@ ## Links -* [Website](http://cl.indiana.edu/~wren/) +* [Website](http://wrengr.org/) * [Blog](http://winterkoninkje.dreamwidth.org/) * [Twitter](https://twitter.com/wrengr) * [Hackage](http://hackage.haskell.org/package/unix-bytestring) -* [Darcs](http://code.haskell.org/~wren/unix-bytestring) -* [GitHub (clone)](https://github.com/wrengr/unix-bytestring) -* [Haddock (Darcs version) - ](http://code.haskell.org/~wren/unix-bytestring/dist/doc/html/unix-bytestring) +* [GitHub](https://github.com/wrengr/unix-bytestring) diff --git a/src/Foreign/C/Error/Safe.hs b/src/Foreign/C/Error/Safe.hs --- a/src/Foreign/C/Error/Safe.hs +++ b/src/Foreign/C/Error/Safe.hs @@ -1,12 +1,12 @@ {-# OPTIONS_GHC -Wall -fwarn-tabs #-} ---------------------------------------------------------------- --- 2012.02.21 +-- 2021.10.17 -- | -- Module : Foreign.C.Error.Safe --- Copyright : Copyright (c) 2010--2015 wren gayle romano +-- Copyright : Copyright (c) 2010--2021 wren gayle romano -- License : BSD --- Maintainer : wren@community.haskell.org +-- Maintainer : wren@cpan.org -- Stability : provisional -- Portability : portable (H98+FFI) -- diff --git a/src/System/Posix/IO/ByteString.hsc b/src/System/Posix/IO/ByteString.hsc --- a/src/System/Posix/IO/ByteString.hsc +++ b/src/System/Posix/IO/ByteString.hsc @@ -24,12 +24,12 @@ {-# LANGUAGE ForeignFunctionInterface #-} {-# OPTIONS_GHC -fwarn-tabs #-} ---------------------------------------------------------------- --- 2021.10.16 +-- 2021.10.17 -- | -- Module : System.Posix.IO.ByteString -- Copyright : Copyright (c) 2010--2021 wren gayle romano -- License : BSD --- Maintainer : wren@community.haskell.org +-- Maintainer : wren@cpan.org -- Stability : experimental -- Portability : non-portable (POSIX.1, XPG4.2; hsc2hs, FFI) -- diff --git a/src/System/Posix/IO/ByteString/Lazy.hs b/src/System/Posix/IO/ByteString/Lazy.hs --- a/src/System/Posix/IO/ByteString/Lazy.hs +++ b/src/System/Posix/IO/ByteString/Lazy.hs @@ -1,12 +1,12 @@ {-# OPTIONS_GHC -Wall -fwarn-tabs #-} -- TODO: cf ---------------------------------------------------------------- --- 2011.03.17 +-- 2021.10.17 -- | -- Module : System.Posix.IO.ByteString.Lazy --- Copyright : Copyright (c) 2010--2015 wren gayle romano +-- Copyright : Copyright (c) 2010--2021 wren gayle romano -- License : BSD --- Maintainer : wren@community.haskell.org +-- Maintainer : wren@cpan.org -- Stability : experimental -- Portability : non-portable (requires POSIX.1, XPG4.2) -- diff --git a/src/System/Posix/Types/Iovec.hsc b/src/System/Posix/Types/Iovec.hsc --- a/src/System/Posix/Types/Iovec.hsc +++ b/src/System/Posix/Types/Iovec.hsc @@ -1,18 +1,12 @@ --- The -fno-warn-unused-imports flag is to avoid the need for a --- special Setup.hs in order to use __HADDOCK__ to conditionally --- import Foreign.C.String.CStringLen only for the sake of Haddock. --- We avoid the special Setup.hs because in GHC 7.6 the prelude no --- longer exports 'catch', and it's not entirely clear what sort --- of exceptions from 'removeFile' actually need handling. {-# LANGUAGE ForeignFunctionInterface #-} -{-# OPTIONS_GHC -Wall -fwarn-tabs -fno-warn-unused-imports #-} +{-# OPTIONS_GHC -Wall -fwarn-tabs #-} ---------------------------------------------------------------- --- 2013.05.29 +-- 2021.10.17 -- | -- Module : System.Posix.Types.Iovec --- Copyright : Copyright (c) 2010--2015 wren gayle romano +-- Copyright : Copyright (c) 2010--2021 wren gayle romano -- License : BSD --- Maintainer : wren@community.haskell.org +-- Maintainer : wren@cpan.org -- Stability : experimental -- Portability : non-portable (POSIX.1, XPG4.2; hsc2hs, FFI) -- @@ -42,12 +36,6 @@ import Foreign.C.Types (CSize) import Foreign.Storable (Storable(..)) --- N.B., we need a Custom cabal build-type in order for this to --- work. --- #ifdef __HADDOCK__ -import Foreign.C.String (CStringLen) --- #endif - -- iovec, writev, and readv are in , but we must include -- and for legacy reasons. #include @@ -57,8 +45,8 @@ ---------------------------------------------------------------- -- | Haskell type representing the C @struct iovec@ type. This is --- exactly like @'CStringLen'@ except there's actually struct --- definition on the C side. +-- exactly like 'Foreign.C.String.CStringLen' except there's actually +-- struct definition on the C side. data CIovec = CIovec { iov_base :: {-# UNPACK #-} !(Ptr Word8) -- char* or void* , iov_len :: {-# UNPACK #-} !CSize -- size_t @@ -69,14 +57,14 @@ instance Storable CIovec where alignment _ = #{alignment struct iovec} - + sizeOf _ = #{size struct iovec} - + peek ptr = do base <- #{peek struct iovec, iov_base} ptr len <- #{peek struct iovec, iov_len} ptr return (CIovec base len) - + poke ptr (CIovec base len) = do #{poke struct iovec, iov_base} ptr base #{poke struct iovec, iov_len} ptr len @@ -144,7 +132,7 @@ This definition is essentially verbatim 'BS.useAsCStringLen'. We can save two 'FFI.castPtr' and one 'fromIntegral' if we instead do an essentially verbatim 'BS.useAsCString': - + useAsCIovec s@(BSI.PS fptr offset len) io = do let lenCSize = fromIntegral len FMA.allocaBytes (len+1) $ \buf -> diff --git a/unix-bytestring.cabal b/unix-bytestring.cabal --- a/unix-bytestring.cabal +++ b/unix-bytestring.cabal @@ -1,5 +1,5 @@ ---------------------------------------------------------------- --- wren gayle romano ~ 2021.10.16 +-- wren gayle romano ~ 2021.10.17 ---------------------------------------------------------------- -- Cabal >=1.10 is required by Hackage. @@ -7,13 +7,13 @@ Build-Type: Simple Name: unix-bytestring -Version: 0.3.7.4 +Version: 0.3.7.5 Stability: provisional -Homepage: http://code.haskell.org/~wren/ -Bug-Reports: http://github.com/wrengr/unix-bytestring/issues +Homepage: https://wrengr.org/software/hackage.html +Bug-Reports: https://github.com/wrengr/unix-bytestring/issues Author: wren gayle romano -Maintainer: wren@community.haskell.org -Copyright: Copyright (c) 2010--2021 wren gayle romano +Maintainer: wren@cpan.org +Copyright: Copyright (c) 2010–2021 wren gayle romano License: BSD3 License-File: LICENSE @@ -48,8 +48,8 @@ GHC ==9.0.1 Source-Repository head - Type: darcs - Location: http://community.haskell.org/~wren/unix-bytestring + Type: git + Location: https://github.com/wrengr/unix-bytestring.git ---------------------------------------------------------------- Library