diff --git a/pkgs/development/tools/beautysh/default.nix b/pkgs/development/python-modules/beautysh/default.nix
similarity index 84%
rename from pkgs/development/tools/beautysh/default.nix
rename to pkgs/development/python-modules/beautysh/default.nix
index 33b8fe0520d4..c41414075f38 100644
--- a/pkgs/development/tools/beautysh/default.nix
+++ b/pkgs/development/python-modules/beautysh/default.nix
@@ -1,10 +1,16 @@
 { lib
+, buildPythonPackage
+, colorama
 , fetchFromGitHub
 , fetchpatch
-, python3
+, poetry-core
+, pytestCheckHook
+, setuptools
+, types-colorama
+, types-setuptools
 }:
 
-python3.pkgs.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "beautysh";
   version = "6.2.1";
   format = "pyproject";
@@ -25,26 +31,26 @@ python3.pkgs.buildPythonApplication rec {
     })
   ];
 
-  nativeBuildInputs = with python3.pkgs; [
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'types-setuptools = "^57.4.0"' 'types-setuptools = "*"'
+  '';
+
+  nativeBuildInputs = [
     poetry-core
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = [
     colorama
     setuptools
     types-colorama
     types-setuptools
   ];
 
-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = [
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'types-setuptools = "^57.4.0"' 'types-setuptools = "*"'
-  '';
-
   pythonImportsCheck = [
     "beautysh"
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c89e688e2db6..a0db974e6530 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4198,7 +4198,7 @@ with pkgs;
     inherit (plasma5Packages) breeze-icons;
   };
 
-  beautysh = callPackage ../development/tools/beautysh { };
+  beautysh = with python3.pkgs; toPythonApplication beautysh;
 
   bc = callPackage ../tools/misc/bc { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9e5bd99704fa..293e68b7a07c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1310,6 +1310,8 @@ self: super: with self; {
 
   beautifultable = callPackage ../development/python-modules/beautifultable { };
 
+  beautysh = callPackage ../development/python-modules/beautysh { };
+
   bech32 = callPackage ../development/python-modules/bech32 { };
 
   behave = callPackage ../development/python-modules/behave { };