Skip to content

Commit 3e1c1b9

Browse files
committed
Add available targets to plan.json
1 parent 1d112d8 commit 3e1c1b9

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

nix-tools/cabal.project

+7
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ allow-newer:
2222
hnix-store-core:cryptonite,
2323
hnix-store-core:bytestring
2424

25+
source-repository-package
26+
type: git
27+
location: https://github.com/haskell/cabal.git
28+
tag: c0647bc914928ab6362278c73f17b084ca3ed9ab
29+
subdir: cabal-install
30+
--sha256: sha256-BQs6ciCKWNzsEdUewEvUu4lcyrI5DH7abKzM4035lSc=
31+
2532
source-repository-package
2633
type: git
2734
location: https://github.com/michaelpj/hackage-db.git

nix-tools/nix-tools/make-install-plan/MakeInstallPlan.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import Distribution.Client.NixStyleOptions (NixStyleFlags (..), defaultNixStyleF
1414
import Distribution.Client.ProjectConfig
1515
import Distribution.Client.ProjectOrchestration
1616
import Distribution.Client.ProjectPlanOutput (writePlanExternalRepresentation)
17-
import Distribution.Client.ProjectPlanning (ElaboratedConfiguredPackage (..), rebuildInstallPlan)
17+
import Distribution.Client.ProjectPlanning (ElaboratedConfiguredPackage (..), rebuildInstallPlan, availableTargets)
1818
import Distribution.Client.Setup
1919
import Distribution.Client.Types.PackageLocation (PackageLocation (..))
2020
import Distribution.Client.Types.Repo (LocalRepo (..), RemoteRepo (..), Repo (..))
@@ -74,7 +74,7 @@ installPlanAction verbosity cliConfig = do
7474

7575
-- Write plan.json
7676
Cabal.notice verbosity $ "Writing plan.json to " ++ distProjectCacheFile distDirLayout "plan.json"
77-
writePlanExternalRepresentation distDirLayout elaboratedPlan elaboratedSharedConfig
77+
writePlanExternalRepresentation distDirLayout elaboratedPlan elaboratedSharedConfig (availableTargets elaboratedPlan)
7878

7979
-- Write cabal.freeze
8080
let freezeConfig = projectFreezeConfig elaboratedPlan totalIndexState activeRepos

0 commit comments

Comments
 (0)