Actually...

alt-romes · Aug 7, 2024 · 768777d · 768777d
1 parent e9c2c42
commit 768777d
Showing 1 changed file with 32 additions and 35 deletions.
diff --git a/cabal-install/src/Distribution/Client/ProjectConfig.hs b/cabal-install/src/Distribution/Client/ProjectConfig.hs
@@ -1165,57 +1165,54 @@ fetchAndReadSourcePackages
   distDirLayout
   projectConfigShared
   projectConfigBuildOnly
-  pkgLocations = do
-    pkgsLocalDirectory <-
-      concurrentRebuildActions
+  pkgLocations =
+    concat <$>
+    concurrentRebuildActions
+      [
+        -- pkgsLocalDirectory
+        sequenceA
         [ readSourcePackageLocalDirectory verbosity dir cabalFile
         | location <- pkgLocations
         , (dir, cabalFile) <- projectPackageLocal location
         ]
 
-    pkgsLocalTarball <-
-      concurrentRebuildActions
+      , -- pkgsLocalTarball
+        sequenceA
         [ readSourcePackageLocalTarball verbosity path
         | ProjectPackageLocalTarball path <- pkgLocations
         ]
 
-    pkgsRemoteTarball <- do
-      getTransport <-
-        delayInitSharedResource $
-          configureTransport
+      , -- pkgsRemoteTarball
+        do
+        getTransport <-
+          delayInitSharedResource $
+            configureTransport
+              verbosity
+              progPathExtra
+              preferredHttpTransport
+        sequenceA $
+          [ fetchAndReadSourcePackageRemoteTarball
             verbosity
-            progPathExtra
-            preferredHttpTransport
-      concurrentRebuildActions
-        [ fetchAndReadSourcePackageRemoteTarball
+            distDirLayout
+            getTransport
+            uri
+          | ProjectPackageRemoteTarball uri <- pkgLocations
+          ]
+
+        -- pkgsRemoteRepo
+      , syncAndReadSourcePackagesRemoteRepos
           verbosity
           distDirLayout
-          getTransport
-          uri
-        | ProjectPackageRemoteTarball uri <- pkgLocations
-        ]
-
-    pkgsRemoteRepo <-
-      syncAndReadSourcePackagesRemoteRepos
-        verbosity
-        distDirLayout
-        projectConfigShared
-        (fromFlag (projectConfigOfflineMode projectConfigBuildOnly))
-        [repo | ProjectPackageRemoteRepo repo <- pkgLocations]
+          projectConfigShared
+          (fromFlag (projectConfigOfflineMode projectConfigBuildOnly))
+          [repo | ProjectPackageRemoteRepo repo <- pkgLocations]
 
-    let pkgsNamed =
+      , -- pkgsNamed
+        pure
           [ NamedPackage pkgname [PackagePropertyVersion verrange]
           | ProjectPackageNamed (PackageVersionConstraint pkgname verrange) <- pkgLocations
           ]
-
-    return $
-      concat
-        [ pkgsLocalDirectory
-        , pkgsLocalTarball
-        , pkgsRemoteTarball
-        , pkgsRemoteRepo
-        , pkgsNamed
-        ]
+      ]
     where
       projectPackageLocal (ProjectPackageLocalDirectory dir file) = [(dir, file)]
       projectPackageLocal (ProjectPackageLocalCabalFile file) = [(dir, file)]