From d8c0d1e7cb4b804044989c36a101ae93d91c50bb Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 9 May 2026 08:34:50 -0500
Subject: [PATCH] stumpwm: migrate to by-name

---
 .../st/stumpwm/package.nix}                      | 16 +++++++++++++---
 pkgs/top-level/all-packages.nix                  | 12 ------------
 2 files changed, 13 insertions(+), 15 deletions(-)
 rename pkgs/{applications/window-managers/stumpwm/default.nix => by-name/st/stumpwm/package.nix} (78%)

diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/by-name/st/stumpwm/package.nix
similarity index 78%
rename from pkgs/applications/window-managers/stumpwm/default.nix
rename to pkgs/by-name/st/stumpwm/package.nix
index 13f192272038..6a2a56f9db0a 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/by-name/st/stumpwm/package.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  stdenvNoCC,
   lib,
   fetchFromGitHub,
   autoreconfHook,
@@ -7,7 +7,17 @@
   texinfo,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+let
+  sbclWithPkgs = sbcl.withPackages (
+    ps: with ps; [
+      alexandria
+      cl-ppcre
+      clx
+      fiasco
+    ]
+  );
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stumpwm";
   version = "24.11";
 
@@ -20,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     autoreconfHook
-    sbcl
+    sbclWithPkgs
     texinfo
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a92df04ddae7..b076dcca9170 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10227,18 +10227,6 @@ with pkgs;
 
   inherit (ocaml-ng.ocamlPackages) stog;
 
-  stumpwm = callPackage ../applications/window-managers/stumpwm {
-    stdenv = stdenvNoCC;
-    sbcl = sbcl.withPackages (
-      ps: with ps; [
-        alexandria
-        cl-ppcre
-        clx
-        fiasco
-      ]
-    );
-  };
-
   stumpwm-unwrapped = sbcl.pkgs.stumpwm;
 
   sublime3Packages = recurseIntoAttrs (