Add available targets to plan.json

input-output-hk · Aug 9, 2024 · 3e1c1b9 · 3e1c1b9
1 parent 1d112d8
commit 3e1c1b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/nix-tools/cabal.project b/nix-tools/cabal.project
@@ -22,6 +22,13 @@ allow-newer:
     hnix-store-core:cryptonite,
     hnix-store-core:bytestring
 
+source-repository-package
+    type: git
+    location: /~https://github.com/haskell/cabal.git
+    tag: c0647bc914928ab6362278c73f17b084ca3ed9ab
+    subdir: cabal-install
+    --sha256: sha256-BQs6ciCKWNzsEdUewEvUu4lcyrI5DH7abKzM4035lSc=
+
 source-repository-package
     type: git
     location: /~https://github.com/michaelpj/hackage-db.git

diff --git a/nix-tools/nix-tools/make-install-plan/MakeInstallPlan.hs b/nix-tools/nix-tools/make-install-plan/MakeInstallPlan.hs
@@ -14,7 +14,7 @@ import Distribution.Client.NixStyleOptions (NixStyleFlags (..), defaultNixStyleF
 import Distribution.Client.ProjectConfig
 import Distribution.Client.ProjectOrchestration
 import Distribution.Client.ProjectPlanOutput (writePlanExternalRepresentation)
-import Distribution.Client.ProjectPlanning (ElaboratedConfiguredPackage (..), rebuildInstallPlan)
+import Distribution.Client.ProjectPlanning (ElaboratedConfiguredPackage (..), rebuildInstallPlan, availableTargets)
 import Distribution.Client.Setup
 import Distribution.Client.Types.PackageLocation (PackageLocation (..))
 import Distribution.Client.Types.Repo (LocalRepo (..), RemoteRepo (..), Repo (..))
@@ -74,7 +74,7 @@ installPlanAction verbosity cliConfig = do
 
   -- Write plan.json
   Cabal.notice verbosity $ "Writing plan.json to " ++ distProjectCacheFile distDirLayout "plan.json"
-  writePlanExternalRepresentation distDirLayout elaboratedPlan elaboratedSharedConfig
+  writePlanExternalRepresentation distDirLayout elaboratedPlan elaboratedSharedConfig (availableTargets elaboratedPlan)
 
   -- Write cabal.freeze
   let freezeConfig = projectFreezeConfig elaboratedPlan totalIndexState activeRepos