Unverified Commit 1239b6c2 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #215674 from Ma27/linux-kernel-updates 

Linux kernel updates 2023-02-10
parents e8ccc50d 98e4c1f8

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

+30 −30
Original line number Diff line number Diff line
@@ -2,61 +2,61 @@ 
    "4.14": {

        "patch": {

            "extra": "-hardened1",

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

            "sha256": "099fqlfl9p57pfh5jr7cv30476q2cbhrqs6w63cy3mkwj7l4jwln",

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

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

            "sha256": "05zcfy7dh8vlbvf9iw99m2xi7d9df254lg3a77hhb8cb264yn6z0",

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

        },

        "sha256": "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4",

        "version": "4.14.304"

        "sha256": "16lmhxqpbhyqmgmlyicjadzz3axhl5smfrr230x45ahkdghwsnx3",

        "version": "4.14.305"

    },

    "4.19": {

        "patch": {

            "extra": "-hardened1",

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

            "sha256": "0xvd9n2fqmr863a4vljki2saa85dccj7mflcfwaslj9g2ygbrf93",

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

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

            "sha256": "1qimbp19mimy6dqv4rc8hb6966sq7l1y72hp0s0vy682qx556zwg",

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

        },

        "sha256": "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3",

        "version": "4.19.271"

        "sha256": "1y8kyc48v8bsl53zc6dsy5xhazv0vyna98fycj181aypicvbk7s8",

        "version": "4.19.272"

    },

    "5.10": {

        "patch": {

            "extra": "-hardened1",

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

            "sha256": "1ygxald6mq47n7i6x80mv9d5idfpwk6gpcijci8bsazhndwvi7qy",

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

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

            "sha256": "0i74kjzilsgyjidz7p9jjxpjx3yqx5gsh7nwlw6zclxg1a82fw24",

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

        },

        "sha256": "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80",

        "version": "5.10.166"

        "sha256": "1iprbgwdgnylzw4dc8jgims54x8dkq070c9vs4642rp529wgj1yq",

        "version": "5.10.167"

    },

    "5.15": {

        "patch": {

            "extra": "-hardened1",

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

            "sha256": "041yigcqzp7m6cibl9h3jgsz20xhxc9y7y5pay9c7fkh2ypy9zgz",

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

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

            "sha256": "0wwi15r51jb0396vc4nbwjh9kxh68jvcbdw72pllwsgkhijgzkhg",

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

        },

        "sha256": "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56",

        "version": "5.15.91"

        "sha256": "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz",

        "version": "5.15.92"

    },

    "5.4": {

        "patch": {

            "extra": "-hardened1",

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

            "sha256": "0xk80i6wddd909wzhcp7b64sbsjjqpwyjr8gknpc83zcdzv3y892",

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

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

            "sha256": "1fximwmcp0205i3jxmglf0jawgy1knrc9cnjpz05am8yi7ndikmd",

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

        },

        "sha256": "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7",

        "version": "5.4.230"

        "sha256": "1a1nbyvkf6iaj5lz6ahg7kk9pyrx7j77jmaj92fyihdl3mzyml4d",

        "version": "5.4.231"

    },

    "6.1": {

        "patch": {

            "extra": "-hardened1",

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

            "sha256": "1ry0cb1dsq84n6cxn8ndx47qz1g69kqlfkb16rrlgk49w81i8y8z",

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

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

            "sha256": "0v0w4phc02ghylqnyhzkl1frmjkxwkxgadf2ycyzm8ckl73q8lr5",

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

        },

        "sha256": "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn",

        "version": "6.1.8"

        "sha256": "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb",

        "version": "6.1.10"

    }

}

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.92";

  version = "5.15.93";



  # modDirVersion needs to be x.y.z, will automatically add .0 if needed

  modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec { 


  src = fetchurl {

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

    sha256 = "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz";

    sha256 = "1baxkkd572110p95ah1wv0b4i2hfbkf8vyncb08y3w0bd7r29vg7";

  };

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

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

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



buildLinux (args // rec {

  version = "6.1.10";

  version = "6.1.11";



  # modDirVersion needs to be x.y.z, will automatically add .0 if needed

  modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec { 


  src = fetchurl {

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

    sha256 = "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb";

    sha256 = "18gpkaa030g8mgmyprl05h4i8y5rjgyvbh0jcl8waqvq0xh0a6sq";

  };

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

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 = "19044";

    sha256 = "1xiykp6lwvlz8x48i7f1f3izra2hfz75iihw3y4w5f1jlji6y56m";

    rev = "19049";

    sha256 = "0873qyk69p8hr91qjaq5rd9z2i6isd3yq3slh1my5y33gc7d3bj2";

  }

, ...

}:

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

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



let

  version = "5.15.86-rt56"; # updated by ./update-rt.sh

  version = "5.15.92-rt57"; # updated by ./update-rt.sh

  branch = lib.versions.majorMinor version;

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

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


  src = fetchurl {

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

    sha256 = "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40";

    sha256 = "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz";

  };



  kernelPatches = let rt-patch = {

    name = "rt";

    patch = fetchurl {

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

      sha256 = "0y7pkzacxh1fsvnbmjq0ljfb4zjw6dq9br6rl8kr3w4dj56fmaxs";

      sha256 = "181db4cdaw8wjrqfh07mbqgyzv1awl1g12x6k8lciv78j10x5kmb";

    };

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