hackage-db 1.9.1 → 1.10

raw patch · 2 files changed

+19/−9 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• hackage-db.cabal +2/−2
• src/Distribution/Hackage/DB/Parsed.hs +17/−7

@@ -1,5 +1,5 @@ Name:                   hackage-db-Version:                1.9.1+Version:                1.10 Copyright:              Peter Simons License:                BSD3 License-File:           LICENSE@@ -7,7 +7,7 @@ Maintainer:             Peter Simons <simons@cryp.to> Homepage:               http://github.com/peti/hackage-db Category:               Distribution-Synopsis:               provide access to the Hackage database via Data.Map+Synopsis:               access Hackage's package database via Data.Map Cabal-Version:          >= 1.6 Build-Type:             Simple Tested-With:            GHC >= 6.10.4 && <= 7.8.3

@@ -12,6 +12,7 @@ module Distribution.Hackage.DB.Parsed   ( Hackage, readHackage, readHackage', parseHackage   , parseUnparsedHackage+  , parsePackage, parsePackage'   )   where @@ -25,9 +26,9 @@ import Distribution.PackageDescription.Parse ( parsePackageDescription, ParseResult(..) ) import Distribution.Text ( display ) --- | A 'Map' representation of the Hackage database. For sake of--- simplicity, we use 'String' rather than 'PackageName' to represent--- the name of a package.+-- | A 'Map' representation of the Hackage database. Every package name+-- maps to a non-empty set of version, and for every version there is a+-- parsed Cabal file.  type Hackage = Map String (Map Version GenericPackageDescription) @@ -56,10 +57,19 @@     parsePackages :: String -> Map Version ByteString -> Map Version GenericPackageDescription     parsePackages name = Data.Map.mapWithKey (parsePackage name) -    parsePackage :: String -> Version -> ByteString -> GenericPackageDescription-    parsePackage name version buf = case parsePackageDescription (decodeUTF8 buf) of-      ParseOk _ a     -> a-      ParseFailed err -> error ("Hackage.DB.parseHackage: cannot parse cabal file " ++ show name ++ "-" ++ display version ++ ": " ++ show err)+-- | Parse a single Cabal file. Failure is reported with 'error'. +parsePackage :: String -> Version -> ByteString -> GenericPackageDescription+parsePackage name version buf = case parsePackage' buf of+                           Right a  -> a+                           Left err -> error $ "cannot parse cabal package " ++ show name ++ "-" ++ display version ++ ": " ++ err++-- | Parse a single Cabal file. Failure is reported with 'fail'.++parsePackage' :: Monad m => ByteString -> m GenericPackageDescription+parsePackage' buf = case parsePackageDescription (decodeUTF8 buf) of+                     ParseOk _ a     -> return a+                     ParseFailed err -> fail (show err)+  where     decodeUTF8 :: ByteString -> String     decodeUTF8 = toString . fromRep . BSC.unpack