iproute 1.6.0 → 1.7.0
raw patch · 3 files changed
+18/−41 lines, 3 filesdep −ghc-primdep ~basePVP ok
version bump matches the API change (PVP)
Dependencies removed: ghc-prim
Dependency ranges changed: base
API changes (from Hackage documentation)
Files
- Data/IP/Addr.hs +7/−16
- Data/IP/Range.hs +7/−14
- iproute.cabal +4/−11
Data/IP/Addr.hs view
@@ -1,20 +1,21 @@-{-# LANGUAGE CPP #-}+{-# LANGUAGE DeriveDataTypeable #-}+{-# LANGUAGE DeriveGeneric #-} module Data.IP.Addr where import Control.Monad import Data.Bits import Data.Char+import Data.Data (Data) import Data.List (foldl', intersperse) import Data.String+import Data.Typeable (Typeable) import Data.Word import Network.Socket import Numeric (showHex, showInt) import System.ByteOrder import Text.Appar.String import GHC.Enum (succError,predError)-#ifdef GENERICS import GHC.Generics-#endif ---------------------------------------------------------------- @@ -30,9 +31,7 @@ data IP = IPv4 { ipv4 :: IPv4 } | IPv6 { ipv6 :: IPv6 }-#ifdef GENERICS- deriving (Generic)-#endif+ deriving (Data,Generic,Typeable) {-| Equality over IP addresses. Correctly compare IPv4 and IPv4-embedded-in-IPv6 addresses.@@ -85,11 +84,7 @@ 192.0.2.1 -} newtype IPv4 = IP4 IPv4Addr-#ifdef GENERICS- deriving (Eq, Ord, Bounded, Generic)-#else- deriving (Eq, Ord, Bounded)-#endif+ deriving (Eq, Ord, Bounded, Data, Generic, Typeable) {-| The abstract data type to express an IPv6 address.@@ -111,11 +106,7 @@ ::1 -} newtype IPv6 = IP6 IPv6Addr-#ifdef GENERICS- deriving (Eq, Ord, Bounded, Generic)-#else- deriving (Eq, Ord, Bounded)-#endif+ deriving (Eq, Ord, Bounded, Data, Generic, Typeable) ----------------------------------------------------------------
Data/IP/Range.hs view
@@ -1,16 +1,17 @@-{-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE CPP #-}+{-# LANGUAGE DeriveDataTypeable #-}+{-# LANGUAGE DeriveGeneric #-}+{-# LANGUAGE FlexibleInstances #-} module Data.IP.Range where import Control.Monad import Data.Bits+import Data.Data (Data) import Data.IP.Addr import Data.IP.Mask import Data.String+import Data.Typeable (Typeable) import Text.Appar.String-#ifdef GENERICS import GHC.Generics-#endif ---------------------------------------------------------------- @@ -27,11 +28,7 @@ data IPRange = IPv4Range { ipv4range :: AddrRange IPv4 } | IPv6Range { ipv6range :: AddrRange IPv6 }-#ifdef GENERICS- deriving (Eq, Ord, Generic)-#else- deriving (Eq, Ord)-#endif+ deriving (Eq, Ord, Data, Generic, Typeable) ---------------------------------------------------------------- --@@ -60,11 +57,7 @@ -- |The 'mlen' function returns a mask length from 'AddrRange'. , mlen :: {-# UNPACK #-} !Int }-#ifdef GENERICS- deriving (Eq, Ord, Generic)-#else- deriving (Eq, Ord)-#endif+ deriving (Eq, Ord, Data, Generic, Typeable) ---------------------------------------------------------------- --
iproute.cabal view
@@ -1,5 +1,5 @@ Name: iproute-Version: 1.6.0+Version: 1.7.0 Author: Kazu Yamamoto <kazu@iij.ad.jp> Maintainer: Kazu Yamamoto <kazu@iij.ad.jp> License: BSD3@@ -26,26 +26,19 @@ Data.IP.Op Data.IP.Range Data.IP.RouteTable.Internal- Build-Depends: base >= 4 && < 5+ Build-Depends: base >= 4.6 && < 5 , appar , byteorder , containers , network -- if impl(ghc >= 7.2.1)- cpp-options: -DGENERICS- default-extensions: DeriveGeneric- if impl(ghc >= 7.2.1) && impl(ghc < 7.6.1)- build-depends: ghc-prim >= 0.2- Test-Suite doctest Type: exitcode-stdio-1.0 Default-Language: Haskell2010 HS-Source-Dirs: test Ghc-Options: -threaded -Wall Main-Is: doctests.hs- Build-Depends: base+ Build-Depends: base >= 4.6 && < 5 , doctest >= 0.9.3 Test-Suite spec@@ -56,7 +49,7 @@ Main-Is: Spec.hs Other-Modules: RouteTableSpec , IPSpec- Build-Depends: base+ Build-Depends: base >= 4.6 && < 5 , hspec , QuickCheck , appar