diff options
| author | Kiskae <Kiskae@users.noreply.github.com> | 2023-05-31 12:45:25 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-06-13 08:41:04 +0000 |
| commit | 2c58ede5ecd18eed39ef37d0fe8dc773c17d773c (patch) | |
| tree | c147d976a67dc11c66718223b6fbd2d6720e3fe1 | |
| parent | linuxKernel.packages.linux_(4_14,4_19}_hardened: unbreak (diff) | |
| download | nixpkgs-origin/backport-235027-to-release-23.05.tar.gz | |
linuxKernel.kernels.linux_*_hardened: move overrides to kernelsorigin/backport-235027-to-release-23.05
derive `packages` from `kernels`, unify definitions
(cherry picked from commit 89c480cdc0a61513128aa2424ec9545f7dcf4b6c)
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 0ae25cdd6716..ed9c0b249674 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -254,9 +254,18 @@ in { linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; - linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { }; - linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { }; - linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; + linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { + stdenv = gcc10Stdenv; + 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_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; @@ -596,23 +605,14 @@ in { linux_testing = packagesFor kernels.linux_testing; 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 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }); - linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { - stdenv = gcc10Stdenv; - 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_4_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_14_hardened); + linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened); + linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened); + linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); + linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); + linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); |