diff options
author | K900 <me@0upti.me> | 2022-10-03 11:15:49 +0300 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-10-03 11:04:50 +0000 |
commit | 0faffb55310c6ac42b0741b6a52b88482ae41f96 (patch) | |
tree | a2e5a3e2c372701d56ab6c8d40b8b2d19fa08cf3 | |
parent | 5f29236ab9f741304d7144ad851af7875d4c37d2 (diff) | |
download | nixlib-0faffb55310c6ac42b0741b6a52b88482ae41f96.tar nixlib-0faffb55310c6ac42b0741b6a52b88482ae41f96.tar.gz nixlib-0faffb55310c6ac42b0741b6a52b88482ae41f96.tar.bz2 nixlib-0faffb55310c6ac42b0741b6a52b88482ae41f96.tar.lz nixlib-0faffb55310c6ac42b0741b6a52b88482ae41f96.tar.xz nixlib-0faffb55310c6ac42b0741b6a52b88482ae41f96.tar.zst nixlib-0faffb55310c6ac42b0741b6a52b88482ae41f96.zip |
linux/6.0: init
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-6.0.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/linux-kernels.nix | 10 |
3 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix new file mode 100644 index 000000000000..b099c5dc140c --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "6.0"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # 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 = "13kqh7yhifwz5dmd3ky0b3mzbh9r0nmjfp5mxy42drcdafjl692w"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dc8bfc0d639d..b2f6dc7f3781 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -652,6 +652,7 @@ mapAliases ({ linuxPackages_5_18 = linuxKernel.packages.linux_5_18; linuxPackages_5_19 = linuxKernel.packages.linux_5_19; linuxPackages_5_4 = linuxKernel.packages.linux_5_4; + linuxPackages_6_0 = linuxKernel.packages.linux_6_0; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -672,6 +673,7 @@ mapAliases ({ linux_5_18 = linuxKernel.kernels.linux_5_18; linux_5_19 = linuxKernel.kernels.linux_5_19; linux_5_4 = linuxKernel.kernels.linux_5_4; + linux_6_0 = linuxKernel.kernels.linux_6_0; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 139848b4fe97..6cf5da069e0a 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -177,6 +177,13 @@ in { ]; }; + linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -531,6 +538,7 @@ in { linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19); + linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0); }; rtPackages = { @@ -588,7 +596,7 @@ in { packageAliases = { linux_default = packages.linux_5_15; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_5_19; + linux_latest = packages.linux_6_0; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_5_10; |