From 90ea2e57fa575ef8447ff7126c76fe76c8e9b5b6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 25 Jul 2024 17:52:51 +0200 Subject: [PATCH 1/6] linux_6_10: 6.10 -> 6.10.1 (cherry picked from commit 36ad25e0866297e4a0760db6e40c7851085ac9e1) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 61c9c5719a66..25b6276f3bbf 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -36,7 +36,7 @@ "hash": "sha256:18adcli0pazz7x62ws4hrj64prs6fmxln3p3xaii6zd6bwrjxlgg" }, "6.10": { - "version": "6.10", - "hash": "sha256:09p2z3z8c3aq6ipqdc58x6s52sy0cmyg6mj4f0g5yk755r19hikp" + "version": "6.10.1", + "hash": "sha256:0szpkhrwfqwj068vz032daf3zycv5c93gjxiisjziifi3kyrs43h" } } From aa71bf893a34dd020fc6db88cfc4cb64840c716a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 25 Jul 2024 17:53:21 +0200 Subject: [PATCH 2/6] linux_6_9: 6.9.10 -> 6.9.11 (cherry picked from commit 704b37a0cf44a082ab5de9672f233fdc42510310) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 25b6276f3bbf..f44d14c7b684 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -32,8 +32,8 @@ "hash": "sha256:0fb0m0fv4521g63gq04d7lm6hy8169s1rykiav5bkd99s9b1kcqr" }, "6.9": { - "version": "6.9.10", - "hash": "sha256:18adcli0pazz7x62ws4hrj64prs6fmxln3p3xaii6zd6bwrjxlgg" + "version": "6.9.11", + "hash": "sha256:1q8kyn9cxc1ykf3cvifmfqk2p2p4x53l7h704hh92gichgh89pyy" }, "6.10": { "version": "6.10.1", From 2ba267319c099b0f4ca31333a56234d5a8c3fa4f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 25 Jul 2024 17:54:04 +0200 Subject: [PATCH 3/6] linux_6_6: 6.6.41 -> 6.6.42 (cherry picked from commit c82d23ea4a56c0400ae0e58a53cac1c596c3c8b3) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index f44d14c7b684..67d87946a495 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:14vl0288apl76rvxa9yxfggrc4600bjsn4gw097m4gy5ldiaapqd" }, "6.6": { - "version": "6.6.41", - "hash": "sha256:1vrjw0yhzmmnbrxyzjrfyz1s8bixciv1ly9pkgcqbasqh5brrjcy" + "version": "6.6.42", + "hash": "sha256:10z6fjvpiv3l11rpsd6fgi7dr6a3d38c6zlp8ihffx6pjz1ch0c8" }, "6.8": { "version": "6.8.12", From 10d4654d68d5d67e096ba4980e9ed4219f8c9e4f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 25 Jul 2024 17:54:48 +0200 Subject: [PATCH 4/6] linux_6_1: 6.1.100 -> 6.1.101 (cherry picked from commit 537a204729d3dcce3ca17ae686c6bf39b47fc1d5) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 67d87946a495..bc585f07c021 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:0i29ga9lzqd4zcsbr4bbb122i8nyfhcalihnq3bgsg04dwb36s19" }, "6.1": { - "version": "6.1.100", - "hash": "sha256:1fd8cmdni1lgjzgn74i5dih5kx3b1axqyhiddxn4s8qgl30nxamr" + "version": "6.1.101", + "hash": "sha256:0k5kjb2n78dcfpqqj8n76fxqbmifs2gqd2z1g9had7s2d2m9yigi" }, "5.15": { "version": "5.15.163", From 5bd8c915fb3ea4467e2d2bd5eadf65c76384fb40 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 25 Jul 2024 17:58:02 +0200 Subject: [PATCH 5/6] linux-rt_6_6: 6.6.40-rt36 -> 6.6.41-rt37 (cherry picked from commit bbe82bf91cd7b65bd912efd884819faf9d0113c1) --- pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index 923b79ce8c04..23aefed2d75a 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.6.40-rt36"; # updated by ./update-rt.sh + version = "6.6.41-rt37"; # 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/v6.x/linux-${kversion}.tar.xz"; - sha256 = "0f7mmw5pzd174376m7r928xbi9mdcla0vy6plq0xdf2mq01kqfjw"; + sha256 = "1vrjw0yhzmmnbrxyzjrfyz1s8bixciv1ly9pkgcqbasqh5brrjcy"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "011ajsiqhd7i1b2pzn6gaihh483n3rzyg219qz6d17a069mv5lj2"; + sha256 = "0b2l0bdyb49x7by8wamqfr3yhy722pz55k5a9bvq8pvmqn9s8a3b"; }; }; in [ rt-patch ] ++ kernelPatches; From 2df31b0d428ddce64ebfc21e89f6d9cd209f32c5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 25 Jul 2024 17:58:42 +0200 Subject: [PATCH 6/6] linux_latest-libre: 19611 -> 19618 (cherry picked from commit 721bf874c6faffff944daeb9c6ce1c05d7c744d2) --- 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 918039ca8213..2793e4d9885c 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 = "19611"; - sha256 = "1a6h99b5i5ypr7wrfpdi6xppaf4501xw5r3qq2r9zf5qa76yjbn1"; + rev = "19618"; + sha256 = "1qxk3q13azn8qnk5ciavs2mqmsz9kwyvd9zfya093ykibbj9iwcl"; } , ... }: