summaryrefslogtreecommitdiff
path: root/standalone/android/haskell-patches/uuid_build-without-v1-uuid-which-needs-network-info.patch
blob: 12cb2a922c080ec08dfe9756d58befb630e073af (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
From 87283f9b6f992a7f0e36c7b1bafc288bf2bf106a Mon Sep 17 00:00:00 2001
From: androidbuilder <androidbuilder@example.com>
Date: Mon, 11 Nov 2013 02:46:27 +0000
Subject: [PATCH] build without v1 uuid which needs network-ino

---
 Data/UUID/Util.hs |   11 -----------
 Data/UUID/V1.hs   |    2 --
 uuid.cabal        |    2 --
 3 files changed, 15 deletions(-)

diff --git a/Data/UUID/Util.hs b/Data/UUID/Util.hs
index 581391a..399e508 100644
--- a/Data/UUID/Util.hs
+++ b/Data/UUID/Util.hs
@@ -3,7 +3,6 @@ module Data.UUID.Util (
     UnpackedUUID(..)
   , unpack, pack
   , version
-  , extractMac
   , extractTime
   , setTime
   ) where
@@ -13,7 +12,6 @@ import Data.Word
 import Data.Word.Util
 import Data.Bits
 import Data.UUID.Internal
-import Network.Info
 import Data.Int (Int64)
 
 version :: UUID -> Int
@@ -43,12 +41,3 @@ extractTime uuid =
 timeAndVersionToTime :: Word16 -> Word16
 timeAndVersionToTime tv = tv .&. 0x0FFF
 
-extractMac :: UUID -> Maybe MAC
-extractMac uuid = 
-  if version uuid == 1
-  then Just $ 
-       MAC (node_0 unpacked) (node_1 unpacked) (node_2 unpacked) (node_3 unpacked) (node_4 unpacked) (node_5 unpacked)
-  else Nothing
-  where
-    unpacked = unpack uuid
-
diff --git a/Data/UUID/V1.hs b/Data/UUID/V1.hs
index 067e729..ca4c235 100644
--- a/Data/UUID/V1.hs
+++ b/Data/UUID/V1.hs
@@ -37,8 +37,6 @@ import System.IO.Unsafe
 
 import qualified System.Random as R
 
-import Network.Info
-
 import Data.UUID.Builder
 import Data.UUID.Internal
 
diff --git a/uuid.cabal b/uuid.cabal
index 0a53059..57b1b86 100644
--- a/uuid.cabal
+++ b/uuid.cabal
@@ -32,14 +32,12 @@ Library
                 cryptohash >= 0.7 && < 0.12,
                 deepseq == 1.3.*,
                 hashable (>= 1.1.1.0 && < 1.2.0) || (>= 1.2.1 && < 1.3),
-                network-info == 0.2.*,
                 random >= 1.0.1 && < 1.1,
                 time >= 1.1 && < 1.5
 
  Exposed-Modules:
    Data.UUID
    Data.UUID.Util
-   Data.UUID.V1
    Data.UUID.V3
    Data.UUID.V4
    Data.UUID.V5
-- 
1.7.10.4