cblrepo 0.15.0 → 0.15.1

raw patch · 3 files changed

+19/−7 lines, 3 files

Files

cblrepo.cabal +1/−1
src/OldPkgDB.hs +9/−3
src/PkgDB.hs +9/−3

cblrepo.cabal view

@@ -1,5 +1,5 @@ name: cblrepo-version: 0.15.0+version: 0.15.1 cabal-version: >= 1.6 license: OtherLicense license-file: LICENSE-2.0

src/OldPkgDB.hs view

@@ -29,7 +29,7 @@ import qualified Distribution.Package as P import qualified Distribution.Version as V -import Data.Aeson (decode, encode)+import Data.Aeson import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..)) import qualified Data.ByteString.Lazy.Char8 as C @@ -192,8 +192,14 @@ -- {{{1 JSON instances $(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''V.Version) $(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''V.VersionRange)-$(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''P.Dependency)-$(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''P.PackageName) $(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''FlagName) $(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''Pkg) $(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''CblPkg)++instance ToJSON P.Dependency where+    toJSON (P.Dependency pn vr) = toJSON (P.unPackageName pn, vr)++instance FromJSON P.Dependency where+    parseJSON v = do+        (pn, vr) <- parseJSON v+        return $ P.Dependency (P.PackageName pn) vr

src/PkgDB.hs view

@@ -60,7 +60,7 @@ import qualified Distribution.Package as P import qualified Distribution.Version as V -import Data.Aeson (decode, encode)+import Data.Aeson import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..)) import qualified Data.ByteString.Lazy.Char8 as C @@ -243,8 +243,14 @@ -- {{{1 JSON instances $(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''V.Version) $(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''V.VersionRange)-$(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''P.Dependency)-$(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''P.PackageName) $(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''FlagName) $(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''Pkg) $(deriveJSON defaultOptions { sumEncoding = ObjectWithSingleField, allNullaryToStringTag = False } ''CblPkg)++instance ToJSON P.Dependency where+    toJSON (P.Dependency pn vr) = toJSON (P.unPackageName pn, vr)++instance FromJSON P.Dependency where+    parseJSON v = do+        (pn, vr) <- parseJSON v+        return $ P.Dependency (P.PackageName pn) vr