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