From 3c24cb60ff576568fa0bbe8c67f38669d8f26490 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 02:54:42 +0200
Subject: [PATCH] xkill: refactor and move to pkgs/by-name from xorg namespace

---
 pkgs/by-name/xk/xkill/package.nix             | 54 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 58 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/by-name/xk/xkill/package.nix

diff --git a/pkgs/by-name/xk/xkill/package.nix b/pkgs/by-name/xk/xkill/package.nix
new file mode 100644
index 000000000000..9577eb13c53b
--- /dev/null
+++ b/pkgs/by-name/xk/xkill/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxmu,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xkill";
+  version = "1.0.6";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xkill-${finalAttrs.version}.tar.xz";
+    hash = "sha256-5aiqeMR1Z3sRUEZG2o2T2swwdEJYB2ospBiiRDiuuQc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxmu
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to forcibly terminate X11 clients";
+    longDescription = ''
+      xkill is a utility for forcing the X server to close connections to clients.
+      This program is very dangerous, but is useful for aborting programs that have displayed
+      undesired windows on a user's screen.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xkill";
+    license = lib.licenses.mitOpenGroup;
+    mainProgram = "xkill";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index cb98edfc0200..c03863a205d9 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -70,6 +70,7 @@
   xhost,
   xkbutils,
   xkeyboard-config,
+  xkill,
   xlsatoms,
   xlsclients,
   xlsfonts,
@@ -116,6 +117,7 @@ self: with self; {
     xgc
     xhost
     xkbutils
+    xkill
     xlsatoms
     xlsclients
     xlsfonts
@@ -5120,44 +5122,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xkill = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXmu,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xkill";
-      version = "1.0.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xkill-1.0.6.tar.xz";
-        sha256 = "01xrmqw498hqlhn6l1sq89s31k6sjf6xlij6a08pnrvmqiwama75";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXmu
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xload = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index e045903ea3f0..9975b4053e15 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -386,6 +386,7 @@ print OUT <<EOF;
   xhost,
   xkbutils,
   xkeyboard-config,
+  xkill,
   xlsatoms,
   xlsclients,
   xlsfonts,
@@ -432,6 +433,7 @@ self: with self; {
     xgc
     xhost
     xkbutils
+    xkill
     xlsatoms
     xlsclients
     xlsfonts
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 6b260478c790..b3d4af551ea7 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -968,7 +968,6 @@ self: super:
   xinput = addMainProgram super.xinput { };
   xkbevd = addMainProgram super.xkbevd { };
   xkbprint = addMainProgram super.xkbprint { };
-  xkill = addMainProgram super.xkill { };
   xload = addMainProgram super.xload { };
   xmag = addMainProgram super.xmag { };
   xmessage = addMainProgram super.xmessage { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 000de3a90d49..b9f495cf71f5 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -27,7 +27,6 @@ mirror://xorg/individual/app/xinput-1.6.4.tar.xz
 mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz
 mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz
 mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
-mirror://xorg/individual/app/xkill-1.0.6.tar.xz
 mirror://xorg/individual/app/xload-1.2.0.tar.xz
 mirror://xorg/individual/app/xmag-1.0.8.tar.xz
 mirror://xorg/individual/app/xmessage-1.0.7.tar.xz