Skip to content

Kernel updates for 2022-08-11 #186129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
winterqt wants to merge 13 commits into from
Closed

Kernel updates for 2022-08-11 #186129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4de5b45
linux-hardened: use default python3 version in update script
winterqt Aug 11, 2022
8f1448f
linux-hardened: specify system when calling nix-instantiate in update…
winterqt Aug 11, 2022
35646a5
linux: 4.19.254 -> 4.19.255
winterqt Aug 11, 2022
3ca2b93
linux: 5.10.135 -> 5.10.136
winterqt Aug 11, 2022
48b732e
linux: 5.15.59 -> 5.15.60
winterqt Aug 11, 2022
90bd573
linux: 5.18.16 -> 5.18.17
winterqt Aug 11, 2022
3a3d4aa
linux: 5.19 -> 5.19.1
winterqt Aug 11, 2022
9f525a6
linux: 5.4.209 -> 5.4.210
winterqt Aug 11, 2022
9e2fcc9
linux-rt_5_4: 5.4.193-rt74 -> 5.4.209-rt77
winterqt Aug 11, 2022
dcccffc
linux/hardened/patches/5.10: 5.10.134-hardened1 -> 5.10.135-hardened1
winterqt Aug 11, 2022
098db28
linux/hardened/patches/5.15: 5.15.58-hardened1 -> 5.15.59-hardened1
winterqt Aug 11, 2022
9c6a0fb
linux/hardened/patches/5.18: 5.18.15-hardened1 -> 5.18.16-hardened1
winterqt Aug 11, 2022
d0e83d2
linux/hardened/patches/5.4: 5.4.208-hardened1 -> 5.4.209-hardened1
winterqt Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions pkgs/os-specific/linux/kernel/hardened/patches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,41 +22,41 @@
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.134-hardened1.patch",
"sha256": "0d6ygrsssbww9aqy55q1zxq2b1y9lwnz0j8xfqpya3c3hll1951a",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.134-hardened1/linux-hardened-5.10.134-hardened1.patch"
"name": "linux-hardened-5.10.135-hardened1.patch",
"sha256": "05r6k83y2mpyx0ah9xjczmq2p3721jx911p1wxswwrv5rwia6x36",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.135-hardened1/linux-hardened-5.10.135-hardened1.patch"
},
"sha256": "0s9j4zzck9880kvyb18i2ng6dc16p0dwsi95mkwdhg83vyn16dgc",
"version": "5.10.134"
"sha256": "0i1kahv739qpyyml7d7sx306nv7gp55i5d97vlb0fryfx4dsd6g4",
"version": "5.10.135"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.58-hardened1.patch",
"sha256": "1c2friimfzi5i0x76z66wdgkfafly1rhpy8zzs7li3s79d22138k",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.58-hardened1/linux-hardened-5.15.58-hardened1.patch"
"name": "linux-hardened-5.15.59-hardened1.patch",
"sha256": "08vw8f420nld6bs854m9z2w9kg6cbdav08j99fbivda5zlf8bm18",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.59-hardened1/linux-hardened-5.15.59-hardened1.patch"
},
"sha256": "1a2gzjfymfafvk8cvibr1zdfydzxg0c5j772c9hqwcabkibxjnyp",
"version": "5.15.58"
"sha256": "1jxw6fnc7yaw7r6193wy6l8wdlpy3frw48drnc3dnh3k0m1cdpg6",
"version": "5.15.59"
},
"5.18": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.18.15-hardened1.patch",
"sha256": "0ir6k4d9mx4skyhxjin2hn237kl3qh6cl0kmjqkqyxkm83k12kln",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.15-hardened1/linux-hardened-5.18.15-hardened1.patch"
"name": "linux-hardened-5.18.16-hardened1.patch",
"sha256": "0f24p9m4wbmh99iwa2cf4d7q33qcpvazzn60ngm6mpa3vynm4lx3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.16-hardened1/linux-hardened-5.18.16-hardened1.patch"
},
"sha256": "0g5yvhq7rmkzvfl4w50l7bg56a20insvg4s4nvgnk2iqvkmlz039",
"version": "5.18.15"
"sha256": "1khi1npn8d8jimwdy8bf3r7l780mxdmvk5azdv419pk33qjqdxgi",
"version": "5.18.16"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.208-hardened1.patch",
"sha256": "0pknl9ac0qn8yig1hfm3hmlmvf5pxswymyilv0w3kcsacgg22xyi",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.208-hardened1/linux-hardened-5.4.208-hardened1.patch"
"name": "linux-hardened-5.4.209-hardened1.patch",
"sha256": "1s7fis20x9ahvm2d344hff31kjvnm76ykqn423vk9lsb8ivnsy93",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.209-hardened1/linux-hardened-5.4.209-hardened1.patch"
},
"sha256": "0i0fxv04r6g5ha84chih5cqsy59cv67pjxp8zfrdk1qapwddyvgh",
"version": "5.4.208"
"sha256": "1kdnz99k7zspzaxqaxahbf6hncigy4cvjlb79jsy7a95qxxr31qf",
"version": "5.4.209"
}
}
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/hardened/update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
#! nix-shell -i python -p "python38.withPackages (ps: [ps.PyGithub])" git gnupg
#! nix-shell -i python -p "python3.withPackages (ps: [ps.PyGithub])" git gnupg

# This is automatically called by ../update.sh.

Expand Down Expand Up @@ -201,7 +201,7 @@ def commit_patches(*, kernel_key: str, message: str) -> None:
(callPackage {NIXPKGS_KERNEL_PATH / filename} {{}}).version
"""
kernel_version_json = run(
"nix-instantiate", "--eval", "--json", "--expr", nix_version_expr,
"nix-instantiate", "--eval", "--system", "x86_64-linux", "--json", "--expr", nix_version_expr,
).stdout
kernel_version = parse_version(json.loads(kernel_version_json))
if kernel_version < MIN_KERNEL_VERSION:
Expand Down
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "4.19.254";
version = "4.19.255";

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

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1rd40wmdaymbly2zvf60mjqsflkd4n1y232qz0ixn1rfl28yz62i";
sha256 = "0hwa3g09cmllc2z01s2jqbczpznzdp3ldngx18k5c2ac7w394fbp";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.10.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "5.10.135";
version = "5.10.136";

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

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0i1kahv739qpyyml7d7sx306nv7gp55i5d97vlb0fryfx4dsd6g4";
sha256 = "0naiwihlj6aswnqwdz3xzmga98xpj5lf2iy9vxqzdng7b46rs28w";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.15.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "5.15.59";
version = "5.15.60";

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

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1jxw6fnc7yaw7r6193wy6l8wdlpy3frw48drnc3dnh3k0m1cdpg6";
sha256 = "0yi3bvqz4qn8nvgr910ic09zvpisafwi282j0y2gvbvgr7vlb59d";
};
} // (args.argsOverride or { }))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.18.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "5.18.16";
version = "5.18.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;
Expand All @@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1khi1npn8d8jimwdy8bf3r7l780mxdmvk5azdv419pk33qjqdxgi";
sha256 = "0i7yms65b8kxjm92ahic0787vb9h7xblbwp1v6cq8zpns3ivv0ih";
};
} // (args.argsOverride or { }))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.19.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "5.19";
version = "5.19.1";

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

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1a05a3hw4w3k530mxhns96xw7hag743xw5w967yazqcykdbhq97z";
sha256 = "0mgak94i4z9s1kdyw211ks4si4ngaii71xdiin06pim2ds97pqpl";
};
} // (args.argsOverride or { }))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

buildLinux (args // rec {
version = "5.4.209";
version = "5.4.210";

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

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1kdnz99k7zspzaxqaxahbf6hncigy4cvjlb79jsy7a95qxxr31qf";
sha256 = "13l8zh5balciqhi4k4328sznza30v8g871wxcqqka61cij3rc0wl";
};
} // (args.argsOverride or {}))
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
, ... } @ args:

let
version = "5.4.193-rt74"; # updated by ./update-rt.sh
version = "5.4.209-rt77"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
inherit version;

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "187jfk9hf52n5z9yv56vq1knp3kdcbyk5w5k98ziwcbdjm1x65hd";
sha256 = "1kdnz99k7zspzaxqaxahbf6hncigy4cvjlb79jsy7a95qxxr31qf";
};

kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1gn4ii5pr0870ba481nqbd5rxk7ajrarv1p5mipfi42x07rpn7c2";
sha256 = "1wh5m7ychgnn33yg7gg9nlwcmmm72dixvdf77m764hs90xl8c9ig";
};
}; in [ rt-patch ] ++ kernelPatches;

Expand Down