From 9eb2ae73f02cd23f26d5ef8b0cd26bd871f978b0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Sep 2024 09:36:09 +0200
Subject: [PATCH] python312Packages.httpie: 3.2.2 -> 3.2.3

Diff: https://github.com/httpie/httpie/compare/refs/tags/3.2.2...3.2.3

Changelog: https://github.com/httpie/httpie/blob/3.2.3/CHANGELOG.md
---
 .../python-modules/httpie/default.nix         | 55 ++++++++-----------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix
index aba7e3fe32c1..5370a1e87009 100644
--- a/pkgs/development/python-modules/httpie/default.nix
+++ b/pkgs/development/python-modules/httpie/default.nix
@@ -2,45 +2,51 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchFromGitHub,
-  installShellFiles,
-  pandoc,
-  # BuildInputs
   charset-normalizer,
   defusedxml,
+  fetchFromGitHub,
+  installShellFiles,
   multidict,
-  pygments,
-  requests,
-  requests-toolbelt,
-  setuptools,
-  rich,
+  pandoc,
   pip,
+  pygments,
   pytest-httpbin,
   pytest-lazy-fixture,
   pytest-mock,
   pytestCheckHook,
+  requests-toolbelt,
+  requests,
   responses,
+  rich,
+  setuptools,
   werkzeug,
 }:
 
 buildPythonPackage rec {
   pname = "httpie";
-  version = "3.2.2";
-  format = "setuptools";
+  version = "3.2.3";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "httpie";
     repo = "httpie";
-    rev = version;
-    hash = "sha256-hPsjEpvT6tnPm68AUB2Tv3Gon4DfSzO2VYCGqP8ozSI=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ogUqhMVY1fm+hKCMFYqfYsqHX+Gj6y8CMOUsxA3q29g=";
   };
 
+  pythonRelaxDeps = [
+    "defusedxml"
+    "requests"
+  ];
+
+  build-system = [ setuptools ];
+
   nativeBuildInputs = [
     installShellFiles
     pandoc
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     charset-normalizer
     defusedxml
     multidict
@@ -81,28 +87,15 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "httpie" ];
 
-  disabledTestPaths = lib.optionals stdenv.isDarwin [
-    # flaky
+  disabledTestPaths = [
+    # Tests are flaky
     "tests/test_plugins_cli.py"
   ];
 
   disabledTests =
     [
-      # flaky
+      # Test is 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"
       # httpbin compatibility issues
       "test_compress_form"
       "test_binary_suppresses_when_terminal"
@@ -110,7 +103,7 @@ buildPythonPackage rec {
       "test_binary_included_and_correct_when_suitable"
     ]
     ++ lib.optionals stdenv.isDarwin [
-      # flaky
+      # Test is flaky
       "test_daemon_runner"
     ];