diff --git a/nixos/lib/test-driver/src/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py
index a63e881bbca3..8e607ccd7a31 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()
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
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;
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;
 
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 9e81840e2ef0..cb89362933ba 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,13 +20,13 @@
         "lts": true
     },
     "6.18": {
-        "version": "6.18.58",
-        "hash": "sha256:04w0h6dwm9jvwlpdbxm9887wmssxqch6ajxf960sqk9c0gwik6q6",
+        "version": "6.18.59",
+        "hash": "sha256:0qrrw85mbg2dqjkjhm3x2b8hs962wka83qxqjbi4fm9shv4mm9ak",
         "lts": true
     },
     "7.2": {
-        "version": "7.2.12",
-        "hash": "sha256:0krdl05l7y8nigrvgdjnxqzxmdppagklcr5a1jh8m5y8in54c65v",
+        "version": "7.2.13",
+        "hash": "sha256:0v7accir5bx5l7bsqmmcj29ri64sb1g4n9ysfbwp26fxyb2b1rq8",
         "lts": false
     },
     "7.3": {