Unverified Commit 454989ca authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #266164: nixos/release: drop i686-linux support

parents b67fc24e 80b77e9d

nixos/release-combined.nix

+2 −1
Original line number Diff line number Diff line
@@ -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
@@ -168,6 +168,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,

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -23962,6 +23962,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;