summary refs log tree commit diff
diff options
context:
space:
mode:
authorKristoffer Føllesdal <kfollesdal@gmail.com>2022-05-12 10:36:30 +0200
committerKristoffer Føllesdal <kfollesdal@gmail.com>2022-05-12 15:41:34 +0200
commit6281fca1610cf4ecda47ea6c04887989fbde0098 (patch)
treedb126dd36e1d57d45f886ffa6bb4f475c5596e63
parentbfeb72c912c86401520bad787b0ff1d329b37642 (diff)
downloadnixpkgs-6281fca1610cf4ecda47ea6c04887989fbde0098.tar
nixpkgs-6281fca1610cf4ecda47ea6c04887989fbde0098.tar.gz
nixpkgs-6281fca1610cf4ecda47ea6c04887989fbde0098.tar.bz2
nixpkgs-6281fca1610cf4ecda47ea6c04887989fbde0098.tar.lz
nixpkgs-6281fca1610cf4ecda47ea6c04887989fbde0098.tar.xz
nixpkgs-6281fca1610cf4ecda47ea6c04887989fbde0098.tar.zst
nixpkgs-6281fca1610cf4ecda47ea6c04887989fbde0098.zip
httpie: Make available as python library
-rw-r--r--pkgs/development/python-modules/httpie/default.nix (renamed from pkgs/tools/networking/httpie/default.nix)27
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix2
3 files changed, 25 insertions, 6 deletions
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix
index 8590c85d2f3..4f852bb3c25 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 e89aa5c04a8..3e8eafbe82c 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 44f7328c6f9..58e40073c70 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 { };