[staging] Mesa 25.1, but only the world rebuildy bits (#405023)

pkgs/development/libraries/mesa/gbm-header.patch

@@ -1,13 +0,0 @@
-diff --git a/src/gbm/meson.build b/src/gbm/meson.build
-index eaed028d049..1a826c8792d 100644
---- a/src/gbm/meson.build
-+++ b/src/gbm/meson.build
-@@ -43,7 +43,7 @@ if with_tests
-   test('gbm-abi-check', abi_check, suite : ['gbm'])
- endif
- 
--install_headers('main/gbm.h')
-+install_headers('main/gbm.h', 'main/gbm_backend_abi.h')
- 
- pkg.generate(
-   name : 'gbm',

pkgs/development/libraries/mesa/gbm.nix

@@ -20,23 +20,16 @@ stdenv.mkDerivation rec {
 
   # We don't use the versions from common.nix, because libgbm is a world rebuild,
   # so the updates need to happen separately on staging.
-  version = "25.0.1";
+  version = "25.1.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo=";
+    hash = "sha256-UlI+6OMUj5F6uVAw+Mg2wOZrjfdRq73d1qufaXVI/go";
   };
 
-  # Install gbm_backend_abi.h header - this is to simplify future iteration
-  # on building Mesa and friends with system libgbm.
-  # See also:
-  # - https://github.com/NixOS/nixpkgs/pull/387292
-  # - https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33890
-  patches = [ ./gbm-header.patch ];
-
   mesonAutoFeatures = "disabled";
 
   mesonFlags = [

pkgs/development/libraries/mesa/headers.nix

@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
   pname = "mesa-gl-headers";
 
   # These are a bigger rebuild and don't change often, so keep them separate.
-  version = "25.0.1";
+  version = "25.1.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo=";
+    hash = "sha256-UlI+6OMUj5F6uVAw+Mg2wOZrjfdRq73d1qufaXVI/go";
   };
 
   dontBuild = true;