diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-05-26 18:37:26 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-05-26 18:37:26 +0000 |
| commit | 191075fa83752caa035068407640d9abe2a71629 (patch) | |
| tree | 2dbb45771555d771aa44f0391b547fe72356d6b0 /pkgs/top-level/linux-kernels.nix | |
| parent | 2a1c96228168b94ff470d7d169e54b045bd58c8e (diff) | |
| parent | 73ddcacb58198bd090822836ccb1ee968bfaf22c (diff) | |
| download | nixpkgs-191075fa83752caa035068407640d9abe2a71629.tar nixpkgs-191075fa83752caa035068407640d9abe2a71629.tar.gz nixpkgs-191075fa83752caa035068407640d9abe2a71629.tar.bz2 nixpkgs-191075fa83752caa035068407640d9abe2a71629.tar.lz nixpkgs-191075fa83752caa035068407640d9abe2a71629.tar.xz nixpkgs-191075fa83752caa035068407640d9abe2a71629.tar.zst nixpkgs-191075fa83752caa035068407640d9abe2a71629.zip | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/os-specific/linux/kernel/patches.nix pkgs/top-level/linux-kernels.nix
Diffstat (limited to 'pkgs/top-level/linux-kernels.nix')
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index c6752b131dc..f2fad5895ed 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -180,14 +180,6 @@ in { ]; }; - linux_6_2 = callPackage ../os-specific/linux/kernel/linux-6.2.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.make-maple-state-reusable-after-mas_empty_area - ]; - }; - linux_6_3 = callPackage ../os-specific/linux/kernel/linux-6.3.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -277,6 +269,7 @@ in { linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream"; linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream"; + linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream"; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; @@ -576,13 +569,13 @@ in { linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); - linux_6_2 = recurseIntoAttrs (packagesFor kernels.linux_6_2); linux_6_3 = recurseIntoAttrs (packagesFor kernels.linux_6_3); } // 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_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20 + linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26 }; rtPackages = { |