Unverified Commit 3ac8c61e authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #244883 from LibreCybernetics/linux_6_3_eol

parents 314c4c1b ffba10cd

nixos/tests/kernel-generic.nix

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ let 
      linux_5_10_hardened

      linux_5_15_hardened

      linux_6_1_hardened

      linux_6_3_hardened

      linux_6_4_hardened

      linux_rt_5_4

      linux_rt_5_10

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

+0 −10
Original line number Diff line number Diff line
@@ -59,16 +59,6 @@ 
        "sha256": "1f45j3ch1ljbacjlg8q45iva9lvwys938rdg0s516mznzlifxpac",

        "version": "6.1.39"

    },

    "6.3": {

        "patch": {

            "extra": "-hardened1",

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

            "sha256": "1iy95awbkrdk5529w9s07axb21l2snab4kifbzjghhz9vwzx22rp",

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

        },

        "sha256": "1ywijjhf19bciip75ppzjjh7bkadd449jr64yg2j5049w9h0aipa",

        "version": "6.3.13"

    },

    "6.4": {

        "patch": {

            "extra": "-hardened1",

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

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
{ lib, fetchurl, buildLinux, ... } @ args:



with lib;



buildLinux (args // rec {

  version = "6.3.13";



  # 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 = "1ywijjhf19bciip75ppzjjh7bkadd449jr64yg2j5049w9h0aipa";

  };

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

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

+1 −4
Original line number Diff line number Diff line
@@ -15,10 +15,7 @@ callPackage ./generic.nix args { 
    if stdenv'.isx86_64 || removeLinuxDRM

    then kernel.kernelOlder "6.4"

    else kernel.kernelOlder "6.2";

  latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then

    linuxKernel.packages.linux_6_3

  else

    linuxKernel.packages.linux_6_1;

  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;



  # this package should point to the latest release.

  version = "2.1.12";

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

+1 −7
Original line number Diff line number Diff line
@@ -11,17 +11,11 @@ let 
in

callPackage ./generic.nix args {

  # check the release notes for compatible kernels

  # NOTE:

  #   zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2

  #   for future releases, please delete this condition.

  kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM

    then kernel.kernelOlder "6.4"

    else kernel.kernelOlder "6.2";



  latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then

    linuxKernel.packages.linux_6_3

  else

    linuxKernel.packages.linux_6_1;

  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;



  # this package should point to a version / git revision compatible with the latest kernel release

  # IMPORTANT: Always use a tagged release candidate or commits from the