diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/by-name/st/stumpwm/package.nix
similarity index 74%
rename from pkgs/applications/window-managers/stumpwm/default.nix
rename to pkgs/by-name/st/stumpwm/package.nix
index 13f192272038..7a51145dffad 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,20 +7,30 @@
   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";
 
   src = fetchFromGitHub {
     owner = "stumpwm";
     repo = "stumpwm";
-    rev = "${finalAttrs.version}";
+    tag = "${finalAttrs.version}";
     hash = "sha256-Ba2HcAmNcZvnqU0jpLTxsBe8L+4aHbO/oM4Bp/IYEC0=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
-    sbcl
+    sbclWithPkgs
     texinfo
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ef8e80ffb41..e968fd183014 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9488,18 +9488,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 (