Better flags serialization

Stackage2/BuildPlan.hs

@@ -260,6 +260,7 @@ mkPackageBuild gpd = do
     let overrides = packageFlags name ++ defaultGlobalFlags
         getFlag MkFlag {..} =
             (flagName, fromMaybe flagDefault $ lookup flagName overrides)
+        flags = mapFromList $ map getFlag $ genPackageFlags gpd
     desc <- getFlattenedComponent
         CheckCond
             { ccPackageName = name
@@ -267,7 +268,7 @@ mkPackageBuild gpd = do
             , ccArch = Distribution.System.X86_64
             , ccCompilerFlavor = Distribution.Compiler.GHC
             , ccCompilerVersion = ghcVerCabal
-            , ccFlags = mapFromList $ map getFlag $ genPackageFlags gpd
+            , ccFlags = flags
             }
         (tryBuildTest name)
         (tryBuildBenchmark name)
@@ -277,7 +278,7 @@ mkPackageBuild gpd = do
         , pbMaintainer = fmap snd $ lookup name $ pcPackages defaultPackageConstraints
         , pbGithubPings = getGithubPings gpd
         , pbUsers = mempty -- must be filled in later
-        , pbFlags = packageFlags name
+        , pbFlags = flags
         , pbTestState =
             case () of
                 ()

Stackage2/CheckBuildPlan.hs

@@ -38,9 +38,10 @@ checkDeps allPackages (user, pb) =
                     (dep, Just version)
                     errMap
       where
-        errMap = singletonMap user range
+        errMap = singletonMap (user, pbVersion pb) range
 
-newtype BadBuildPlan = BadBuildPlan (Map (PackageName, Maybe Version) (Map PackageName VersionRange)) -- FIXME add maintainer and Github ping info
+newtype BadBuildPlan =
+    BadBuildPlan (Map (PackageName, Maybe Version) (Map (PackageName, Version) VersionRange)) -- FIXME add maintainer and Github ping info
     deriving Typeable
 instance Exception BadBuildPlan
 instance Show BadBuildPlan where
@@ -60,10 +61,12 @@ instance Show BadBuildPlan where
             , " depended on by:"
             ]
 
-        showUser :: (PackageName, VersionRange) -> String
-        showUser (user, range) = concat
+        showUser :: ((PackageName, Version), VersionRange) -> String
+        showUser ((user, version), range) = concat
             [ "- "
             , display user
+            , "-"
+            , display version
             , " ("
             , display range
             , ")"