Always provide depends field.

Signed-off-by: Edward Z. Yang <[email protected]>
haskell · Aug 11, 2016 · a1f1884 · a1f1884
1 parent 5e39b21
commit a1f1884
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cabal-install/Distribution/Client/ProjectPlanOutput.hs b/cabal-install/Distribution/Client/ProjectPlanOutput.hs
@@ -65,8 +65,7 @@ encodePlanAsJson elaboratedInstallPlan _elaboratedSharedConfig =
       J.object
         [ "type"       J..= J.String "pre-existing"
         , "id"         J..= jdisplay (installedUnitId ipi)
-        , "components" J..= J.object
-          [ "lib" J..= J.object [ "depends" J..= map jdisplay (installedDepends ipi) ] ]
+        , "depends" J..= map jdisplay (installedDepends ipi)
         ]
 
     -- pkg :: ElaboratedPackage
@@ -75,11 +74,13 @@ encodePlanAsJson elaboratedInstallPlan _elaboratedSharedConfig =
         [ "type"       J..= J.String "configured"
         , "id"         J..= (jdisplay . installedUnitId) pkg
         , "components" J..= components
+        , "depends"    J..= map (jdisplay . confInstId) flat_deps
         , "flags"      J..= J.object [ fn J..= v
                                      | (PD.FlagName fn,v) <-
                                             pkgFlagAssignment pkg ]
         ]
       where
+        flat_deps = ordNub (ComponentDeps.flatDeps (pkgDependencies pkg))
         components = J.object
           [ comp2str c J..= J.object
             [ "depends" J..= map (jdisplay . confInstId) v ]

diff --git a/cabal-install/Distribution/Client/Types.hs b/cabal-install/Distribution/Client/Types.hs
@@ -132,7 +132,7 @@ data ConfiguredId = ConfiguredId {
     confSrcId  :: PackageId
   , confInstId :: ComponentId
   }
-  deriving (Eq, Generic)
+  deriving (Eq, Ord, Generic)
 
 instance Binary ConfiguredId