diff --git a/pkgs/development/python-modules/proxy_tools/default.nix b/pkgs/development/python-modules/proxy-tools/default.nix similarity index 78% rename from pkgs/development/python-modules/proxy_tools/default.nix rename to pkgs/development/python-modules/proxy-tools/default.nix index 03f3f92f9da9..beb91a433388 100644 --- a/pkgs/development/python-modules/proxy_tools/default.nix +++ b/pkgs/development/python-modules/proxy-tools/default.nix @@ -1,17 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { - pname = "proxy_tools"; + pname = "proxy-tools"; version = "0.1.0"; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "proxy_tools"; + inherit version; hash = "sha256-zLN1H1KcBH4tilhEDYayBTA88P6BRveE0cvNlPCigBA="; }; + nativeBuildInputs = [ + setuptools + ]; + # no tests in pypi doCheck = false; pythonImportsCheck = [ "proxy_tools" ]; diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 246f1ae55d2c..9db835f1d547 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -4,7 +4,7 @@ , setuptools-scm , bottle , importlib-resources -, proxy_tools +, proxy-tools , pygobject3 , pyqtwebengine , pytest @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bottle pyqtwebengine - proxy_tools + proxy-tools six ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9d1fddd074f4..2d96df47c7d1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -267,6 +267,7 @@ mapAliases ({ prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 protonup = protonup-ng; # Added 2022-11-06 + proxy_tools = proxy-tools; # added 2023-11-05 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 Pweave = pweave; # added 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2fd58ddb654f..6156e0039a42 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9115,7 +9115,7 @@ self: super: with self; { propka = callPackage ../development/python-modules/propka { }; - proxy_tools = callPackage ../development/python-modules/proxy_tools { }; + proxy-tools = callPackage ../development/python-modules/proxy-tools { }; proxy-db = callPackage ../development/python-modules/proxy-db { };