From 721c6ab29e70fdc8a0e245ac6d11d712445bf876 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Jan 2025 10:28:50 +0100
Subject: [PATCH 1/2] python312Packages.json-stream: 2.3.2 -> 2.3.3

---
 .../python-modules/json-stream/default.nix    | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix
index fd5f61399f18..a19e038af1ef 100644
--- a/pkgs/development/python-modules/json-stream/default.nix
+++ b/pkgs/development/python-modules/json-stream/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchPypi,
+  httpx,
   iconv,
   pytestCheckHook,
   pythonOlder,
@@ -13,24 +14,27 @@
 
 buildPythonPackage rec {
   pname = "json-stream";
-  version = "2.3.2";
-  format = "pyproject";
+  version = "2.3.3";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-uLRQ6o6OPCOenn440S/tk053o1PBSyl/juNFpc6yW5E=";
+    pname = "json_stream";
+    inherit version;
+    hash = "sha256-iURExowzEXSSZ2PiJPs0t+0/kHSdHBZa/Q9ZMCB1NMQ=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ iconv ];
 
-  propagatedBuildInputs = [
-    requests
-    json-stream-rs-tokenizer
-  ];
+  dependencies = [ json-stream-rs-tokenizer ];
+
+  optional-dependencies = {
+    httpx = [ httpx ];
+    requests = [ requests ];
+  };
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -41,7 +45,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Streaming JSON parser";
     homepage = "https://github.com/daggaz/json-stream";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }

From 41258a55b64fb649242f1a7f9039c57f80176a9c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Feb 2025 17:29:18 +0100
Subject: [PATCH 2/2] python312Packages.json-stream: remove iconv

---
 pkgs/development/python-modules/json-stream/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix
index a19e038af1ef..736f3278d1e5 100644
--- a/pkgs/development/python-modules/json-stream/default.nix
+++ b/pkgs/development/python-modules/json-stream/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchPypi,
   httpx,
-  iconv,
   pytestCheckHook,
   pythonOlder,
   requests,
@@ -27,8 +26,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ iconv ];
-
   dependencies = [ json-stream-rs-tokenizer ];
 
   optional-dependencies = {