separate repo for each of extraSources

Author: brainrake

lib/call-cabal-project-to-nix.nix

@@ -244,7 +244,7 @@ let
       repoResult = pkgs.haskell-nix.haskellLib.parseRepositories
         cabalProjectFileName sha256map inputMap cabal-install nix-tools sourceRepoPackageResult.otherText;
 
-      extraSourceRepo =
+      extraSourceRepo = source:
         let
           src =
             pkgs.evalPackages.runCommand "extra-source-repository-package" {
@@ -253,31 +253,17 @@ let
               mkdir $out
               cd $out
               git init -b minimal
-              ${
-                builtins.concatStringsSep "\n" (
-                  pkgs.lib.lists.zipListsWith
-                    (n: dep: "rsync -a --prune-empty-dirs ${dep.src}/ dep${builtins.toString n}/")
-                    (pkgs.lib.lists.range 0 ((builtins.length extraSources) - 1))
-                    extraSources
-                )
-              }
+              rsync -a --prune-empty-dirs ${source.src}/ .
               git add --force .
               GIT_COMMITTER_NAME='No One' GIT_COMMITTER_EMAIL= git commit -m "Minimal Repo For Haskell.Nix" --author 'No One <>'
             '';
         in {
           fetched = src;
           location = src;
           tag = "minimal";
-          subdirs =
-            builtins.concatLists (
-              pkgs.lib.lists.zipListsWith
-                (n: dep:
-                  builtins.map (d: "dep${builtins.toString n}/" + d) dep.subdirs
-                )
-                (pkgs.lib.lists.range 0 ((builtins.length extraSources) - 1))
-                extraSources
-            );
+          subdirs = source.subdirs;
         };
+      extraSourceRepos = if extraSources == null then [] else (builtins.map extraSourceRepo extraSources);
 
       # we need the repository content twice:
       # * at eval time (below to build the fixed project file)
@@ -289,9 +275,9 @@ let
       #   and, say, a linux release build job can identify the derivation
       #   as built by a darwin builder, and fetch it from a cache
       sourceReposEval = builtins.map (fetchPackageRepo pkgs.evalPackages.fetchgit) sourceRepoPackageResult.sourceRepos
-        ++ pkgs.lib.optional (extraSources != null) extraSourceRepo;
+        ++ extraSourceRepos;
       sourceReposBuild = builtins.map (x: (fetchPackageRepo pkgs.fetchgit x).fetched) sourceRepoPackageResult.sourceRepos
-        ++ pkgs.lib.optional (extraSources != null) extraSourceRepo.fetched;
+        ++ (builtins.map (x: x.fetched) extraSourceRepos);
     in {
       sourceRepos = sourceReposBuild;
       inherit (repoResult) repos extra-hackages;