Skip to content

Commit ff61fb0

Browse files
mergify[bot]mergify[bot]
authored
Merge pull request #10982 from haskell/wip/teo-precise-unit-id
Support reinstalling more packages (including base and template-haskell) with GHC >=9.14
2 parents 857e67e + f30b90c commit ff61fb0

File tree

20 files changed

+150
-9
lines changed

20 files changed

+150
-9
lines changed

‎Cabal-syntax/src/Distribution/Compiler.hs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ import Language.Haskell.Extension
5656
import Distribution.Version (Version, mkVersion', nullVersion)
5757

5858
import qualified Distribution.Compat.CharParsing as P
59+
import Distribution.Package (PackageName)
5960
import Distribution.Parsec (Parsec (..))
6061
import Distribution.Pretty (Pretty (..), prettyShow)
62+
import Distribution.Types.UnitId (UnitId)
6163
import qualified System.Info (compilerName, compilerVersion)
6264
import qualified Text.PrettyPrint as Disp
6365

@@ -213,6 +215,12 @@ data CompilerInfo = CompilerInfo
213215
-- ^ Supported language standards, if known.
214216
, compilerInfoExtensions :: Maybe [Extension]
215217
-- ^ Supported extensions, if known.
218+
, compilerInfoWiredInUnitIds :: Maybe [(PackageName, UnitId)]
219+
-- ^ 'UnitId's that the compiler doesn't support reinstalling.
220+
-- 'Nothing' indicates that the compiler hasn't supplied this
221+
-- information and that we should act pessimistically.
222+
-- For instance, when using GHC plugins, one wants to use the exact same
223+
-- version of the `ghc` package as the one the compiler was linked against.
216224
}
217225
deriving (Generic, Show, Read)
218226

@@ -245,4 +253,4 @@ abiTagString (AbiTag tag) = tag
245253
-- compiler id's.
246254
unknownCompilerInfo :: CompilerId -> AbiTag -> CompilerInfo
247255
unknownCompilerInfo compilerId abiTag =
248-
CompilerInfo compilerId abiTag (Just []) Nothing Nothing
256+
CompilerInfo compilerId abiTag (Just []) Nothing Nothing Nothing

‎Cabal-tests/tests/UnitTests/Distribution/Simple/Program/GHC.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ tests = testGroup "Distribution.Simple.Program.GHC"
5454
, compilerLanguages = []
5555
, compilerExtensions = []
5656
, compilerProperties = Map.singleton "Support parallel --make" "YES"
57+
, compilerWiredInUnitIds = Nothing
5758
})
5859
(Platform X86_64 Linux)
5960
(mempty { ghcOptNumJobs = Flag (NumJobs (Just 4)) })

‎Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ md5CheckGenericPackageDescription proxy = md5Check proxy
3333

3434
md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion
3535
md5CheckLocalBuildInfo proxy = md5Check proxy
36-
0xea86b170fa32ac289cbd1fb6174b5cbf
36+
0xed69bb9372239b67b14b3e4dd3597c56

‎Cabal/src/Distribution/Simple/Compiler.hs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ import Distribution.Pretty
101101
import Prelude ()
102102

103103
import Distribution.Compiler
104+
import Distribution.Package (PackageName)
104105
import Distribution.Simple.Utils
106+
import Distribution.Types.UnitId (UnitId)
105107
import Distribution.Utils.Path
106108
import Distribution.Version
107109

@@ -124,6 +126,12 @@ data Compiler = Compiler
124126
-- ^ Supported language standards.
125127
, compilerExtensions :: [(Extension, Maybe CompilerFlag)]
126128
-- ^ Supported extensions.
129+
, compilerWiredInUnitIds :: Maybe [(PackageName, UnitId)]
130+
-- ^ 'UnitId's that the compiler doesn't support reinstalling.
131+
-- For instance, when using GHC plugins, one wants to use the exact same
132+
-- version of the `ghc` package as the one the compiler was linked against.
133+
-- 'Nothing' indicates that the compiler hasn't supplied this
134+
-- information and that we should act pessimistically.
127135
, compilerProperties :: Map String String
128136
-- ^ A key-value map for properties not covered by the above fields.
129137
}
@@ -183,6 +191,7 @@ compilerInfo c =
183191
(Just . compilerCompat $ c)
184192
(Just . map fst . compilerLanguages $ c)
185193
(Just . map fst . compilerExtensions $ c)
194+
(compilerWiredInUnitIds c)
186195

187196
-- ------------------------------------------------------------
188197

‎Cabal/src/Distribution/Simple/GHC.hs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,9 @@ configureCompiler verbosity hcPath conf0 = do
229229
compilerId :: CompilerId
230230
compilerId = CompilerId GHC ghcVersion
231231

232+
projectUnitId :: Maybe String
233+
projectUnitId = Map.lookup "Project Unit Id" ghcInfoMap
234+
232235
-- The @AbiTag@ is the @Project Unit Id@ but with redundant information from the compiler version removed.
233236
-- For development versions of the compiler these look like:
234237
-- @Project Unit Id@: "ghc-9.13-inplace"
@@ -241,9 +244,17 @@ configureCompiler verbosity hcPath conf0 = do
241244
NoAbiTag
242245
AbiTag
243246
( dropWhile (== '-') . stripCommonPrefix (prettyShow compilerId)
244-
<$> Map.lookup "Project Unit Id" ghcInfoMap
247+
<$> projectUnitId
245248
)
246249

250+
wiredInUnitIds = do
251+
ghcInternalUnitId <- Map.lookup "ghc-internal Unit Id" ghcInfoMap
252+
ghcUnitId <- projectUnitId
253+
pure
254+
[ (mkPackageName "ghc", mkUnitId ghcUnitId)
255+
, (mkPackageName "ghc-internal", mkUnitId ghcInternalUnitId)
256+
]
257+
247258
let comp =
248259
Compiler
249260
{ compilerId
@@ -252,6 +263,7 @@ configureCompiler verbosity hcPath conf0 = do
252263
, compilerLanguages = languages
253264
, compilerExtensions = extensions
254265
, compilerProperties = ghcInfoMap
266+
, compilerWiredInUnitIds = wiredInUnitIds
255267
}
256268
compPlatform = Internal.targetPlatform ghcInfo
257269
return (comp, compPlatform, progdb1)

‎Cabal/src/Distribution/Simple/GHCJS.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ configureCompiler verbosity hcPath conf0 = do
170170
, compilerLanguages = languages
171171
, compilerExtensions = extensions
172172
, compilerProperties = ghcInfoMap
173+
, compilerWiredInUnitIds = Nothing
173174
}
174175
compPlatform = Internal.targetPlatform ghcjsInfo
175176
return (comp, compPlatform, progdb1)

‎Cabal/src/Distribution/Simple/UHC.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ configure verbosity hcPath progdb = do
7777
, compilerLanguages = uhcLanguages
7878
, compilerExtensions = uhcLanguageExtensions
7979
, compilerProperties = Map.empty
80+
, compilerWiredInUnitIds = Nothing
8081
}
8182
compPlatform = Nothing
8283
return (comp, compPlatform, progdb')

‎cabal-install-solver/src/Distribution/Solver/Modular/Message.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ showFR _ UnknownPackage = " (unknown package)"
318318
showFR _ (GlobalConstraintVersion vr (ConstraintSourceProjectConfig pc)) = '\n' : (render . nest 6 $ docProjectConfigPathFailReason vr pc)
319319
showFR _ (GlobalConstraintVersion vr src) = " (" ++ constraintSource src ++ " requires " ++ prettyShow vr ++ ")"
320320
showFR _ (GlobalConstraintInstalled src) = " (" ++ constraintSource src ++ " requires installed instance)"
321+
showFR _ (GlobalConstraintInstalledSpecificUnitId unitId src) = " (" ++ constraintSource src ++ " requires installed instance with unit id " ++ prettyShow unitId ++ ")"
321322
showFR _ (GlobalConstraintSource src) = " (" ++ constraintSource src ++ " requires source instance)"
322323
showFR _ (GlobalConstraintFlag src) = " (" ++ constraintSource src ++ " requires opposite flag selection)"
323324
showFR _ ManualFlag = " (manual flag can only be changed explicitly)"

‎cabal-install-solver/src/Distribution/Solver/Modular/Package.hs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module Distribution.Solver.Modular.Package
1010
, PN
1111
, QPV
1212
, instI
13+
, instUid
1314
, makeIndependent
1415
, primaryPP
1516
, setupPP
@@ -77,6 +78,10 @@ instI :: I -> Bool
7778
instI (I _ (Inst _)) = True
7879
instI _ = False
7980

81+
instUid :: UnitId -> I -> Bool
82+
instUid uid (I _ (Inst uid')) = uid == uid'
83+
instUid _ _ = False
84+
8085
-- | Is the package in the primary group of packages. This is used to
8186
-- determine (1) if we should try to establish stanza preferences
8287
-- for this goal, and (2) whether or not a user specified @--constraint@

‎cabal-install-solver/src/Distribution/Solver/Modular/Preference.hs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,9 @@ processPackageConstraintP qpn c i (LabeledPackageConstraint (PackageConstraint s
190190
go _ PackagePropertyInstalled
191191
| instI i = r
192192
| otherwise = Fail c (GlobalConstraintInstalled src)
193+
go _ (PackagePropertyInstalledSpecificUnitId unitId)
194+
| instUid unitId i = r
195+
| otherwise = Fail c (GlobalConstraintInstalledSpecificUnitId unitId src)
193196
go _ PackagePropertySource
194197
| not (instI i) = r
195198
| otherwise = Fail c (GlobalConstraintSource src)

0 commit comments

Comments
 (0)