From 33a700b406d0d5056079cc5a9ce7c78aae28e5d5 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Tue, 28 Feb 2023 23:24:40 +0100
Subject: mesa: provide patch versions

This allows us to bump the mesa attribute (used by many packages, see
https://github.com/NixOS/nixpkgs/issues/218232) independently from the packages
used by NixOS users.
---
 nixos/modules/hardware/opengl.nix          |  8 ++++----
 pkgs/development/libraries/mesa/22.3.7.nix |  4 ++++
 pkgs/development/libraries/mesa/22.nix     |  4 ----
 pkgs/development/libraries/mesa/23.0.1.nix |  4 ++++
 pkgs/development/libraries/mesa/23.nix     |  4 ----
 pkgs/top-level/all-packages.nix            | 15 ++++++++++++---
 6 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/libraries/mesa/22.3.7.nix
 delete mode 100644 pkgs/development/libraries/mesa/22.nix
 create mode 100644 pkgs/development/libraries/mesa/23.0.1.nix
 delete mode 100644 pkgs/development/libraries/mesa/23.nix

diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 2193f01613d..c16fbe3f77f 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.3.7.nix b/pkgs/development/libraries/mesa/22.3.7.nix
new file mode 100644
index 00000000000..1a1127dae50
--- /dev/null
+++ b/pkgs/development/libraries/mesa/22.3.7.nix
@@ -0,0 +1,4 @@
+import ./generic.nix {
+  version = "22.3.7";
+  hash = "sha256-iUzi9KHC52F3zdIoRiAZLQ2jBmskPuwvux18838TBCw=";
+}
diff --git a/pkgs/development/libraries/mesa/22.nix b/pkgs/development/libraries/mesa/22.nix
deleted file mode 100644
index 1a1127dae50..00000000000
--- a/pkgs/development/libraries/mesa/22.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./generic.nix {
-  version = "22.3.7";
-  hash = "sha256-iUzi9KHC52F3zdIoRiAZLQ2jBmskPuwvux18838TBCw=";
-}
diff --git a/pkgs/development/libraries/mesa/23.0.1.nix b/pkgs/development/libraries/mesa/23.0.1.nix
new file mode 100644
index 00000000000..0c44d72da7d
--- /dev/null
+++ b/pkgs/development/libraries/mesa/23.0.1.nix
@@ -0,0 +1,4 @@
+import ./generic.nix {
+  version = "23.0.1";
+  hash = "sha256-6OWGhWtViTq66b3NuYtBwIHZCbsfrzcubnJiMHvzSt8=";
+}
diff --git a/pkgs/development/libraries/mesa/23.nix b/pkgs/development/libraries/mesa/23.nix
deleted file mode 100644
index 0c44d72da7d..00000000000
--- a/pkgs/development/libraries/mesa/23.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./generic.nix {
-  version = "23.0.1";
-  hash = "sha256-6OWGhWtViTq66b3NuYtBwIHZCbsfrzcubnJiMHvzSt8=";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c383f5f8a0d..f48dd5e8e10 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;
-- 
cgit 1.4.1