Unverified Commit 3dc3a628 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #204169: Linux Kernel updates for 2022-12-02

parents 3ee2fd4a b9a49910

pkgs/os-specific/linux/kernel/common-config.nix

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ let 
      INTEL_RAPL                       = whenAtLeast "5.3" module;

      X86_INTEL_LPSS                   = yes;

      X86_INTEL_PSTATE                 = yes;

      X86_AMD_PSTATE                   = whenAtLeast "5.17" module;

      X86_AMD_PSTATE                   = whenAtLeast "5.17" yes;

    };



    external-firmware = {

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

+10 −10
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ 
    "5.15": {

        "patch": {

            "extra": "-hardened1",

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

            "sha256": "102zaxvyjq1gwnp69w3941ni92sv7k1fsf35f1f9vj0hj6jig7j3",

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

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

            "sha256": "1d471cqh81pzd3xv30pcy1whsgvpw0qzig27w57f2m794jnjkz3y",

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

        },

        "sha256": "0m61k7k6lj24z9a266q08wzghggjik2wizcabdwd1vn0vcqr18yb",

        "version": "5.15.79"

        "sha256": "0kgxznd3sfbmnygjvp9dzhzg5chxlaxk6kldxmh1y0njcrj1lciv",

        "version": "5.15.80"

    },

    "5.4": {

        "patch": {
@@ -52,11 +52,11 @@ 
    "6.0": {

        "patch": {

            "extra": "-hardened1",

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

            "sha256": "08xvsqb3d0j98n2i4468ja9miydgy3kcrz66fbi1kymn79yam62n",

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

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

            "sha256": "1zbhqwhbzjc2jsmbrqk6y4w62b9drhzh2kb1p5bwgi3nd17f43jj",

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

        },

        "sha256": "0mx2bxgnxm3vz688268939xw90jqci7xn992kfpny74mjqwzir0d",

        "version": "6.0.8"

        "sha256": "1l0xak4w7c16cg8lhracy8r18zzdl0x5s654w6ivyw6dhk6pzr9r",

        "version": "6.0.10"

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
with lib;



buildLinux (args // rec {

  version = "5.10.156";

  version = "5.10.157";



  # 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;
@@ -13,6 +13,6 @@ buildLinux (args // rec { 


  src = fetchurl {

    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

    sha256 = "08srjps110zi4ivzh0z2jf78ddyfj2wivdliffb2f03jr9j9k7k7";

    sha256 = "0zrjdmaj3sx0w7397glaiq6w9wwdj7lpff77a09kzmbyfz0dfk7w";

  };

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

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

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
with lib;



buildLinux (args // rec {

  version = "5.15.80";

  version = "5.15.81";



  # 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;
@@ -13,6 +13,6 @@ buildLinux (args // rec { 


  src = fetchurl {

    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

    sha256 = "0kgxznd3sfbmnygjvp9dzhzg5chxlaxk6kldxmh1y0njcrj1lciv";

    sha256 = "1awny3lgfkh5n2gdksajbyzips8kawz6rkr0p5inwkbmppg5r24g";

  };

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

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

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
with lib;



buildLinux (args // rec {

  version = "6.0.10";

  version = "6.0.11";



  # 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;
@@ -13,6 +13,6 @@ buildLinux (args // rec { 


  src = fetchurl {

    url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";

    sha256 = "1l0xak4w7c16cg8lhracy8r18zzdl0x5s654w6ivyw6dhk6pzr9r";

    sha256 = "0qn7m74wfixqk832j2yvgf2lq4vi55agm5gk9ziy2wa9wqqn3bib";

  };

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