use package names instead of unit-id in .fullpak (better readability)

Author: csabahruska

external-stg/lib/Stg/Fullpak.hs

@@ -112,6 +112,6 @@ mkFullpak ghcstgappPath stgbinsOnly includeAll fullpakName = do
             ]
       existingFiles <- withArchive modModpakPath $ mapM mkEntrySelector files >>= filterM doesEntryExist
       forM_ existingFiles $ \src -> do
-        dst <- mkEntrySelector ("haskell" </> modUnitId </> modModuleName </> unEntrySelector src)
+        dst <- mkEntrySelector ("haskell" </> modPackageName </> 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" </> ciUnitId </> ciModuleName </> modpakStgbinPath
+      s <- liftIO $ mkEntrySelector $ "haskell" </> ciPackageName </> ciModuleName </> modpakStgbinPath
       decodeStgbin . BSL.fromStrict <$> getEntry s
 
 -- .ghc_stgapp