diff --git a/pkgs/tools/misc/grub/add-hidden-menu-entries.patch b/pkgs/by-name/gr/grub2/add-hidden-menu-entries.patch
similarity index 100%
rename from pkgs/tools/misc/grub/add-hidden-menu-entries.patch
rename to pkgs/by-name/gr/grub2/add-hidden-menu-entries.patch
diff --git a/pkgs/tools/misc/grub/fix-bash-completion.patch b/pkgs/by-name/gr/grub2/fix-bash-completion.patch
similarity index 100%
rename from pkgs/tools/misc/grub/fix-bash-completion.patch
rename to pkgs/by-name/gr/grub2/fix-bash-completion.patch
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/by-name/gr/grub2/package.nix
similarity index 100%
rename from pkgs/tools/misc/grub/default.nix
rename to pkgs/by-name/gr/grub2/package.nix
diff --git a/pkgs/by-name/gr/grub2_efi/package.nix b/pkgs/by-name/gr/grub2_efi/package.nix
new file mode 100644
index 000000000000..20c46f1dda7c
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_efi/package.nix
@@ -0,0 +1,7 @@
+{
+  grub2,
+}:
+
+grub2.override {
+  efiSupport = true;
+}
diff --git a/pkgs/by-name/gr/grub2_ieee1275/package.nix b/pkgs/by-name/gr/grub2_ieee1275/package.nix
new file mode 100644
index 000000000000..d23c9a3c27fa
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_ieee1275/package.nix
@@ -0,0 +1,7 @@
+{
+  grub2,
+}:
+
+grub2.override {
+  ieee1275Support = true;
+}
diff --git a/pkgs/by-name/gr/grub2_light/package.nix b/pkgs/by-name/gr/grub2_light/package.nix
new file mode 100644
index 000000000000..b397c8f7ad72
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_light/package.nix
@@ -0,0 +1,7 @@
+{
+  grub2,
+}:
+
+grub2.override {
+  zfsSupport = false;
+}
diff --git a/pkgs/by-name/gr/grub2_pvgrub_image/package.nix b/pkgs/by-name/gr/grub2_pvgrub_image/package.nix
new file mode 100644
index 000000000000..032dfb81f0d7
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_pvgrub_image/package.nix
@@ -0,0 +1,7 @@
+{
+  grub2_pvhgrub_image,
+}:
+
+grub2_pvhgrub_image.override {
+  grubPlatform = "xen";
+}
diff --git a/pkgs/by-name/gr/grub2_xen/package.nix b/pkgs/by-name/gr/grub2_xen/package.nix
new file mode 100644
index 000000000000..6f369bbcf131
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_xen/package.nix
@@ -0,0 +1,7 @@
+{
+  grub2,
+}:
+
+grub2.override {
+  xenSupport = true;
+}
diff --git a/pkgs/by-name/gr/grub2_xen_pvh/package.nix b/pkgs/by-name/gr/grub2_xen_pvh/package.nix
new file mode 100644
index 000000000000..8f8744c975fc
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_xen_pvh/package.nix
@@ -0,0 +1,7 @@
+{
+  grub2,
+}:
+
+grub2.override {
+  xenPvhSupport = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9732092816f4..82b3e214bb62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2518,32 +2518,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;