From 128713b727eb87d24dcdd1c06b7a9f6f18fa159e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 Dec 2022 18:44:20 +0100
Subject: [PATCH 1/2] python310Packages.httpie: add changelog to meta

---
 pkgs/development/python-modules/httpie/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix
index 143822de63b9..a4db3e7324dc 100644
--- a/pkgs/development/python-modules/httpie/default.nix
+++ b/pkgs/development/python-modules/httpie/default.nix
@@ -99,6 +99,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A command line HTTP client whose goal is to make CLI human-friendly";
     homepage = "https://httpie.org/";
+    changelog = "https://github.com/httpie/httpie/blob/${version}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ antono relrod schneefux SuperSandro2000 ];
   };

From 67a54c71074a382fa0da453958e0999e8650adce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 Dec 2022 20:31:09 +0100
Subject: [PATCH 2/2] python310Packages.httpie: disable failing tests

---
 .../python-modules/httpie/default.nix           | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix
index a4db3e7324dc..a8bde5849a4a 100644
--- a/pkgs/development/python-modules/httpie/default.nix
+++ b/pkgs/development/python-modules/httpie/default.nix
@@ -50,8 +50,8 @@ buildPythonPackage rec {
     requests-toolbelt
     setuptools
     rich
-    pysocks
-  ];
+  ] ++ requests.optional-dependencies.socks;
+
 
   checkInputs = [
     pytest-httpbin
@@ -91,6 +91,19 @@ buildPythonPackage rec {
   disabledTests = [
     # flaky
     "test_stdin_read_warning"
+    # Re-evaluate those tests with the next release
+    "test_duplicate_keys_support_from_response"
+    "test_invalid_xml"
+    "test_json_formatter_with_body_preceded_by_non_json_data"
+    "test_pretty_options_with_and_without_stream_with_converter"
+    "test_response_mime_overwrite"
+    "test_terminal_output_response_charset_detection"
+    "test_terminal_output_response_charset_override"
+    "test_terminal_output_response_content_type_charset_with_stream"
+    "test_terminal_output_response_content_type_charset"
+    "test_valid_xml"
+    "test_xml_format_options"
+    "test_xml_xhtm"
   ] ++ lib.optionals stdenv.isDarwin [
     # flaky
     "test_daemon_runner"