From b5f6f06c99f64d9702e97df5d81559359ad68e0e Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 8 Nov 2023 00:59:03 +0100 Subject: [PATCH 1/2] nixos/release: drop i686-linux support At the time of writing, an increased source of failure in our CI is related to i686-linux. While I do wish to support 32 bits x86 system further, the reality is that we cannot identify in our community maintainers for `i686-linux` that can provide continuous maintenance for our i686-linux packages. As a matter of fact, `i686-linux` is probably broken in nixpkgs, we decide to rip off the band-aid and drop the support. Next steps could involve to extract a core package set of nixpkgs / NixOS in an out-of-tree repository to offer a simple 32 bits NixOS support with a cache or to find maintainers who are willing to work on i686 support. --- nixos/release-combined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 9b4b92be6f3a..9ee12b497a4e 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -5,7 +5,7 @@ { nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "aarch64-linux" "x86_64-linux" ] -, limitedSupportedSystems ? [ "i686-linux" ] +, limitedSupportedSystems ? [ ] }: let 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 2/2] 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;