build-support/vm: fix unpopulated debsGrouped after structuredAttrs refactor (#522322)

This commit is contained in:
Stefan Frijters
2026-05-21 07:38:43 +00:00
committed by GitHub
2 changed files with 19 additions and 2 deletions
+1 -1
View File
@@ -731,7 +731,7 @@ let
;
debsFlat = lib.flatten debs;
debsGrouped = debs;
debsGrouped = map toString debs;
preVM = createEmptyImage { inherit size fullName; };
+18 -1
View File
@@ -2,12 +2,12 @@
hello,
patchelf,
pcmanfm,
runCommand,
stdenv,
vmTools,
}:
let
inherit (vmTools)
buildRPM
diskImages
makeImageTestScript
runInLinuxImage
@@ -46,6 +46,23 @@ in
})
);
# Sanity check to ensure the dpkg --install commands have run
checkPerlInstalledInDebian = runInLinuxImage (
runCommand "check-perl"
{
diskImage = diskImages.debian13x86_64;
diskImageFormat = "qcow2";
memSize = 512;
}
''
echo Check if perl is present
perl -v
echo Check if perl is installed
dpkg -l | grep 'ii *perl'
mkdir $out
''
);
# RPM-based distros
testFedora42Image = makeImageTestScript diskImages.fedora42x86_64;
testFedora43Image = makeImageTestScript diskImages.fedora43x86_64;