git.iko.soy/typeable/cabal2nix
on master help sign in
hackage2nix: fix selectHackageNames to include the names of core packages
8f40f97Peter Simons
src/hackage2nix.hs+2−2
compare with master
unifiedsplit
@@ -101,10 +101,10 @@ generatePackage hackage resolver nixpkgs name version descr = do
101 }
101 }
102
102
103 selectHackageNames :: Set String -> Set String
103 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 ])
105
105
106 selectMissingHackageNames :: Set String -> Set String
106 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 ])
108
108
109 conflicts :: Set String
109 conflicts :: Set String
110 conflicts = Set.difference (selectHackageNames $ Set.fromList (extraLibs drv ++ pkgConfDeps drv)) missing
110 conflicts = Set.difference (selectHackageNames $ Set.fromList (extraLibs drv ++ pkgConfDeps drv)) missing