Add package-id unit-query

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/Distribution/Helper.hs b/lib/Distribution/Helper.hs
index 4757200..90935c9 100644
--- a/lib/Distribution/Helper.hs
+++ b/lib/Distribution/Helper.hs
@@ -436,21 +436,22 @@ readUnitInfo :: QueryEnvI c pt -> FilePath -> Unit -> IO UnitInfo
 readUnitInfo
   qe exe unit@Unit {uUnitId=uiUnitId, uPackageDir=pkgdir, uDistDir=distdir} = do
     res <- readHelper qe exe pkgdir distdir
-           [ "package-db-stack"
+           [ "package-id"
+           , "package-db-stack"
            , "flags"
            , "compiler-version"
            , "config-flags"
            , "non-default-config-flags"
            , "component-info"
            ]
-    let [ Just (ChResponsePkgDbs         uiPackageDbStack),
+    let [ Just (ChResponseVersion        uiPackageId),
+          Just (ChResponsePkgDbs         uiPackageDbStack),
           Just (ChResponseFlags          uiPackageFlags),
-          Just (ChResponseVersion        comp compVer),
+          Just (ChResponseVersion        uiCompilerVersion),
           Just (ChResponseFlags          uiConfigFlags),
           Just (ChResponseFlags          uiNonDefaultConfigFlags),
           Just (ChResponseComponentsInfo uiComponents)
           ] = res
-        uiCompilerVersion = (comp, compVer)
     uiModTimes <- getUnitModTimes unit
     return $ UnitInfo {..}