@@ -35,7 +35,6 @@ data BuildPlan desc = BuildPlan
3535 { bpCore :: Map PackageName Version
3636 , bpTools :: Vector (PackageName, Version)
3737 , bpExtra :: Map PackageName (PackageBuild desc)
38− , bpGlobalFlags :: Map FlagName Bool
3938 }
4039 deriving (Functor, Foldable, Traversable, Show, Eq)
4140type instance Element (BuildPlan desc) = desc
@@ -48,7 +47,6 @@ instance ToJSON (BuildPlan desc) where
4847 [ "core" .= asMap (mapFromList $ map toCore $ mapToList bpCore)
4948 , "tools" .= map goTool bpTools
5049 , "extra" .= Map.mapKeysWith const (unPackageName) bpExtra
51− , "global-flags" .= Map.mapKeysWith const (\(FlagName f) -> f) bpGlobalFlags
5250 ]
5351 where
5452 toCore (x, y) = (asText $ display x, asText $ display y)
@@ -61,7 +59,6 @@ instance desc ~ () => FromJSON (BuildPlan desc) where
6159 <$> ((o .: "core") >>= goCore)
6260 <*> ((o .: "tools") >>= mapM goTool)
6361 <*> (goExtra <$> (o .: "extra"))
64− <*> (goFlags <$> (o .: "global-flags"))
6562 where
6663 goCore =
6764 fmap mapFromList . mapM goCore' . mapToList . asHashMap
@@ -78,7 +75,6 @@ instance desc ~ () => FromJSON (BuildPlan desc) where
7875 either (fail . show) return . simpleParse . asText)
7976
8077 goExtra = Map.mapKeysWith const PackageName
81− goFlags = Map.mapKeysWith const FlagName
8278
8379data PackageBuild desc = PackageBuild
8480 { pbVersion :: Version
@@ -166,7 +162,6 @@ newBuildPlan = liftIO $ do
166162 { bpCore = core
167163 , bpTools = tools
168164 , bpExtra = extra
169− , bpGlobalFlags = defaultGlobalFlags
170165 }
171166
172167makeToolMap :: Map PackageName (PackageBuild FlatComponent)