git.iko.soy/stackage
on master help sign in
Don't serialize global flags (package flags has all necessary information)
edbff24Michael Snoyman
Stackage2/BuildPlan.hs−5
compare with master
unifiedsplit
@@ -35,7 +35,6 @@ data BuildPlan desc = BuildPlan
35 { bpCore :: Map PackageName Version
35 { bpCore :: Map PackageName Version
36 , bpTools :: Vector (PackageName, Version)
36 , bpTools :: Vector (PackageName, Version)
37 , bpExtra :: Map PackageName (PackageBuild desc)
37 , bpExtra :: Map PackageName (PackageBuild desc)
38− , bpGlobalFlags :: Map FlagName Bool
39 }
38 }
40 deriving (Functor, Foldable, Traversable, Show, Eq)
39 deriving (Functor, Foldable, Traversable, Show, Eq)
41type instance Element (BuildPlan desc) = desc
40type instance Element (BuildPlan desc) = desc
@@ -48,7 +47,6 @@ instance ToJSON (BuildPlan desc) where
48 [ "core" .= asMap (mapFromList $ map toCore $ mapToList bpCore)
47 [ "core" .= asMap (mapFromList $ map toCore $ mapToList bpCore)
49 , "tools" .= map goTool bpTools
48 , "tools" .= map goTool bpTools
50 , "extra" .= Map.mapKeysWith const (unPackageName) bpExtra
49 , "extra" .= Map.mapKeysWith const (unPackageName) bpExtra
51− , "global-flags" .= Map.mapKeysWith const (\(FlagName f) -> f) bpGlobalFlags
52 ]
50 ]
53 where
51 where
54 toCore (x, y) = (asText $ display x, asText $ display y)
52 toCore (x, y) = (asText $ display x, asText $ display y)
@@ -61,7 +59,6 @@ instance desc ~ () => FromJSON (BuildPlan desc) where
61 <$> ((o .: "core") >>= goCore)
59 <$> ((o .: "core") >>= goCore)
62 <*> ((o .: "tools") >>= mapM goTool)
60 <*> ((o .: "tools") >>= mapM goTool)
63 <*> (goExtra <$> (o .: "extra"))
61 <*> (goExtra <$> (o .: "extra"))
64− <*> (goFlags <$> (o .: "global-flags"))
65 where
62 where
66 goCore =
63 goCore =
67 fmap mapFromList . mapM goCore' . mapToList . asHashMap
64 fmap mapFromList . mapM goCore' . mapToList . asHashMap
@@ -78,7 +75,6 @@ instance desc ~ () => FromJSON (BuildPlan desc) where
78 either (fail . show) return . simpleParse . asText)
75 either (fail . show) return . simpleParse . asText)
79
76
80 goExtra = Map.mapKeysWith const PackageName
77 goExtra = Map.mapKeysWith const PackageName
81− goFlags = Map.mapKeysWith const FlagName
82
78
83data PackageBuild desc = PackageBuild
79data PackageBuild desc = PackageBuild
84 { pbVersion :: Version
80 { pbVersion :: Version
@@ -166,7 +162,6 @@ newBuildPlan = liftIO $ do
166 { bpCore = core
162 { bpCore = core
167 , bpTools = tools
163 , bpTools = tools
168 , bpExtra = extra
164 , bpExtra = extra
169− , bpGlobalFlags = defaultGlobalFlags
170 }
165 }
171
166
172makeToolMap :: Map PackageName (PackageBuild FlatComponent)
167makeToolMap :: Map PackageName (PackageBuild FlatComponent)