git.iko.soy/typeable/cabal2nix
on master help sign in
hackage2nix: the distinction between core and hard core packages is obsolete
commit9175eefce167a75bd2c5bdfb1d0f6401abe51910 authorPeter Simons <simons@cryp.to> dateTue 8 Sep 2015, 12:19 (11 years ago) parentaf13b6a
1 file changed+1−7
hackage2nix/src/Main.hs+1−7
hackage2nix/src/Main.hs+1−7
@@ -99,14 +99,8 @@ enforcePreferredVersions cs pkg = Map.filterWithKey (\v _ -> PackageIdentifier (
9999generatePackageSet :: Platform -> Configuration -> Hackage -> Nixpkgs -> ParIO ()
100100generatePackageSet targetPlatform config hackage nixpkgs = do
101101 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−
108102 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) ]
110104
111105 latestVersionSet :: PackageSet
112106 latestVersionSet = Map.map (Set.findMax . Map.keysSet) hackage