From 87d7faa3e239f26e87a760bfbdcaf2c9faf89682 Mon Sep 17 00:00:00 2001
From: Carl Andersson <git@lillecarl.com>
Date: Wed, 15 Oct 2025 18:09:23 +0200
Subject: [PATCH 1/3] maintainers: add lillecarl

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index df4562d252b1..6a217759793a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14712,6 +14712,13 @@
     githubId = 67327023;
     keys = [ { fingerprint = "8185 29F9 BB4C 33F0 69BB  9782 D1AC CDCF 2B9B 9799"; } ];
   };
+  lillecarl = {
+    name = "Carl Andersson";
+    github = "lillecarl";
+    githubId = 207073;
+    email = "nixos@lillecarl.com";
+    matrix = "@lillecarl:matrix.org";
+  };
   lillycham = {
     email = "lillycat332@gmail.com";
     github = "lillycham";

From 59ee335fe584728361d1b93bc32aac9cf242e737 Mon Sep 17 00:00:00 2001
From: Carl Andersson <git@lillecarl.com>
Date: Wed, 15 Oct 2025 18:09:49 +0200
Subject: [PATCH 2/3] dinit: add lillecarl as maintainer

---
 pkgs/by-name/di/dinit/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/di/dinit/package.nix b/pkgs/by-name/di/dinit/package.nix
index 93ef3172bc74..7487959fbdf9 100644
--- a/pkgs/by-name/di/dinit/package.nix
+++ b/pkgs/by-name/di/dinit/package.nix
@@ -49,7 +49,10 @@ stdenv.mkDerivation rec {
     description = "Service manager / supervision system, which can (on Linux) also function as a system manager and init";
     homepage = "https://davmac.org/projects/dinit";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ aanderse ];
+    maintainers = with lib.maintainers; [
+      aanderse
+      lillecarl
+    ];
     platforms = lib.platforms.unix;
   };
 }

From d272a8bea2b9a15ea861c88afe3ab2340ce984de Mon Sep 17 00:00:00 2001
From: Carl Andersson <git@lillecarl.com>
Date: Wed, 15 Oct 2025 18:10:39 +0200
Subject: [PATCH 3/3] dinit: use util-linuxMinimal instead of util-linux

---
 pkgs/by-name/di/dinit/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/dinit/package.nix b/pkgs/by-name/di/dinit/package.nix
index 7487959fbdf9..1409becbfc05 100644
--- a/pkgs/by-name/di/dinit/package.nix
+++ b/pkgs/by-name/di/dinit/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   m4,
   installShellFiles,
-  util-linux,
+  util-linuxMinimal,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/shutdown.cc \
-      --replace-fail '"/bin/umount"' '"${util-linux}/bin/umount"' \
-      --replace-fail '"/sbin/swapoff"' '"${util-linux}/bin/swapoff"'
+      --replace-fail '"/bin/umount"' '"${util-linuxMinimal}/bin/umount"' \
+      --replace-fail '"/sbin/swapoff"' '"${util-linuxMinimal}/bin/swapoff"'
   '';
 
   nativeBuildInputs = [