From 15a7f80ac0eab49517cdb1a77ab591249681e68c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 22 Oct 2026 19:09:09 -0400 Subject: [PATCH 1/6] nixosTests.nspawn-interactive: fix ty check failure New ty complains: Annotating the return type as `-> Iterator[Foo]` with `@contextmanager` is deprecated. Use `-> Generator[Foo]` instead. --- nixos/tests/nixos-test-driver/nspawn-interactive.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/nixos-test-driver/nspawn-interactive.nix b/nixos/tests/nixos-test-driver/nspawn-interactive.nix index 0fa23b36ec64..2d412e8ee18b 100644 --- a/nixos/tests/nixos-test-driver/nspawn-interactive.nix +++ b/nixos/tests/nixos-test-driver/nspawn-interactive.nix @@ -26,7 +26,7 @@ in import datetime as dt import os import subprocess - from collections.abc import Iterator + from collections.abc import Generator from contextlib import contextmanager from test_driver.driver import Driver, load_driver_configuration @@ -75,7 +75,7 @@ in xdotool("key", "Return") @contextmanager - def test_display() -> Iterator[None]: + def test_display() -> Generator[None]: # Keep the viewer visible while debugging the outer test interactively. if driver.interactive and os.environ.get("DISPLAY"): yield From 72c32e1f38b5eef7269599df080c4aa1f04f755b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Oct 2026 08:43:23 +0200 Subject: [PATCH 2/6] strace: 7.2 -> 7.3 ChangeLog: https://github.com/strace/strace/releases/tag/v7.3 --- pkgs/by-name/st/strace/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix index f825aa67d9c5..f91eeead8f5a 100644 --- a/pkgs/by-name/st/strace/package.nix +++ b/pkgs/by-name/st/strace/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "strace"; - version = "7.2"; + version = "7.3"; src = fetchurl { url = "https://strace.io/files/${finalAttrs.version}/strace-${finalAttrs.version}.tar.xz"; - hash = "sha256-S95iRpJokNzugk9uasQqBnUvR9d+UJfYbjwNbUtwn+U="; + hash = "sha256-UpY0xAkQiVqaHzxcHmXaLKntcvsVjfxLzInv3wXjm3I="; }; separateDebugInfo = true; From 1baaf8690f1598a3b9a2dd8b441b8da50d596e73 Mon Sep 17 00:00:00 2001 From: Walter McKelvie Date: Fri, 23 Oct 2026 18:53:04 -0400 Subject: [PATCH 3/6] linux/common-config: enable RTC_INTF_DEV_UIE_EMUL --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f38e3dfd0d70..a80045a5179d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1472,6 +1472,9 @@ let # Set system time from RTC on startup and resume RTC_HCTOSYS = option yes; + # Emulate RTC update interrupts for RTCs without alarm/update interrupts + RTC_INTF_DEV_UIE_EMUL = option yes; + # Expose watchdog information in sysfs WATCHDOG_SYSFS = yes; From 81871fe352c0f1b228e96674ddeaf936fa8faa4c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 17 Oct 2026 12:47:35 -0400 Subject: [PATCH 4/6] nixos/test-driver: show deprecated --keep-vm-state warning to users --- nixos/lib/test-driver/src/test_driver/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/src/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py index 568ac5758d05..c767dda703af 100644 --- a/nixos/lib/test-driver/src/test_driver/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/__init__.py @@ -144,7 +144,7 @@ def main() -> None: if "--keep-vm-state" in sys.argv: warnings.warn( "The flag '--keep-vm-state' is deprecated. Use '--keep-machine-state' instead.", - DeprecationWarning, + FutureWarning, ) output_directory = args.output_directory.resolve() From f755ed4576fbf4ae7d7350d94ea4740efbb67554 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 26 Oct 2026 21:45:47 +0000 Subject: [PATCH 5/6] linux_7_2: 7.2.12 -> 7.2.13 --- 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 9e81840e2ef0..fdbaa5a01d7e 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 }, "7.2": { - "version": "7.2.12", - "hash": "sha256:0krdl05l7y8nigrvgdjnxqzxmdppagklcr5a1jh8m5y8in54c65v", + "version": "7.2.13", + "hash": "sha256:0v7accir5bx5l7bsqmmcj29ri64sb1g4n9ysfbwp26fxyb2b1rq8", "lts": false }, "7.3": { From bcd592b6b52ab8e270140b2c8bf2a5977cf4a481 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 26 Oct 2026 21:45:50 +0000 Subject: [PATCH 6/6] linux_6_18: 6.18.58 -> 6.18.59 --- 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 fdbaa5a01d7e..cb89362933ba 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.18": { - "version": "6.18.58", - "hash": "sha256:04w0h6dwm9jvwlpdbxm9887wmssxqch6ajxf960sqk9c0gwik6q6", + "version": "6.18.59", + "hash": "sha256:0qrrw85mbg2dqjkjhm3x2b8hs962wka83qxqjbi4fm9shv4mm9ak", "lts": true }, "7.2": {