JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #144079 from xaverdh/linux-5.15

Browse Source 
Linux 5.15
This commit is contained in:
Maximilian Bosch 2021-11-01 11:29:59 +01:00 committed by GitHub
commit f823249125
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/tests/kernel-generic.nix
View File

@ -23,22 +23,14 @@ let
assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a") assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
''; '';
}) args); }) args);
kernels = { kernels = pkgs.linuxKernel.vanillaPackages // {
inherit (pkgs) inherit (pkgs.linuxKernel.packages)
linuxPackages_4_4 linux_4_14_hardened
linuxPackages_4_9 linux_4_19_hardened
linuxPackages_4_14 linux_5_4_hardened
linuxPackages_4_19 linux_5_10_hardened
linuxPackages_5_4
linuxPackages_5_10
linuxPackages_5_14
linuxPackages_4_14_hardened linux_testing;
linuxPackages_4_19_hardened
linuxPackages_5_4_hardened
linuxPackages_5_10_hardened
linuxPackages_testing;
}; };
in mapAttrs (_: lP: testsForLinuxPackages lP) kernels // { in mapAttrs (_: lP: testsForLinuxPackages lP) kernels // {

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

@ -0,0 +1,18 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.15";
# 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/v5.x/linux-${version}.tar.xz";
sha256 = "sha256-V7LPaZGRDjtnobNJACLooGdLaWXHTBLaHpnRONGZHug=";
};
} // (args.argsOverride or { }))

10
pkgs/top-level/linux-kernels.nix
View File

@ -174,6 +174,13 @@ in {
]; ];
}; };
linux_5_15 = callPackage ../os-specific/linux/kernel/linux-5.15.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
@ -468,6 +475,7 @@ in {
linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14); linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14);
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
}; };
rtPackages = { rtPackages = {
@ -513,7 +521,7 @@ in {
packageAliases = { packageAliases = {
linux_default = packages.linux_5_10; linux_default = packages.linux_5_10;
# Update this when adding the newest kernel major version! # Update this when adding the newest kernel major version!
linux_latest = packages.linux_5_14; linux_latest = packages.linux_5_15;
linux_mptcp = packages.linux_mptcp_95; linux_mptcp = packages.linux_mptcp_95;
linux_rt_default = packages.linux_rt_5_4; linux_rt_default = packages.linux_rt_5_4;
linux_rt_latest = packages.linux_rt_5_11; linux_rt_latest = packages.linux_rt_5_11;