diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
1 files changed, 12 insertions, 3 deletions
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; |