Cabal 3.4: mainLibSet (new smart constructor) (#1016)

Author: andreasabel

src/Distribution/Server/Features/PreferredVersions.hs

@@ -27,7 +27,6 @@ import Distribution.Server.Packages.Types
 import Distribution.Package
 import Distribution.Version
 import Distribution.Text
-import Distribution.Types.LibraryName (LibraryName(LMainLibName))
 
 import Data.Function (fix)
 import Data.List (intercalate, find)
@@ -36,7 +35,6 @@ import Data.Time.Clock (getCurrentTime)
 import Control.Arrow (second)
 import Control.Applicative (optional)
 import qualified Data.Map as Map
-import qualified Data.Set as Set
 import qualified Data.ByteString.Lazy.Char8 as BS (pack) -- Only used for ASCII data
 import Data.Aeson (Value(..))
 import qualified Data.HashMap.Strict as HashMap
@@ -380,7 +378,7 @@ versionsFeature ServerEnv{ serverVerbosity = verbosity }
 
     formatSinglePreferredVersions :: PackageName -> PreferredInfo -> Maybe String
     formatSinglePreferredVersions pkgname pref =
-      display . (\vr -> Dependency pkgname vr (Set.singleton LMainLibName)) <$> sumRange pref
+      display . (\vr -> Dependency pkgname vr mainLibSet) <$> sumRange pref
 
     formatGlobalPreferredVersions :: [(PackageName, PreferredInfo)] -> String
     formatGlobalPreferredVersions =

src/Distribution/Server/Packages/Render.hs

@@ -203,7 +203,7 @@ flatDependencies pkg =
       where
         fromMap = map fromPair . Map.toList
         fromPair (pkgname, Versions _ ver) =
-            Dependency pkgname (fromVersionIntervals ver) Set.empty -- XXX: ok?
+            Dependency pkgname (fromVersionIntervals ver) mainLibSet -- XXX: ok?
 
         notSubLib pn _ = packageNameToUnqualComponentName pn `Set.notMember` sublibs
         sublibs = Set.fromList $ map fst (condSubLibraries pkg)
@@ -276,7 +276,7 @@ sortDeps = sortOn $ \(Dependency pkgname _ _) -> map toLower (display pkgname)
 combineDepsBy :: (VersionIntervals -> VersionIntervals -> VersionIntervals)
               -> [Dependency] -> [Dependency]
 combineDepsBy f =
-    map (\(pkgname, ver) -> Dependency pkgname (fromVersionIntervals ver) Set.empty) -- XXX: ok?
+    map (\(pkgname, ver) -> Dependency pkgname (fromVersionIntervals ver) mainLibSet) -- XXX: ok?
   . Map.toList
   . Map.fromListWith f
   . map (\(Dependency pkgname ver _) -> (pkgname, toVersionIntervals ver))