From 80b77e9db06c5618ad1bc8f10ed9760f2bb338ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 5 Jan 2024 12:22:11 +0100 Subject: [PATCH] nixos/release: add i686-linux mesa to channel blockers Apart from being still a useful package, this keeps a basic sanity check for i686, now that we dropped the installation image, etc. Our RFC mandates that i686 stdenv is a channel blocker: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3-1 --- nixos/release-combined.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 9ee12b497a4e..7915eec5733d 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -167,6 +167,7 @@ in rec { (onFullSupported "nixos.tests.xfce") (onFullSupported "nixpkgs.emacs") (onFullSupported "nixpkgs.jdk") + (onSystems ["x86_64-linux"] "nixpkgs.mesa_i686") # i686 sanity check + useful ["nixpkgs.tarball"] # Ensure that nixpkgs-check-by-name is available in all release channels and nixos-unstable, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7944d3273207..88654879cf11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23991,6 +23991,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; inherit (darwin.apple_sdk_11_0.libs) Xplugin; }; + mesa_i686 = pkgsi686Linux.mesa; # make it build on Hydra mesa_glu = callPackage ../development/libraries/mesa-glu { inherit (darwin.apple_sdk.frameworks) ApplicationServices;