git.iko.soy/typeable/cabal2nix
on master help sign in
hackage2nix: fix selectHackageNames to include the names of core packages
commit8f40f97e1e19fad91c94bdf3ab4db41b0b71902b authorPeter Simons <simons@cryp.to> dateSun 4 Jan 2015, 19:11 (12 years ago) parentd64370f
1 file changed+2−2
src/hackage2nix.hs+2−2
src/hackage2nix.hs+2−2
@@ -101,10 +101,10 @@ generatePackage hackage resolver nixpkgs name version descr = do
101101 }
102102
103103 selectHackageNames :: Set String -> Set String
104− selectHackageNames = Set.intersection (Map.keysSet hackage)
104+ selectHackageNames = Set.intersection (Map.keysSet hackage `Set.union` Set.fromList [ n | PackageIdentifier (PackageName n) _ <- corePackages ])
105105
106106 selectMissingHackageNames :: Set String -> Set String
107− selectMissingHackageNames = flip Set.difference (Map.keysSet hackage)
107+ selectMissingHackageNames = flip Set.difference (Map.keysSet hackage `Set.union` Set.fromList [ n | PackageIdentifier (PackageName n) _ <- corePackages ])
108108
109109 conflicts :: Set String
110110 conflicts = Set.difference (selectHackageNames $ Set.fromList (extraLibs drv ++ pkgConfDeps drv)) missing