fix: lake: use manifest opts

specifically, union manifest and config opts (preferring manifest)
This commit is contained in:
tydeu 2023-09-13 17:56:19 -04:00 committed by Mac Malone
parent 3f4a9dc9a1
commit 5983abcf78

View file

@ -175,7 +175,9 @@ def Workspace.materializeDeps (ws : Workspace) (manifest : Manifest) (reconfigur
let depPkgs ← deps.mapM fun dep => fetchOrCreate dep.name do
if let some entry := pkgEntries.find? dep.name then
let result ← entry.materialize ws.dir relPkgsDir
loadDepPackage ws.dir result pkg.leanOpts dep.opts reconfigure
-- Union manifest and configuration options (preferring manifest)
let opts := entry.opts.mergeBy (fun _ e _ => e) dep.opts
loadDepPackage ws.dir result pkg.leanOpts opts reconfigure
else if topLevel then
error <|
s!"dependency '{dep.name}' not in manifest; " ++