From b1d5878347cbf668fee798c41d53ba1480cf98dd Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 25 May 2023 09:02:57 +0300 Subject: [PATCH 1/6] linux: 5.15.112 -> 5.15.113 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index aca785d7cb8..f0cadba30a0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.112"; + version = "5.15.113"; # 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 = "0lfnd8mpb3nzvd0gk0jbls3zx7y5kskc4kgccjgkc34flgdyps5h"; + sha256 = "1jmrnd0ri75gl0k80g93zqyg00lbf1gqai3dga383ms92799hkja"; }; } // (args.argsOverride or { })) From 669156c282bbf723509ebce9a65bbb86673ef457 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 25 May 2023 09:03:02 +0300 Subject: [PATCH 2/6] linux: 6.1.29 -> 6.1.30 --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 22a46666cd0..1bdb9aac5cf 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.29"; + version = "6.1.30"; # 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 = "1yzwp0496j63c6lhvsni1ynr8b2cpn552pli3nd3fdk0pp4nqwqy"; + sha256 = "04w8c2j3gfxmn3gc270cmqsxcyp8nm7mi5l268jwpg4yrb259whv"; }; } // (args.argsOverride or { })) From fe5ff41bc8a753039e80aaad8e7f68ec46bbd430 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 25 May 2023 09:03:08 +0300 Subject: [PATCH 3/6] linux: 6.3.3 -> 6.3.4 --- pkgs/os-specific/linux/kernel/linux-6.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.3.nix b/pkgs/os-specific/linux/kernel/linux-6.3.nix index 61b294c3c5d..c57a265cffd 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.3.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.3.3"; + version = "6.3.4"; # 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 = "1ra4kr9bp1s9d7amvz6ik1q3chwps5lysn37b28770pfdim22xc9"; + sha256 = "1s385fvhpzzlh97gv1dj82p52w0fdsjga7hbs03ycfkbxll7aqnq"; }; } // (args.argsOverride or { })) From de66762d8e74703e7b9c8117a12a479441bfb438 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 25 May 2023 09:03:35 +0300 Subject: [PATCH 4/6] linux-rt_5_10: 5.10.176-rt86 -> 5.10.179-rt87 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 9e75a133237..332bca6212d 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.176-rt86"; # updated by ./update-rt.sh + version = "5.10.179-rt87"; # 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 = "14zpdrrrpgxx44nxjn0rifrchnmsvvpkzpm1n82kw5q4p9h2q1yf"; + sha256 = "0abylcqbzpxxh45kmvd9i2cig64aajz87j5c8vm3w1ab2mf49g8v"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0pjf9fdhfh562mp18q8zwk4mbwj736yhmvakj0vr41ax9r3frj0l"; + sha256 = "045pjxlrv05vpiavgnaq971ziirxa1hzkzs1fv11npp4q45lqzp3"; }; }; in [ rt-patch ] ++ kernelPatches; From cbc1ca03451abe37ad863c5ce8b0c4fd4d3faa61 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 25 May 2023 09:03:57 +0300 Subject: [PATCH 5/6] linux_latest-libre: 19204 -> 19299 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 1e1382f86a4..ff40cf6bb79 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19204"; - sha256 = "1cxg2bslskjby11mxqv71w701217i1s9yj73ih3hjzxs6hkv9r0v"; + rev = "19299"; + sha256 = "1sqygvk81p0wfssjswz4hg2mqx9ak8a515rdzwf1a7n728sway7l"; } , ... }: From d64a44465772dfad7bce53cab03872609d4fb456 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 25 May 2023 09:09:20 +0300 Subject: [PATCH 6/6] linux: drop merged patch --- pkgs/top-level/linux-kernels.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index bbaf6f183f6..f12228b2933 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -170,7 +170,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.make-maple-state-reusable-after-mas_empty_area kernelPatches.fix-em-ice-bonding ]; }; @@ -179,7 +178,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.make-maple-state-reusable-after-mas_empty_area kernelPatches.fix-em-ice-bonding kernelPatches.export-rt-sched-migrate ]; @@ -198,7 +196,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.make-maple-state-reusable-after-mas_empty_area kernelPatches.fix-em-ice-bonding ]; };