From 62b9ccf838c371ddc7ded9a6b46cfa7b70ee2ea3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 16 Apr 2023 10:50:00 +0300
Subject: [PATCH] mesa_23_0: 23.0.1 -> 23.0.2, drop merged patch

---
 pkgs/development/libraries/mesa/23.0.nix    | 4 ++--
 pkgs/development/libraries/mesa/generic.nix | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/mesa/23.0.nix b/pkgs/development/libraries/mesa/23.0.nix
index 0c44d72da7dc..acbe8a08fac5 100644
--- a/pkgs/development/libraries/mesa/23.0.nix
+++ b/pkgs/development/libraries/mesa/23.0.nix
@@ -1,4 +1,4 @@
 import ./generic.nix {
-  version = "23.0.1";
-  hash = "sha256-6OWGhWtViTq66b3NuYtBwIHZCbsfrzcubnJiMHvzSt8=";
+  version = "23.0.2";
+  hash = "sha256-G30zmfxvFvAwNh+SXTPrx2AMv5gJRYL1R3W2oRgFKec=";
 }
diff --git a/pkgs/development/libraries/mesa/generic.nix b/pkgs/development/libraries/mesa/generic.nix
index 82055ecd3427..0d959560e5da 100644
--- a/pkgs/development/libraries/mesa/generic.nix
+++ b/pkgs/development/libraries/mesa/generic.nix
@@ -133,13 +133,6 @@ self = stdenv.mkDerivation {
 
     ./opencl.patch
     ./disk_cache-include-dri-driver-path-in-cache-key.patch
-
-    # FIXME: submitted upstream at https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22133
-    # Remove when no longer applicable
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/1457f1b752f59258c0b33558619b0063b4ce6280.diff";
-      hash = "sha256-WFemyfmCWY4rJMfGxVZdYeGQvGcOTEDMrRt5OIWp348=";
-    })
   ];
 
   postPatch = ''