i2p elements are optional
authorEugene Crosser <crosser@average.org>
Sun, 20 Apr 2014 21:22:06 +0000 (01:22 +0400)
committerEugene Crosser <crosser@average.org>
Sun, 20 Apr 2014 21:22:06 +0000 (01:22 +0400)
NmcDom.hs
build

index 477def1b8b2418a7202b429d9cc864096fea9bd6..3ab8c7fd40aa6213e8e47f63459a9fac296edeb1 100644 (file)
--- a/NmcDom.hs
+++ b/NmcDom.hs
@@ -81,16 +81,16 @@ instance Mergeable NmcRRService where
         merge _ b = b
 
 data NmcRRI2p = NmcRRI2p
-                        { i2pDestination :: String
-                        , i2pName        :: String
-                        , i2pB32         :: String
+                        { i2pDestination :: Maybe String
+                        , i2pName        :: Maybe String
+                        , i2pB32         :: Maybe String
                         } deriving (Show, Eq)
 
 instance FromJSON NmcRRI2p where
         parseJSON (Object o) = NmcRRI2p
-                <$> o .: "destination"
-                <*> o .: "name"
-                <*> o .: "b32"
+                <$> o .:? "destination"
+                <*> o .:? "name"
+                <*> o .:? "b32"
         parseJSON _ = empty
 
 instance Mergeable NmcRRI2p where
diff --git a/build b/build
index 319e038d4041bdf6992342cf6332bde4b05c6e1d..c77b02430371ca51ce57b72380f889e7f321a99d 100755 (executable)
--- a/build
+++ b/build
@@ -5,7 +5,8 @@ sfx="linux-glibc6.`uname -m`.`date +%Y-%m-%d`.git-`git rev-parse --verify HEAD |
 echo "Making $file.$sfx"
 
 # tried this:
-#ghc --make -static -optc-static -optl-shared-libgcc -optl-static -optl-pthread
+#ghc --make -static -optc-static -optl-shared-libgcc -optl-static \
+#           -optl-pthread -pgml g++ "$file"
 # but cannot make it "only glibc is shared". And with static glibc,
 # getaddrinfo does not work on systems with different glibc.
 ghc --make "$file"