From c42c1ee1e7068b15d924d755df7af4065becfce3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 23 Jul 2026 22:25:21 +0200 Subject: [PATCH 1/7] nixos/test-driver: fix corrupt hosts files primaryIPAddress is defined using lib.optionalString. If it is the empty string (because there are no assigned IP addresses), and the machine has a hostname, we don't want to generate an invalid hosts file with that empty string as the first (IP address) field. (cherry picked from commit beeb739e480b9a375201e380006f697e23e60892) --- nixos/lib/testing/network.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/testing/network.nix b/nixos/lib/testing/network.nix index 86d65faf21ad..635e5ebebf05 100644 --- a/nixos/lib/testing/network.nix +++ b/nixos/lib/testing/network.nix @@ -93,7 +93,7 @@ let # We also want to test router protocols that enable connections # between nodes even if they don't share a VLAN, so we include # the primary IPs of all machines in the hosts file. - primaryIPs = [ + primaryIPs = lib.remove "" [ remoteConfig.networking.primaryIPAddress remoteConfig.networking.primaryIPv6Address ]; From f6115a574e1d554ee9e822c816c8267db18462fb Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Fri, 31 Jul 2026 00:38:06 +0200 Subject: [PATCH 2/7] linux_6_18: 6.18.40 -> 6.18.41 (cherry picked from commit 8d75fd2828f18d4f7c854c579aeecd6887750b3b) --- 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 5d9aaeea6438..a48c6b44f62e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,8 +30,8 @@ "lts": true }, "6.18": { - "version": "6.18.40", - "hash": "sha256:0cd42fb4390x73jdzbhacm9g9s0ji58whxhik2ndmr1rr0ggq4ip", + "version": "6.18.41", + "hash": "sha256:1skk2aimvhhymsvs15p83v2mwnlwbmghh82x79isia6lz3q75z0p", "lts": true }, "7.1": { From d59a7523bb44c32e60d35e4b4de262cc6d01f510 Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Fri, 31 Jul 2026 00:38:12 +0200 Subject: [PATCH 3/7] linux_6_12: 6.12.97 -> 6.12.100 (cherry picked from commit 324efc5a8b33115f89dc8d3f699275fa56bd6206) --- 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 a48c6b44f62e..433e8b828639 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -25,8 +25,8 @@ "lts": true }, "6.12": { - "version": "6.12.97", - "hash": "sha256:0vswyjh91x52ay99mqrdfhwnvd6nnzv4hpncywk908njpfixzgbc", + "version": "6.12.100", + "hash": "sha256:147fvkpsa9n5gv207xyb6if0vmahmvpvrb2bfy32wj866i9p7yb7", "lts": true }, "6.18": { From c672634e384a7b7e6199d3dc52a0330667209da1 Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Fri, 31 Jul 2026 00:38:14 +0200 Subject: [PATCH 4/7] linux_6_6: 6.6.145 -> 6.6.147 (cherry picked from commit 68ac597bdfda6236e64e24e45ee2c0729b95ed84) --- 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 433e8b828639..303b8fa0e747 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "lts": true }, "6.6": { - "version": "6.6.145", - "hash": "sha256:09h1pzcai0i10pdyyfbsmq03rgk1x5wv2d937m5nz2xdv0rhw46y", + "version": "6.6.147", + "hash": "sha256:1fsavd2armiwrnz0w556dmm54z76zwy2as0qbbaq6s04xsvjjqz7", "lts": true }, "6.12": { From 718d3dfcee5a6dbc3f6ef3b8575ebfb0fdf7d82f Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Fri, 31 Jul 2026 00:38:16 +0200 Subject: [PATCH 5/7] linux_6_1: 6.1.178 -> 6.1.180 (cherry picked from commit 12608ef2a45ec9488253ec9719d992996eb64b80) --- 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 303b8fa0e747..b61cb25c876b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,8 +5,8 @@ "lts": false }, "6.1": { - "version": "6.1.178", - "hash": "sha256:03vjdk7lk9zgydzamhwvrg066f8748vrfjggqqd2n0vmr9kzm0vx", + "version": "6.1.180", + "hash": "sha256:0spql1ybfr879wl35rfd2nwlzirvp5chi6gl1d6zqp5mb4bn03jg", "lts": true }, "5.15": { From 1240c09249f3dca5a65283de3b9ddb0e7567e1a7 Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Fri, 31 Jul 2026 00:38:19 +0200 Subject: [PATCH 6/7] linux_5_15: 5.15.212 -> 5.15.213 (cherry picked from commit 49aa3425d7a9180517638b410ae0d5468275b7d3) --- 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 b61cb25c876b..0081fb63c360 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -10,8 +10,8 @@ "lts": true }, "5.15": { - "version": "5.15.212", - "hash": "sha256:1zk51f3pv7ghz68hxkxhds9cjwmk35651pxbyyvyqyhcr7msx5n3", + "version": "5.15.213", + "hash": "sha256:1n71f4im5jg836wk2g4llkxxvmdzbxj7172pxqcf9wrmhm5inwn4", "lts": true }, "5.10": { From c5098ddc77fd72b564a8c4b801402ec012d25073 Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Fri, 31 Jul 2026 00:38:21 +0200 Subject: [PATCH 7/7] linux_5_10: 5.10.261 -> 5.10.262 (cherry picked from commit 357e545218d0950ee03a3c2767ef32d9cb1ead99) --- 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 0081fb63c360..39ae3efec3ce 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -15,8 +15,8 @@ "lts": true }, "5.10": { - "version": "5.10.261", - "hash": "sha256:1i6pzaib30r1nmyxsrhqmfsdxy1jvvlmzc9f8lxzv9a00q8a3751", + "version": "5.10.262", + "hash": "sha256:10xlfmblynqcba5ab4h75p7pzqcbm34cbhrx19pkircpkf5dmrzs", "lts": true }, "6.6": {