From 9ba559c8d90ac55b795f51bc6d0d6ec9fb2a7f9f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 30 Sep 2025 21:07:54 +0100
Subject: [PATCH 1/3] nixosTests.installer.swraid: enable --bitmap=internal
 (fix interactive hang)

Co-authored-by: Philip Taron <philip.taron@gmail.com>
---
 nixos/tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index e68b8eca5f21..893595ec2923 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -1451,9 +1451,9 @@ in
           "cat /proc/partitions >&2",
           "udevadm control --stop-exec-queue",
           "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 "
-          + "--raid-devices=2 /dev/vda5 /dev/vda6",
+          + "--raid-devices=2 --bitmap=internal /dev/vda5 /dev/vda6",
           "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 "
-          + "--raid-devices=2 /dev/vda7 /dev/vda8",
+          + "--raid-devices=2 --bitmap=internal /dev/vda7 /dev/vda8",
           "udevadm control --start-exec-queue",
           "udevadm settle",
           "mkswap -f /dev/md1 -L swap",

From 693d4474a35984967f4014c07e6c33b2f315df15 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 30 Sep 2025 21:09:00 +0100
Subject: [PATCH 2/3] nixosTests.systemd-initrd-swraid: enable
 --bitmap=internal (fix interactive hang)

---
 nixos/tests/systemd-initrd-swraid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/systemd-initrd-swraid.nix b/nixos/tests/systemd-initrd-swraid.nix
index 933b2ad41056..1a504a4ae4e0 100644
--- a/nixos/tests/systemd-initrd-swraid.nix
+++ b/nixos/tests/systemd-initrd-swraid.nix
@@ -48,7 +48,7 @@
 
   testScript = ''
     # Create RAID
-    machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid1 /dev/vdb /dev/vdc --metadata=0.90")
+    machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid1 /dev/vdb /dev/vdc --metadata=0.90 --bitmap=internal")
     machine.succeed("mkfs.ext4 -L testraid /dev/md0")
     machine.succeed("mkdir -p /mnt && mount /dev/md0 /mnt && echo hello > /mnt/test && umount /mnt")
 

From 80ef20e21030152b8cf5ca32f7a446445808946e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 29 Aug 2025 21:47:30 +0100
Subject: [PATCH 3/3] mdadm: 4.3 -> 4.4

While at it added trivial updater and `nixosTests`
broken by this `mdadm` update.

Changes: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/tree/CHANGELOG.md?h=mdadm-4.4
---
 pkgs/by-name/md/mdadm4/package.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/md/mdadm4/package.nix b/pkgs/by-name/md/mdadm4/package.nix
index 7806e313f583..f2d69266ac17 100644
--- a/pkgs/by-name/md/mdadm4/package.nix
+++ b/pkgs/by-name/md/mdadm4/package.nix
@@ -8,15 +8,17 @@
   system-sendmail,
   udev,
   udevCheckHook,
+  gitUpdater,
+  nixosTests,
 }:
 
 stdenv.mkDerivation rec {
   pname = "mdadm";
-  version = "4.3";
+  version = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/raid/mdadm/mdadm-${version}.tar.xz";
-    sha256 = "sha256-QWcnrh8QgOpuMJDOo23QdoJvw2kVHjarc2VXupIZb58=";
+    sha256 = "sha256-m0iPNe0VPfmZJLX+Qe7TgOhRLejxihGGKMrN1oGx1XM=";
   };
 
   patches = [
@@ -32,10 +34,6 @@ stdenv.mkDerivation rec {
       url = "https://lore.kernel.org/linux-raid/20240220165158.3521874-1-raj.khem@gmail.com/raw";
       hash = "sha256-JOZ8n7zi+nq236NPpB4e2gUy8I3l3DbcoLhpeL73f98=";
     })
-    (fetchurl {
-      url = "https://github.com/md-raid-utilities/mdadm/commit/9dbd11e091f84eb0bf9d717283774816c4c4453d.patch";
-      hash = "sha256-8GdjP1ceVwejTOFXcHXG8wkIF9/D6hOUGD6btvuqs24=";
-    })
   ];
 
   makeFlags = [
@@ -80,6 +78,17 @@ stdenv.mkDerivation rec {
     grep -r $out $out/bin && false || true
   '';
 
+  passthru = {
+    tests = {
+      inherit (nixosTests) systemd-initrd-swraid;
+      installer-swraid = nixosTests.installer.swraid;
+    };
+    updateScript = gitUpdater {
+      url = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git";
+      rev-prefix = "mdadm-";
+    };
+  };
+
   meta = with lib; {
     description = "Programs for managing RAID arrays under Linux";
     homepage = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git";