cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mesa: provide patch versions

Browse source 
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.
This commit is contained in:
Atemu 2023-02-28 23:24:40 +01:00
parent bf1785d0a9
commit 33a700b406
4 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/hardware/opengl.nix
View file

@ -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

0
pkgs/development/libraries/mesa/22.nix → pkgs/development/libraries/mesa/22.3.7.nix
View file

0
pkgs/development/libraries/mesa/23.nix → pkgs/development/libraries/mesa/23.0.1.nix
View file

15
pkgs/top-level/all-packages.nix
View file

@ -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;