diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix similarity index 79% rename from pkgs/tools/networking/httpie/default.nix rename to pkgs/development/python-modules/httpie/default.nix index 8590c85d2f38..4f852bb3c25e 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -1,11 +1,29 @@ { lib +, buildPythonPackage , fetchFromGitHub , installShellFiles -, python3 , pandoc +, pythonOlder +# BuildInputs +, charset-normalizer +, defusedxml +, multidict +, pygments +, requests +, requests-toolbelt +, setuptools +, rich +, pysocks +# CheckInputs +, pytest-httpbin +, pytest-lazy-fixture +, pytest-mock +, pytestCheckHook +, responses +, werkzeug }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "httpie"; version = "3.2.1"; format = "setuptools"; @@ -22,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { pandoc ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ charset-normalizer defusedxml multidict @@ -34,8 +52,7 @@ python3.pkgs.buildPythonApplication rec { pysocks ]; - checkInputs = with python3.pkgs; [ - pytest + checkInputs = [ pytest-httpbin pytest-lazy-fixture pytest-mock diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e89aa5c04a81..3e8eafbe82ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6966,7 +6966,7 @@ with pkgs; httpdump = callPackage ../tools/security/httpdump { }; - httpie = callPackage ../tools/networking/httpie { }; + httpie = with python3Packages; toPythonApplication httpie; httping = callPackage ../tools/networking/httping {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44f7328c6f99..58e40073c70b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3935,6 +3935,8 @@ in { httpcore = callPackage ../development/python-modules/httpcore { }; + httpie = callPackage ../development/python-modules/httpie { }; + http-ece = callPackage ../development/python-modules/http-ece { }; httplib2 = callPackage ../development/python-modules/httplib2 { };