Revert "UGLY! Forcing pkgCompiler to Nothing across the codebasy 😢"

This reverts commit c520482.

Author: angerman

Cabal/src/Distribution/Backpack/Id.hs

@@ -39,14 +39,12 @@ computeComponentId
   -- This is used by cabal-install's legacy codepath
   -> Maybe ([ComponentId], FlagAssignment)
   -> ComponentId
-computeComponentId deterministic mb_ipid mb_cid pid0 cname mb_details =
+computeComponentId deterministic mb_ipid mb_cid pid cname mb_details =
   -- show is found to be faster than intercalate and then replacement of
   -- special character used in intercalating. We cannot simply hash by
   -- doubly concatenating list, as it just flatten out the nested list, so
   -- different sources can produce same hash
-  let -- we do not want the compiler to show up in the Id.
-      pid = pid0{pkgCompiler = Nothing}
-      hash_suffix
+  let hash_suffix
         | Just (dep_ipids, flags) <- mb_details =
             "-"
               ++ hashToBase62

Cabal/src/Distribution/Simple/InstallDirs.hs

@@ -441,7 +441,7 @@ packageTemplateEnv pkgId uid =
   , -- Invariant: uid is actually a HashedUnitId.  Hard to enforce because
     -- it's an API change.
     (LibNameVar, PathTemplate [Ordinary $ prettyShow uid])
-  , (PkgIdVar, PathTemplate [Ordinary $ prettyShow (pkgId{pkgCompiler = Nothing})])
+  , (PkgIdVar, PathTemplate [Ordinary $ prettyShow pkgId])
   ]
 
 compilerTemplateEnv :: CompilerInfo -> PathTemplateEnv

cabal-install/src/Distribution/Client/DistDirLayout.hs

@@ -39,7 +39,6 @@ import Distribution.Package
   , PackageId
   , PackageIdentifier
   , UnitId
-  , pkgCompiler
   )
 import Distribution.Simple.Compiler
   ( Compiler (..)
@@ -201,7 +200,7 @@ defaultDistDirLayout projectRoot mdistDirectory haddockOutputDir =
       distBuildRootDirectory
         </> prettyShow (distParamPlatform params)
         </> prettyShow (distParamCompilerId params)
-        </> prettyShow ((distParamPackageId params){pkgCompiler = Nothing})
+        </> prettyShow (distParamPackageId params)
         </> ( case distParamComponentName params of
                 Nothing -> ""
                 Just (CLibName LMainLibName) -> ""

cabal-install/src/Distribution/Client/FetchUtils.hs

@@ -201,7 +201,7 @@ verifyFetchedTarball verbosity file mCallbacks pkgid =
             let warnAndFail s = warn verbosity ("Fetched tarball " ++ file ++ " does not match server, will redownload: " ++ s) >> return False
              in -- the do block in parens is due to dealing with the checked exceptions mechanism.
                 ( do
-                    fileInfo <- Sec.indexLookupFileInfo callbacks (pkgid{pkgCompiler = Nothing})
+                    fileInfo <- Sec.indexLookupFileInfo callbacks pkgid
                     sz <- Sec.FileLength . fromInteger <$> getFileSize file
                     if sz /= Sec.fileInfoLength (Sec.trusted fileInfo)
                       then warnAndFail "file length mismatch"

cabal-install/src/Distribution/Client/ProjectBuilding.hs

@@ -718,7 +718,7 @@ withTarballLocalDirectory
                 verbosity
                 tarball
                 unpackdir
-                pkgid{pkgCompiler = Nothing}
+                pkgid
                 pkgTextOverride
               buildPkg srcdir builddir
 

cabal-install/src/Distribution/Client/ProjectPlanning.hs

@@ -1211,7 +1211,7 @@ getPackageSourceHashes verbosity withRepoCtx solverPlan = do
   --
   let allPkgLocations :: [(PackageId, PackageLocation (Maybe FilePath))]
       allPkgLocations =
-        [ ((packageId pkg){pkgCompiler = Nothing}, srcpkgSource pkg)
+        [ (packageId pkg, srcpkgSource pkg)
         | SolverInstallPlan.Configured (SolverPackage{solverPkgSource = pkg}) <-
             SolverInstallPlan.toList solverPlan
         ]
@@ -1982,7 +1982,7 @@ elaborateInstallPlan
                     cid = case elabBuildStyle elab0 of
                       BuildInplaceOnly{} ->
                         mkComponentId $
-                          prettyShow (pkgid{pkgCompiler = Nothing})
+                          prettyShow pkgid
                             ++ "-inplace"
                             ++ ( case Cabal.componentNameString cname of
                                   Nothing -> ""
@@ -2215,7 +2215,7 @@ elaborateInstallPlan
 
             pkgInstalledId
               | shouldBuildInplaceOnly pkg =
-                  mkComponentId (prettyShow (pkgid{pkgCompiler = Nothing}) ++ "-inplace")
+                  mkComponentId (prettyShow pkgid ++ "-inplace")
               | otherwise =
                   assert (isJust elabPkgSourceHash) $
                     hashedInstalledPackageId
@@ -2226,7 +2226,7 @@ elaborateInstallPlan
 
             -- Need to filter out internal dependencies, because they don't
             -- correspond to anything real anymore.
-            isExt confid = (confSrcId confid){pkgCompiler = Nothing} /= pkgid{pkgCompiler = Nothing}
+            isExt confid = confSrcId confid /= pkgid
             filterExt = filter isExt
 
             filterExt' :: [(ConfiguredId, a)] -> [(ConfiguredId, a)]
@@ -2367,7 +2367,7 @@ elaborateInstallPlan
                 else cp
 
             elabPkgSourceLocation = srcloc
-            elabPkgSourceHash = case Map.lookup (pkgid{pkgCompiler = Nothing}) sourcePackageHashes of
+            elabPkgSourceHash = case Map.lookup pkgid sourcePackageHashes of
               Just h -> Just h
               Nothing -> Nothing
             elabLocalToProject = isLocalToProject pkg