diff options
| author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2020-04-19 20:01:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-19 20:01:35 +0300 |
| commit | 6f1165a0cbb59140b371f9d41ef0ba2b5d707408 (patch) | |
| tree | 554414500254eba78cd34ad1703748b147c3f9da /pkgs/top-level | |
| parent | 1406d8b314a4159cb5a6468225996a0b91009a0e (diff) | |
| parent | 2e31fb407eeea4ffb8428634f3c5695b747b7ec5 (diff) | |
| download | nixlib-6f1165a0cbb59140b371f9d41ef0ba2b5d707408.tar nixlib-6f1165a0cbb59140b371f9d41ef0ba2b5d707408.tar.gz nixlib-6f1165a0cbb59140b371f9d41ef0ba2b5d707408.tar.bz2 nixlib-6f1165a0cbb59140b371f9d41ef0ba2b5d707408.tar.lz nixlib-6f1165a0cbb59140b371f9d41ef0ba2b5d707408.tar.xz nixlib-6f1165a0cbb59140b371f9d41ef0ba2b5d707408.tar.zst nixlib-6f1165a0cbb59140b371f9d41ef0ba2b5d707408.zip | |
Merge pull request #84522 from emilazy/add-linux-hardened-patches
linux_*_hardened: use linux-hardened patch set
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6ebf2bcf8df7..8d289c0101bf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -249,6 +249,11 @@ mapAliases ({ links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; linuxPackages_rpi0 = linuxPackages_rpi1; + + # added 2020-04-04 + linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; + linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; + loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 443000722905..644f49e43f66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16991,7 +16991,10 @@ in inherit stdenv; inherit (kernel) version; }; - kernelPatches = kernel.kernelPatches ++ [ kernelPatches.tag_hardened ]; + kernelPatches = kernel.kernelPatches ++ [ + kernelPatches.tag_hardened + kernelPatches.hardened.${kernel.version} + ]; modDirVersionArg = kernel.modDirVersion + "-hardened"; }); @@ -17001,9 +17004,6 @@ in linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest); linux_latest_hardened = linuxPackages_latest_hardened.kernel; - linuxPackages_testing_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_testing); - linux_testing_hardened = linuxPackages_testing_hardened.kernel; - linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; })); linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); |