diff options
author | K900 <me@0upti.me> | 2023-04-16 10:47:20 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2023-04-16 10:50:18 +0300 |
commit | a9709b3d9d99e76111e0410cca97038d4abd16f8 (patch) | |
tree | a73e391ed001bd441f32ccfa8de3a69b56b43d7f | |
parent | 8e4e2a2e2f7bb809c77b213ad7f24630f7b8fe20 (diff) | |
download | nixpkgs-a9709b3d9d99e76111e0410cca97038d4abd16f8.tar nixpkgs-a9709b3d9d99e76111e0410cca97038d4abd16f8.tar.gz nixpkgs-a9709b3d9d99e76111e0410cca97038d4abd16f8.tar.bz2 nixpkgs-a9709b3d9d99e76111e0410cca97038d4abd16f8.tar.lz nixpkgs-a9709b3d9d99e76111e0410cca97038d4abd16f8.tar.xz nixpkgs-a9709b3d9d99e76111e0410cca97038d4abd16f8.tar.zst nixpkgs-a9709b3d9d99e76111e0410cca97038d4abd16f8.zip |
mesa: have one attribute per major version
(Mesa release versions are [year].[release].[patch])
-rw-r--r-- | pkgs/development/libraries/mesa/22.3.nix (renamed from pkgs/development/libraries/mesa/22.3.7.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/mesa/23.0.nix (renamed from pkgs/development/libraries/mesa/23.0.1.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
3 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/development/libraries/mesa/22.3.7.nix b/pkgs/development/libraries/mesa/22.3.nix index 1a1127dae50..1a1127dae50 100644 --- a/pkgs/development/libraries/mesa/22.3.7.nix +++ b/pkgs/development/libraries/mesa/22.3.nix diff --git a/pkgs/development/libraries/mesa/23.0.1.nix b/pkgs/development/libraries/mesa/23.0.nix index 0c44d72da7d..0c44d72da7d 100644 --- a/pkgs/development/libraries/mesa/23.0.1.nix +++ b/pkgs/development/libraries/mesa/23.0.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30f7094503a..bbd6054652f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22563,27 +22563,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; |