Unverified Commit 6e625211 authored by Domen Kožar's avatar Domen Kožar Committed by GitHub
Browse files

Merge pull request #277406 from alyssais/linux-5.15.145 

Linux kernels 2023-12-28
parents e3873746 cfdb96ec

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

+5 −5
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ 
    "5.15": {

        "patch": {

            "extra": "-hardened1",

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

            "sha256": "03b2hg01z7fpscgpiw10bvlhq5dph5shdx5zn15csg5vjy6dl2cb",

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

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

            "sha256": "0jip4c7r41a3nzgv6zzrkjg4flb0ri6ar60l246ixzyp9sv19x9r",

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

        },

        "sha256": "0fsv18q64q17ad7mq818wfhb11dax4bdvbvqyk5ilxyfmypsylzh",

        "version": "5.15.144"

        "sha256": "086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j",

        "version": "5.15.145"

    },

    "5.4": {

        "patch": {

pkgs/os-specific/linux/kernel/kernels-org.json

+4 −4
Original line number Diff line number Diff line 
{

    "testing": {

        "version": "6.7-rc6",

        "hash": "sha256:164jik11lv35jxfbci3vdb413qi241w51jrisilvfqy8ap0ccs4k"

        "version": "6.7-rc7",

        "hash": "sha256:1w1np05mqyviykj0gyx6z2l9ql4f909dy0ximh0gkcpkgy6zz9qc"

    },

    "6.5": {

        "version": "6.5.13",
@@ -12,8 +12,8 @@ 
        "hash": "sha256:0hdm28k49kmy9r96hckps0bvvaq9m06l72n8ih305rccs6a2cgby"

    },

    "5.15": {

        "version": "5.15.144",

        "hash": "sha256:0fsv18q64q17ad7mq818wfhb11dax4bdvbvqyk5ilxyfmypsylzh"

        "version": "5.15.145",

        "hash": "sha256:086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j"

    },

    "5.10": {

        "version": "5.10.205",

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

+2 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchsvn, linux

, scripts ? fetchsvn {

    url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";

    rev = "19441";

    sha256 = "1z0x8cw9nr7qf5qh3xjf6rg20q0i79bg71lik847sabyb6vcrk0z";

    rev = "19453";

    sha256 = "12jy0kyhl9dsp20yprbw27kzh1p4qxi5m5zy9j7sglm9ajrbnkar";

  }

, ...

}:

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

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
, ... } @ args:



let

  version = "5.10.201-rt98"; # updated by ./update-rt.sh

  version = "5.10.204-rt100"; # updated by ./update-rt.sh

  branch = lib.versions.majorMinor version;

  kversion = builtins.elemAt (lib.splitString "-" version) 0;

in buildLinux (args // {
@@ -17,14 +17,14 @@ in buildLinux (args // { 


  src = fetchurl {

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

    sha256 = "0642y6qj2d4aww6jcki81ba53pvjyfazjxgzgj8brqx8ixchdz3a";

    sha256 = "1vnamiyr378q52xgkg7kvpx80zck729dim77vp06a3q6n580g5gz";

  };



  kernelPatches = let rt-patch = {

    name = "rt";

    patch = fetchurl {

      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

      sha256 = "1g7xbjsfrgins3agz9sq9ia13h5k9605gak7s14z5i4vd34y8pk8";

      sha256 = "1zbpkira8wf3w46586af72k43j8xkj15f0dgq86z975vl60hdk68";

    };

  }; in [ rt-patch ] ++ kernelPatches;