From 53465de5d1dc833d7d34d8cb26aa220a353ace6a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 20 Apr 2026 11:44:03 -0500
Subject: [PATCH 1/2] sinit: migrate to by-name

---
 .../linux/sinit/default.nix => by-name/si/sinit/package.nix} | 4 ++--
 pkgs/top-level/all-packages.nix                              | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)
 rename pkgs/{os-specific/linux/sinit/default.nix => by-name/si/sinit/package.nix} (94%)

diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/by-name/si/sinit/package.nix
similarity index 94%
rename from pkgs/os-specific/linux/sinit/default.nix
rename to pkgs/by-name/si/sinit/package.nix
index 2272c3a43ef5..5102a52bd1a7 100644
--- a/pkgs/os-specific/linux/sinit/default.nix
+++ b/pkgs/by-name/si/sinit/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchgit,
-  rcinit ? null,
-  rcshutdown ? null,
+  rcinit ? "/etc/rc.d/rc.init",
+  rcshutdown ? "/etc/rc.d/rc.shutdown",
   rcreboot ? null,
 }:
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5851bf04a461..f2e3ae7b26df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8716,11 +8716,6 @@ with pkgs;
     protobuf = protobuf_33;
   };
 
-  sinit = callPackage ../os-specific/linux/sinit {
-    rcinit = "/etc/rc.d/rc.init";
-    rcshutdown = "/etc/rc.d/rc.shutdown";
-  };
-
   sysdig = callPackage ../os-specific/linux/sysdig {
     kernel = null;
   }; # sysdig is a client, for a driver look at linuxPackagesFor

From a5c830141cc3e2ffd371fb36f8cdb3ce947fa2dc Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 20 Apr 2026 11:44:43 -0500
Subject: [PATCH 2/2] sinit: modernize derivation

---
 pkgs/by-name/si/sinit/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/si/sinit/package.nix b/pkgs/by-name/si/sinit/package.nix
index 5102a52bd1a7..9494698c5e9c 100644
--- a/pkgs/by-name/si/sinit/package.nix
+++ b/pkgs/by-name/si/sinit/package.nix
@@ -7,14 +7,14 @@
   rcreboot ? null,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sinit";
   version = "1.1";
 
   src = fetchgit {
     url = "https://git.suckless.org/sinit/";
-    sha256 = "sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw=";
-    tag = "v${version}";
+    hash = "sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw=";
+    tag = "v${finalAttrs.version}";
   };
   buildInputs = [
     (lib.getOutput "static" stdenv.cc.libc)
@@ -41,4 +41,4 @@ stdenv.mkDerivation rec {
     homepage = "https://tools.suckless.org/sinit";
     downloadPage = "https://git.suckless.org/sinit";
   };
-}
+})