Merge pull request #250713 from tjni/beautysh

beautysh, python3.pkgs.beautysh: move into python-modules

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"
   ];

pkgs/top-level/all-packages.nix

@@ -4214,7 +4214,7 @@ with pkgs;
     inherit (plasma5Packages) breeze-icons;
   };
 
-  beautysh = callPackage ../development/tools/beautysh { };
+  beautysh = with python3.pkgs; toPythonApplication beautysh;
 
   bc = callPackage ../tools/misc/bc { };
 

pkgs/top-level/python-packages.nix

@@ -1312,6 +1312,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 { };