summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenHamlin <>2017-03-28 00:49:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-03-28 00:49:00 (GMT)
commit34dd81301179da132dd2f713e0446de13db1f948 (patch)
tree877eea229844b2142b647b866b596dab79bb766f
parent0051e15bae573e8fd03fd1974ed511299df50647 (diff)
version 0.1.0.30.1.0.3
-rw-r--r--ChangeLog.md8
-rw-r--r--rtnetlink.cabal2
-rw-r--r--src/System/Linux/RTNetlink/Link.hsc2
-rw-r--r--tests/Main.hs9
4 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog.md b/ChangeLog.md
index abf7f3c..a736caf 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,12 +1,16 @@
# Revision history for rtnetlink
+## 0.1.0.2 -- 2017-03-27
+
+* Provide support for `base-4.8.*` by fixing `IsString` ambiguity in `LinkEther`.
+
## 0.1.0.2 -- 2017-03-26
-* Provide support for transformers-0.4.\*
+* Provide support for `transformers-0.4.*`.
## 0.1.0.1 -- 2017-03-25
-* Provide support for base-4.7.\*
+* Provide support for `base-4.7.*`.
## 0.1.0.0 -- 2017-03-24
diff --git a/rtnetlink.cabal b/rtnetlink.cabal
index 253b2df..6334eb2 100644
--- a/rtnetlink.cabal
+++ b/rtnetlink.cabal
@@ -1,5 +1,5 @@
name: rtnetlink
-version: 0.1.0.2
+version: 0.1.0.3
synopsis: Manipulate network devices, addresses, and routes on Linux
description: A high-level, extensible, pure Haskell interface to the
ROUTE_NETLINK subsystem of netlink for manipulating
diff --git a/src/System/Linux/RTNetlink/Link.hsc b/src/System/Linux/RTNetlink/Link.hsc
index 289e793..e5544a2 100644
--- a/src/System/Linux/RTNetlink/Link.hsc
+++ b/src/System/Linux/RTNetlink/Link.hsc
@@ -74,7 +74,7 @@ instance Show LinkEther where
where
hex w = hexdig (w `div` 0x10) : hexdig (w `rem` 0x10) : []
hexdig = (!!) "0123456789abcdef" . fromIntegral
- s <:> t = s ++ ":" ++ t
+ s <:> t = s ++ ":" ++ t :: String
instance Serialize LinkEther where
put (LinkEther a b c d e f) = put a >> put b >> put c >> put d >> put e >> put f
get = LinkEther <$> get <*> get <*> get <*> get <*> get <*> get
diff --git a/tests/Main.hs b/tests/Main.hs
index aac107e..9ae9ef7 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -141,10 +141,11 @@ testCreate = do
context "when given a bad interface index" $ do
it "throws an exception" $ do
- indices <- runRTNL $ dump AnyInterface
- let badIx = maximum indices + 1
- prefix = IfPrefix 24
- interface = IfInetAddress testAddress4 prefix badIx
+ indices <- runRTNL $ dump AnyLink
+ let LinkIndex n = maximum indices + 1
+ badIx = IfIndex n
+ prefix = IfPrefix 24
+ interface = IfInetAddress testAddress4 prefix badIx
runRTNL (create interface) `shouldThrow` anyIOException
context "when given a silly prefix" $ do