git.iko.soy/typeable/cabal2nix
on master help sign in
hackage2nix: the distinction between core and hard core packages is obsolete
9175eefPeter Simons
hackage2nix/src/Main.hs+1−7
compare with master
unifiedsplit
@@ -99,14 +99,8 @@ enforcePreferredVersions cs pkg = Map.filterWithKey (\v _ -> PackageIdentifier (
99generatePackageSet :: Platform -> Configuration -> Hackage -> Nixpkgs -> ParIO ()
99generatePackageSet :: Platform -> Configuration -> Hackage -> Nixpkgs -> ParIO ()
100generatePackageSet targetPlatform config hackage nixpkgs = do
100generatePackageSet targetPlatform config hackage nixpkgs = do
101 let
101 let
102− hardCorePackages :: Set PackageIdentifier -- TODO: review whether this set is needed at all
103− hardCorePackages = Set.filter isOnHackage (corePackages config)
104− where
105− isOnHackage :: PackageIdentifier -> Bool
106− isOnHackage (PackageIdentifier (PackageName n) v) = maybe False (Set.member v . Map.keysSet) (Map.lookup n hackage)
107−
108 corePackageSet :: PackageSet
102 corePackageSet :: PackageSet
109− corePackageSet = Map.fromList [ (name, v) | PackageIdentifier (PackageName name) v <- Set.toList (corePackages config) ++ Set.toList hardCorePackages ]
103+ corePackageSet = Map.fromList [ (name, v) | PackageIdentifier (PackageName name) v <- Set.toList (corePackages config) ]
110
104
111 latestVersionSet :: PackageSet
105 latestVersionSet :: PackageSet
112 latestVersionSet = Map.map (Set.findMax . Map.keysSet) hackage
106 latestVersionSet = Map.map (Set.findMax . Map.keysSet) hackage