Unverified Commit c459a363 authored by Bernardo Meurer's avatar Bernardo Meurer Committed by GitHub
Browse files

Merge pull request #198992 from lovesegfault/kernel-drop-eol

parents f43a8d14 d666b6c1

nixos/tests/kernel-generic.nix

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ let 
      linux_5_4_hardened

      linux_5_10_hardened

      linux_5_15_hardened

      linux_5_19_hardened

      linux_6_0_hardened



      linux_testing;

  };

pkgs/os-specific/linux/kernel/hardened/patches.json

+0 −10
Original line number Diff line number Diff line
@@ -39,16 +39,6 @@ 
        "sha256": "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh",

        "version": "5.15.76"

    },

    "5.19": {

        "patch": {

            "extra": "-hardened1",

            "name": "linux-hardened-5.19.17-hardened1.patch",

            "sha256": "0fs9zdwxbcc3fi4w1qylvvv387ih3g0dnagw5pvq3r2k2g5fflya",

            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.17-hardened1/linux-hardened-5.19.17-hardened1.patch"

        },

        "sha256": "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9",

        "version": "5.19.17"

    },

    "5.4": {

        "patch": {

            "extra": "-hardened1",

pkgs/os-specific/linux/kernel/linux-5.19.nix

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:



with lib;



buildLinux (args // rec {

  version = "5.19.17";



  # 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 = "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9";

  };

} // (args.argsOverride or { }))

pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix

+3 −3
Original line number Diff line number Diff line 
{ lib

, fetchpatch

, kernel

, commitDate ? "2022-09-28"

, currentCommit ? "24c6361e202cc09de0159505eb3ab3ca265520d8"

, diffHash ? "sha256-Y3uKkVMCaLGJpYb27ef3FfbqEQ32mgCVpWtYzvYamr8="

, commitDate ? "2022-10-31"

, currentCommit ? "77c27f28aa58e9d9037eb68c87d3283f68c371f7"

, diffHash ? "sha256-TUpI9z0ac3rjn2oT5Z7oQXevDKbGwTVjyigS5/aGwgQ="

, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage

, argsOverride ? {}

, ...

pkgs/os-specific/linux/zfs/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
, enablePython ? true



# for determining the latest compatible linuxPackages

, linuxPackages_5_19 ? pkgs.linuxKernel.packages.linux_5_19

, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15

, linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_0

}:
@@ -218,7 +218,7 @@ in { 
  zfsStable = common {

    # check the release notes for compatible kernels

    kernelCompatible = kernel.kernelOlder "5.20";

    latestCompatibleLinuxPackages = linuxPackages_5_19;

    latestCompatibleLinuxPackages = linuxPackages_5_15;



    # this package should point to the latest release.

    version = "2.1.6";