diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 2193f01613df..c16fbe3f77f0 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -90,8 +90,8 @@ in
 
       mesaPackage = mkOption {
         type = types.package;
-        default = pkgs.mesa;
-        defaultText = literalExpression "pkgs.mesa";
+        default = pkgs.mesa_22;
+        defaultText = literalExpression "pkgs.mesa_22";
         example = literalExpression "pkgs.mesa_23";
         description = lib.mdDoc ''
           The Mesa driver package used for rendering support on the system.
@@ -103,8 +103,8 @@ in
       };
       mesaPackage32 = mkOption {
         type = types.package;
-        default = pkgs.pkgsi686Linux.mesa;
-        defaultText = literalExpression "pkgs.pkgsi686Linux.mesa";
+        default = pkgs.pkgsi686Linux.mesa_22;
+        defaultText = literalExpression "pkgs.pkgsi686Linux.mesa_22";
         example = literalExpression "pkgs.pkgsi686Linux.mesa_23";
         description = lib.mdDoc ''
           Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit
diff --git a/pkgs/development/libraries/mesa/22.nix b/pkgs/development/libraries/mesa/22.3.7.nix
similarity index 100%
rename from pkgs/development/libraries/mesa/22.nix
rename to pkgs/development/libraries/mesa/22.3.7.nix
diff --git a/pkgs/development/libraries/mesa/23.nix b/pkgs/development/libraries/mesa/23.0.1.nix
similarity index 100%
rename from pkgs/development/libraries/mesa/23.nix
rename to pkgs/development/libraries/mesa/23.0.1.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c383f5f8a0db..f48dd5e8e106 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22505,15 +22505,24 @@ with pkgs;
   # Default libGLU
   libGLU = mesa_glu;
 
-  mesa_22 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/22.nix {
+  # When a new patch is out, add a new mesa attribute with the exact patch version
+  # Remove old mesa attributes when they're unused.
+  # Try to keep the previous version around for a bit in case there are new bugs.
+  mesa_22_3_7 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/22.3.7.nix {
     inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;
     inherit (darwin.apple_sdk_11_0.libs) Xplugin;
   };
-  mesa_23 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/23.nix {
+  mesa_23_0_1 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/23.0.1.nix {
     inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;
     inherit (darwin.apple_sdk_11_0.libs) Xplugin;
   };
-  mesa = mesa_22;
+  # Bump this immediately on patches; wait a bit for minor versions
+  mesa_22 = mesa_22_3_7;
+  mesa_23 = mesa_23_0_1;
+  # Bump on staging only, tonnes of packages depend on it.
+  # See https://github.com/NixOS/nixpkgs/issues/218232
+  # Major versions should be bumped when they have proven to be reasonably stable
+  mesa = mesa_22_3_7;
 
   mesa_glu =  callPackage ../development/libraries/mesa-glu {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;