Skip to content

Commit abab3cf

Browse files
71rdastro
authored andcommitted
fix: evaluation wont fail when BalloonMemory is enabled
When BalloonMemory was not 0 evaluation of derivations failed after PR #324 made deflate-on-oom optional. The new optional set containing the argument was only merged with the other arguments, after those were converted into a list leading to a type mismatch. fixes: #326
1 parent 3768f49 commit abab3cf

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

lib/runners/cloud-hypervisor.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,14 @@ let
5252
hugepages = "on";
5353
});
5454

55-
balloonOps = opsMapped {
55+
balloonOps = opsMapped ({
5656
size = "${toString balloonMem}M";
5757
free_page_reporting = "on";
58-
} // lib.optionalAttrs deflateOnOOM {
58+
}
59+
# enable deflating memory balloon on out-of-memory
60+
// lib.optionals deflateOnOOM {
5961
deflate_on_oom = "on";
60-
};
62+
});
6163

6264
tapMultiQueue = vcpu > 1;
6365

0 commit comments

Comments
 (0)