linuxPackages: remove __attrsFailEvaluation since the attrset evaluates
This commit is contained in:
parent
d7136b1c84
commit
38ffd739cf
@ -23,7 +23,7 @@ let
|
||||
assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
|
||||
'';
|
||||
}) args);
|
||||
kernels = (removeAttrs pkgs.linuxKernel.vanillaPackages ["__attrsFailEvaluation"]) // {
|
||||
kernels = pkgs.linuxKernel.vanillaPackages // {
|
||||
inherit (pkgs.linuxKernel.packages)
|
||||
linux_4_19_hardened
|
||||
linux_5_4_hardened
|
||||
|
@ -419,8 +419,7 @@ in {
|
||||
|
||||
nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
|
||||
|
||||
nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { }))
|
||||
// { __attrsFailEvaluation = true; };
|
||||
nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { }));
|
||||
|
||||
nvidia_x11 = nvidiaPackages.stable;
|
||||
nvidia_x11_beta = nvidiaPackages.beta;
|
||||
@ -631,7 +630,6 @@ in {
|
||||
linux_6_8 = recurseIntoAttrs (packagesFor kernels.linux_6_8);
|
||||
linux_6_9 = recurseIntoAttrs (packagesFor kernels.linux_6_9);
|
||||
linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10);
|
||||
__attrsFailEvaluation = true;
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08
|
||||
linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11
|
||||
@ -652,7 +650,6 @@ in {
|
||||
linux_rt_5_15 = packagesFor kernels.linux_rt_5_15;
|
||||
linux_rt_6_1 = packagesFor kernels.linux_rt_6_1;
|
||||
linux_rt_6_6 = packagesFor kernels.linux_rt_6_6;
|
||||
__attrsFailEvaluation = true;
|
||||
};
|
||||
|
||||
rpiPackages = {
|
||||
@ -660,7 +657,6 @@ in {
|
||||
linux_rpi2 = packagesFor kernels.linux_rpi2;
|
||||
linux_rpi3 = packagesFor kernels.linux_rpi3;
|
||||
linux_rpi4 = packagesFor kernels.linux_rpi4;
|
||||
__attrsFailEvaluation = true;
|
||||
};
|
||||
|
||||
packages = recurseIntoAttrs (vanillaPackages // rtPackages // rpiPackages // {
|
||||
@ -704,7 +700,7 @@ in {
|
||||
linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
|
||||
linux_rt_default = packages.linux_rt_5_15;
|
||||
linux_rt_latest = packages.linux_rt_6_6;
|
||||
} // { __attrsFailEvaluation = true; };
|
||||
};
|
||||
|
||||
manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user