use unit-id as namespace in .fullpak

Author: csabahruska

external-stg/lib/Stg/Fullpak.hs

@@ -66,6 +66,7 @@ mkFullpak ghcstgappPath stgbinsOnly includeAll fullpakName = do
           { aiLiveCode =
               [ CodeInfo
                 { ciPackageName = modPackageName
+                , ciUnitId      = modUnitId
                 , ciModuleName  = modModuleName
                 }
               | StgModuleInfo{..} <- fullpakModules
@@ -111,6 +112,6 @@ mkFullpak ghcstgappPath stgbinsOnly includeAll fullpakName = do
             ]
       existingFiles <- withArchive modModpakPath $ mapM mkEntrySelector files >>= filterM doesEntryExist
       forM_ existingFiles $ \src -> do
-        dst <- mkEntrySelector ("haskell" </> modPackageName </> modModuleName </> unEntrySelector src)
+        dst <- mkEntrySelector ("haskell" </> modUnitId </> modModuleName </> unEntrySelector src)
         copyEntry modModpakPath src dst
         setExternalFileAttrs (fromFileMode 0o0644) dst

external-stg/lib/Stg/Program.hs

@@ -222,7 +222,7 @@ getFullpakModules fullpakPath = do
     appinfoSelector <- liftIO $ mkEntrySelector fullpakAppInfoPath
     AppInfo{..} <- getEntry appinfoSelector >>= Y.decodeThrow
     forM aiLiveCode $ \CodeInfo{..} -> do
-      s <- liftIO $ mkEntrySelector $ "haskell" </> ciPackageName </> ciModuleName </> modpakStgbinPath
+      s <- liftIO $ mkEntrySelector $ "haskell" </> ciUnitId </> ciModuleName </> modpakStgbinPath
       decodeStgbin . BSL.fromStrict <$> getEntry s
 
 -- .ghc_stgapp
@@ -522,6 +522,7 @@ downloadFoundationPakIfMissing ghcVersionString foundationPakPath = do
 data CodeInfo
   = CodeInfo
   { ciPackageName :: String
+  , ciUnitId      :: String
   , ciModuleName  :: String
   }
   deriving (Eq, Ord, Show)
@@ -530,13 +531,15 @@ instance FromJSON CodeInfo where
   parseJSON (Y.Object v) =
     CodeInfo
       <$> v .: "package-name"
+      <*> v .: "unit-id"
       <*> v .: "module-name"
   parseJSON _ = fail "Expected Object for CodeInfo value"
 
 instance ToJSON CodeInfo where
   toJSON CodeInfo{..} =
     object
       [ "package-name"  .= ciPackageName
+      , "unit-id"       .= ciUnitId
       , "module-name"   .= ciModuleName
       ]