grub2,grub2_{efi,ieee1275,light,pvgrub_image,xen,xen_pvh}: migrate to by-name, fix failing grub2 tests

This commit is contained in:
Guy Chronister
2026-04-29 08:24:42 -05:00
parent 00e4cd89d9
commit d4151238f2
10 changed files with 66 additions and 26 deletions
+11
View File
@@ -0,0 +1,11 @@
{
grub2,
...
}@args:
grub2.override (
{
efiSupport = true;
}
// removeAttrs args [ "grub2" ]
)
@@ -0,0 +1,11 @@
{
grub2,
...
}@args:
grub2.override (
{
ieee1275Support = true;
}
// removeAttrs args [ "grub2" ]
)
+11
View File
@@ -0,0 +1,11 @@
{
grub2,
...
}@args:
grub2.override (
{
zfsSupport = false;
}
// removeAttrs args [ "grub2" ]
)
@@ -0,0 +1,11 @@
{
grub2_pvhgrub_image,
...
}@args:
grub2_pvhgrub_image.override (
{
grubPlatform = "xen";
}
// removeAttrs args [ "grub2_pvhgrub_image" ]
)
+11
View File
@@ -0,0 +1,11 @@
{
grub2,
...
}@args:
grub2.override (
{
xenSupport = true;
}
// removeAttrs args [ "grub2" ]
)
+11
View File
@@ -0,0 +1,11 @@
{
grub2,
...
}@args:
grub2.override (
{
xenPvhSupport = true;
}
// removeAttrs args [ "grub2" ]
)
-26
View File
@@ -2471,32 +2471,6 @@ with pkgs;
withXorg = false;
};
grub2 = callPackage ../tools/misc/grub/default.nix { };
grub2_efi = grub2.override {
efiSupport = true;
};
grub2_ieee1275 = grub2.override {
ieee1275Support = true;
};
grub2_light = grub2.override {
zfsSupport = false;
};
grub2_xen = grub2.override {
xenSupport = true;
};
grub2_xen_pvh = grub2.override {
xenPvhSupport = true;
};
grub2_pvgrub_image = grub2_pvhgrub_image.override {
grubPlatform = "xen";
};
gruut = with python3.pkgs; toPythonApplication gruut;
gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa;