diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 17089141e9e..a300609cf2b 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -32,6 +32,7 @@ with pkgs; { linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; linux_5_11 = makeKernelTest "5.11" linuxPackages_5_11; + linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12; linux_testing = makeKernelTest "testing" linuxPackages_testing; } diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix new file mode 100644 index 00000000000..9450b4ec304 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -0,0 +1,20 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.12.2"; + + # 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 = "03gp5vq8vkwvksjsa1birds37rmrr73s9ik6m1wvgz8mdncvk64c"; + }; + + kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74152f3fd51..bd8ef36585b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20111,6 +20111,13 @@ in ]; }; + linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -20416,6 +20423,7 @@ in linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11); + linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12); # When adding to the list above: # - Update linuxPackages_latest to the latest version