Unverified Commit ae23f4d6 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #226415: mesa_23_0: 23.0.1 -> 23.0.2 

...into staging
parents 6d273a50 62b9ccf8

pkgs/development/libraries/mesa/23.0.1.nix

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
import ./generic.nix {

  version = "23.0.1";

  hash = "sha256-6OWGhWtViTq66b3NuYtBwIHZCbsfrzcubnJiMHvzSt8=";

}

pkgs/development/libraries/mesa/23.0.nix

0 → 100644
+4 −0
Original line number Diff line number Diff line 
import ./generic.nix {

  version = "23.0.2";

  hash = "sha256-G30zmfxvFvAwNh+SXTPrx2AMv5gJRYL1R3W2oRgFKec=";

}

pkgs/development/libraries/mesa/generic.nix

+0 −7
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/top-level/all-packages.nix

+5 −15
Original line number Diff line number Diff line
@@ -22560,27 +22560,17 @@ with pkgs; 
  # Default libGLU

  libGLU = mesa_glu;













  # 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 {













  # Keep Mesa 22.3 for now because 23.0 does not build on Darwin.













  # FIXME: remove, also investigate why we even need Mesa on Darwin.













  mesa_22_3 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/22.3.nix {















    inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;















    inherit (darwin.apple_sdk_11_0.libs) Xplugin;















  };













  mesa_23_0_1 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/23.0.1.nix {













  mesa_23_0 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/23.0.nix {















    inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;















    inherit (darwin.apple_sdk_11_0.libs) Xplugin;















  };













  # 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













  # FIXME: split up libgbm properly













  # darwin: deferred until stabilized; e.g. see around:













  #   https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21859













  mesa = if stdenv.isDarwin then mesa_22_3_7 else mesa_23_0_1;













  mesa = if stdenv.isDarwin then mesa_22_3 else mesa_23_0;





























  mesa_glu =  callPackage ../development/libraries/mesa-glu {















    inherit (darwin.apple_sdk.frameworks) ApplicationServices;