From 9fc5200bf443962d4a6de90626f588489e4ed5ad Mon Sep 17 00:00:00 2001 From: Spyros Seimenis Date: Mon, 20 Apr 2026 17:16:01 +0300 Subject: [PATCH] sets: drop redundant OVMF-SNP/TDX inherits from node-installer-image The OVMF-SNP and OVMF-TDX overrides at the contrastPkgs level already propagate into contrast.node-installer-image via the fixpoint (the contrast sub-scope is built through packagesFromDirectoryRecursive + newScope and resolves its OVMF-SNP/OVMF-TDX args through the parent final). The explicit inherits were a no-op. Verified by comparing the oci-image-layout drv deps with and without the inherits: both reference the same debug OVMF-SNP drv (which has buildConfig=DEBUG and DEBUG_ON_SERIAL_PORT=TRUE). Signed-off-by: Spyros Seimenis --- overlays/sets/debug.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/overlays/sets/debug.nix b/overlays/sets/debug.nix index d92f13a62d..22fe71b27a 100644 --- a/overlays/sets/debug.nix +++ b/overlays/sets/debug.nix @@ -3,7 +3,7 @@ _final: prev: { contrastPkgs = prev.contrastPkgs.overrideScope ( - contrastPkgsFinal: contrastPkgsPrev: { + _contrastPkgsFinal: contrastPkgsPrev: { # Build OVMF with debug output to serial port. OVMF-SNP = contrastPkgsPrev.OVMF-SNP.override { debug = true; @@ -14,8 +14,6 @@ _final: prev: { contrast = contrastPkgsPrev.contrast.overrideScope ( _contrastFinal: contrastPrev: { node-installer-image = contrastPrev.node-installer-image.override { - inherit (contrastPkgsFinal) OVMF-SNP; - inherit (contrastPkgsFinal) OVMF-TDX; withDebug = true; }; }