@@ -183,12 +183,16 @@ main = do
184 void $ runParIO $ flip parMapM snapshots $ \Snapshot {..} -> liftIO $ do
184 void $ runParIO $ flip parMapM snapshots $ \Snapshot {..} -> liftIO $ do
185 let allPackages :: PackageSet
185 let allPackages :: PackageSet
186− allPackages = Map.delete "Cabal" $ Map.delete "rts" $ Map.fromList
186+ allPackages = Map.difference
187− [ (name, Stackage.version spec) | (PackageName name, spec) <- Map.toList packages ] `Map.union` generatedDefaultPackageSet
187+ (Map.fromList [ (name, Stackage.version spec) | (PackageName name, spec) <- Map.toList packages ] `Map.union` generatedDefaultPackageSet)
189 ltsConfigFile :: FilePath
190 ltsConfigFile :: FilePath
190 ltsConfigFile = nixpkgsRepository </> "pkgs/development/haskell-modules/configuration-" ++ show (pPrint snapshot) ++ ".nix"
191 ltsConfigFile = nixpkgsRepository </> "pkgs/development/haskell-modules/configuration-" ++ show (pPrint snapshot) ++ ".nix"
193+ corePackages' :: PackageSet
194+ corePackages' = Map.mapKeys unPackageName corePackages `Map.union` Map.fromList [("Cabal", Version [] []), ("rts", Version [] [])]
192 withFile ltsConfigFile WriteMode $ \h -> do
196 withFile ltsConfigFile WriteMode $ \h -> do
193 hPutStrLn h "{ pkgs }:"
197 hPutStrLn h "{ pkgs }:"
194 hPutStrLn h ""
198 hPutStrLn h ""
@@ -197,7 +201,7 @@ main = do
197 hPutStrLn h ("self: super: assert super.ghc.name == " ++ show (display compiler) ++ "; {")
201 hPutStrLn h ("self: super: assert super.ghc.name == " ++ show (display compiler) ++ "; {")
198 hPutStrLn h ""
202 hPutStrLn h ""
199 hPutStrLn h " # core libraries provided by the compiler"
203 hPutStrLn h " # core libraries provided by the compiler"
200− forM_ (Map.keys (Map.insert (PackageName "rts") (Version [] []) (Map.insert (PackageName "Cabal") (Version [] []) corePackages))) $ \(PackageName n) -> do
204+ forM_ (Map.keys corePackages') $ \n -> do
201 unless (n == "ghc") (hPutStrLn h (" " ++ n ++ " = null;"))
205 unless (n == "ghc") (hPutStrLn h (" " ++ n ++ " = null;"))
202 hPutStrLn h ""
206 hPutStrLn h ""
203 hPutStrLn h (" # " ++ show (pPrint snapshot) ++ " packages")
207 hPutStrLn h (" # " ++ show (pPrint snapshot) ++ " packages")