diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/by-name/py/pyp/package.nix (renamed from pkgs/development/python-modules/pyp/default.nix) | 20 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
3 files changed, 6 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/pyp/default.nix b/pkgs/by-name/py/pyp/package.nix index 45ad9832aac0e..08f3fdc63d491 100644 --- a/pkgs/development/python-modules/pyp/default.nix +++ b/pkgs/by-name/py/pyp/package.nix @@ -1,15 +1,12 @@ { lib -, astunparse , bc -, buildPythonPackage , fetchFromGitHub -, flit-core , jq -, pytestCheckHook -, pythonOlder +, python3 }: let + pythonPackages = python3.pkgs; finalAttrs = { pname = "pyp"; version = "1.2.0"; @@ -23,22 +20,17 @@ let pyproject = true; - disabled = pythonOlder "3.8"; - - build-system = [ + build-system = with pythonPackages; [ flit-core ]; - nativeCheckInputs = [ + nativeCheckInputs = (with pythonPackages; [ pytestCheckHook + ]) ++ [ bc jq ]; - dependencies = lib.optionals (pythonOlder "3.9") [ - astunparse - ]; - pythonImportsCheck = [ "pyp" ]; @@ -65,4 +57,4 @@ let }; }; in -buildPythonPackage finalAttrs +pythonPackages.buildPythonPackage finalAttrs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fef0d6a770804..c0812675ae6e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12440,8 +12440,6 @@ with pkgs; pywal = with python3Packages; toPythonApplication pywal; - pyp = with python3Packages; toPythonApplication pyp; - pystring = callPackage ../development/libraries/pystring { }; raysession = python3Packages.callPackage ../applications/audio/raysession {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05e4cf8790e83..2c35edd358264 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10646,10 +10646,6 @@ self: super: with self; { pyomo = callPackage ../development/python-modules/pyomo { }; - pyp = callPackage ../development/python-modules/pyp { - inherit (pkgs) bc jq; - }; - pypng = callPackage ../development/python-modules/pypng { }; phonemizer = callPackage ../development/python-modules/phonemizer { }; |