Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use more exact package dependencies and remove the need for CPP args

  • Loading branch information...
commit 9f06ef8cd2ef179ab81f1283b5931ff24e9ced80 1 parent 7968010
Johan Tibell authored
Showing with 6 additions and 14 deletions.
  1. +1 −1  Network.hs
  2. +3 −3 Network/URI.hs
  3. +2 −10 network.cabal
View
2  Network.hs
@@ -442,7 +442,7 @@ the POSIX library:
-}
catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a
-#ifdef BASE4
+#if MIN_VERSION_base(4,0,0)
catchIO = Exception.catch
#else
catchIO = Exception.catchJust Exception.ioErrors
View
6 Network/URI.hs
@@ -125,11 +125,11 @@ import Control.Monad( MonadPlus(..) )
#ifdef __GLASGOW_HASKELL__
import Data.Typeable ( Typeable )
-#ifdef BASE4
+# if MIN_VERSION_base(4,0,0)
import Data.Data ( Data )
-#else
+# else
import Data.Generics ( Data )
-#endif
+# endif
#else
import Data.Typeable ( Typeable(..), TyCon, mkTyCon, mkTyConApp )
#endif
View
12 network.cabal
@@ -21,8 +21,6 @@ extra-source-files:
homepage: http://github.com/haskell/network
bug-reports: http://trac.haskell.org/network/
-flag base4
-
library
exposed-modules:
Network
@@ -41,20 +39,14 @@ library
Network.Socket.ByteString.MsgHdr
build-depends:
- base < 5,
+ base >= 3 && < 4.4,
bytestring < 1.0,
- parsec
+ parsec >= 2.0 && < 3.1.1
if !os(windows)
build-depends:
unix >= 2 && < 3
- if flag(base4)
- build-depends: base >= 4 && < 4.4
- cpp-options: -DBASE4
- else
- build-depends: base<4
-
extensions:
CPP, DeriveDataTypeable, ForeignFunctionInterface, TypeSynonymInstances
include-dirs: include
Please sign in to comment.
Something went wrong with that request. Please try again.