From 380fdc10ac3ecb4ec7e7829980c83aad90dbc8d8 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Mon, 7 Sep 2026 10:16:43 +0200
Subject: [PATCH 1/3] nixos/stage-2: add x-initrd.mount to nixStoreMountOpts

Adding the x-initrd.mount flag here ensures that systemd keeps this
mount around until the very end of the shutdown procedure and thus
avoids the error message that it was unable to unmount the Nix Store.

This was first reported here: https://github.com/NixOS/nixos/issues/126

We always carried a patch to systemd to avoid this message.#
The patch 0001-Don-t-try-to-unmount-nix-or-nix-store.patch becomes
unnecessary with this commit and can be removed.
---
 nixos/modules/system/boot/stage-2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index 9b72391c20ac..08d78ade44ea 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -63,6 +63,7 @@ in
       nixStoreMountOpts = mkOption {
         type = types.listOf types.nonEmptyStr;
         default = [
+          "x-initrd.mount"
           "ro"
           "nodev"
           "nosuid"

From a856a94b2cbd19392b8f34b47a2bcc56c1b7386a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 11 Sep 2026 10:47:45 +0000
Subject: [PATCH 2/3] linux_7_2: 7.2.4 -> 7.2.5

---
 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 bde07a2a15ca..59d2f93f4f7a 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -35,8 +35,8 @@
         "lts": true
     },
     "7.2": {
-        "version": "7.2.4",
-        "hash": "sha256:1p98bi0zzk3al2d0i28ms4h8vq2ps3n2prdsy69c9nip2zh0ww81",
+        "version": "7.2.5",
+        "hash": "sha256:0y1bcg3pg6zm59bjfrgh1bsy68kxjy9vvxygdzcxmn95hggz1pam",
         "lts": false
     }
 }

From 7ba387df069e0730a0be43145ccceeae10c105a8 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 11 Sep 2026 10:47:48 +0000
Subject: [PATCH 3/3] linux_6_18: 6.18.50 -> 6.18.51

---
 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 59d2f93f4f7a..982ebfb1e54a 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.50",
-        "hash": "sha256:0q842zpaqb5vi749g2lawa62p9gsb3h3p99vbrjdj4afmcfh9z6j",
+        "version": "6.18.51",
+        "hash": "sha256:04znimsjfimxxaarzaksn4jvkj1xr5ba7yh1j691ykdzb3w60bxs",
         "lts": true
     },
     "7.2": {