dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

linuxKernel.kernels.linux_*_hardened: move overrides to kernels

Browse Source 
derive `packages` from `kernels`, unify definitions
This commit is contained in:
Kiskae 2023-05-31 12:45:25 +02:00
parent 7f330db6cc
commit 89c480cdc0
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/top-level/linux-kernels.nix
View File

@ -258,9 +258,18 @@ in {
linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { }; linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 {
linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { }; stdenv = gcc10Stdenv;
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
};
linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 {
stdenv = gcc10Stdenv;
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
};
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 {
stdenv = gcc10Stdenv;
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
};
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
@ -600,23 +609,14 @@ in {
linux_testing = packagesFor kernels.linux_testing; linux_testing = packagesFor kernels.linux_testing;
linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs); linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs);
linux_hardened = recurseIntoAttrs (hardenedPackagesFor packageAliases.linux_default.kernel { }); linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);
linux_4_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_14 { linux_4_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_14_hardened);
stdenv = gcc10Stdenv; linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened);
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened);
}); linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened);
linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);
stdenv = gcc10Stdenv; linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
});
linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 {
stdenv = gcc10Stdenv;
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
});
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { });
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);