b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #217298 from K900/linux-6.2

Browse source
This commit is contained in:
Bernardo Meurer 2023-02-20 12:00:35 +00:00 committed by GitHub
parent 48be7b7064 522512e7b4
commit d3b78c3126
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/os-specific/linux/kernel/linux-6.2.nix Normal file
View file

@ -0,0 +1,18 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
with lib;
buildLinux (args // rec {
version = "6.2";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "sha256-dIYvqKtA7a6FuzOFwLcf4QMoi85RhSbWMZeACzy97LE=";
};
} // (args.argsOverride or { }))

2
pkgs/top-level/aliases.nix
View file

@ -860,6 +860,7 @@ mapAliases ({
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
linuxPackages_6_0 = linuxKernel.packages.linux_6_0;
linuxPackages_6_1 = linuxKernel.packages.linux_6_1;
linuxPackages_6_2 = linuxKernel.packages.linux_6_2;
linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14;
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
@ -880,6 +881,7 @@ mapAliases ({
linux_5_4 = linuxKernel.kernels.linux_5_4;
linux_6_0 = linuxKernel.kernels.linux_6_0;
linux_6_1 = linuxKernel.kernels.linux_6_1;
linux_6_2 = linuxKernel.kernels.linux_6_2;
linuxPackages_mptcp = throw "'linuxPackages_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04
linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04
linux_mptcp_95 = throw "'linux_mptcp_95' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04

11
pkgs/top-level/linux-kernels.nix
View file

@ -174,6 +174,14 @@ in {
];
};
linux_6_2 = callPackage ../os-specific/linux/kernel/linux-6.2.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
];
};
linux_testing = let
testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
@ -540,6 +548,7 @@ in {
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_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
linux_6_2 = recurseIntoAttrs (packagesFor kernels.linux_6_2);
};
rtPackages = {
@ -600,7 +609,7 @@ in {
packageAliases = {
linux_default = packages.linux_5_15;
# Update this when adding the newest kernel major version!
linux_latest = packages.linux_6_1;
linux_latest = packages.linux_6_2;
linux_mptcp = packages.linux_mptcp_95;
linux_rt_default = packages.linux_rt_5_4;
linux_rt_latest = packages.linux_rt_5_10;