From c201188517aa3480d04d902a634a9344e06545a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 9 Dec 2025 09:16:04 -0800
Subject: [PATCH 1/3] python3Packages.pybreaker: init at 1.4.1

---
 .../python-modules/pybreaker/default.nix      | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/pybreaker/default.nix

diff --git a/pkgs/development/python-modules/pybreaker/default.nix b/pkgs/development/python-modules/pybreaker/default.nix
new file mode 100644
index 000000000000..e3c5f20c7ee3
--- /dev/null
+++ b/pkgs/development/python-modules/pybreaker/default.nix
@@ -0,0 +1,42 @@
+{
+  buildPythonPackage,
+  fakeredis,
+  fetchFromGitHub,
+  flit-core,
+  lib,
+  pybreaker,
+  pytestCheckHook,
+  redis,
+  tornado,
+}:
+
+buildPythonPackage rec {
+  pname = "pybreaker";
+  version = "1.4.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "danielfm";
+    repo = "pybreaker";
+    tag = "v${version}";
+    hash = "sha256-Cxer6EDfi4fvs7XENwpUUMcCiRX6eDNJz0s57l9U+zQ=";
+  };
+
+  build-system = [ flit-core ];
+
+  pythonImportsCheck = [ "pybreaker" ];
+
+  nativeCheckInputs = [
+    fakeredis
+    pytestCheckHook
+    tornado
+  ];
+
+  meta = {
+    changelog = "https://github.com/danielfm/pybreaker/blob/${src.tag}/CHANGELOG";
+    description = "Python implementation of the Circuit Breaker pattern";
+    homepage = "https://github.com/danielfm/pybreaker";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 85382c4d8fad..25be14519ee0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13073,6 +13073,8 @@ self: super: with self; {
 
   pybravia = callPackage ../development/python-modules/pybravia { };
 
+  pybreaker = callPackage ../development/python-modules/pybreaker { };
+
   pybrowserid = callPackage ../development/python-modules/pybrowserid { };
 
   pybrowsers = callPackage ../development/python-modules/pybrowsers { };

From 4520406c083da799544f3974bf0d02db7a214559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 9 Dec 2025 09:01:59 -0800
Subject: [PATCH 2/3] python3Packages.redis: 6.2.0 -> 7.1.0

Diff: https://github.com/redis/redis-py/compare/v6.2.0...v7.1.0

Changelog: https://github.com/redis/redis-py/releases/tag/v6.3.0
           https://github.com/redis/redis-py/releases/tag/v6.4.0
           https://github.com/redis/redis-py/releases/tag/v7.0.0
           https://github.com/redis/redis-py/releases/tag/v7.0.1
           https://github.com/redis/redis-py/releases/tag/v7.1.0
---
 .../python-modules/redis/default.nix          | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index 102f467bc864..befb83be5099 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -1,20 +1,24 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
+  pythonOlder,
 
   # build-system
   hatchling,
 
   # dependencies
   async-timeout,
-  deprecated,
-  packaging,
-  typing-extensions,
+
+  # extras: circuit_breaker
+  pybreaker,
 
   # extras: hiredis
   hiredis,
 
+  # extras: jwt
+  pyjwt,
+
   # extras: ocsp
   cryptography,
   pyopenssl,
@@ -23,25 +27,26 @@
 
 buildPythonPackage rec {
   pname = "redis";
-  version = "6.2.0";
+  version = "7.1.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-6CHxKbdd3my5ndNeXHboxJUSpaDY39xWCy+9RLhcqXc=";
+  src = fetchFromGitHub {
+    owner = "redis";
+    repo = "redis-py";
+    tag = "v${version}";
+    hash = "sha256-EhhE2l0UdkGWhCwKAF7fuSxq4ooj75Cxwg2zXjJJRzA=";
   };
 
   build-system = [ hatchling ];
 
-  dependencies = [
+  dependencies = lib.optionals (pythonOlder "3.11") [
     async-timeout
-    deprecated
-    packaging
-    typing-extensions
   ];
 
   optional-dependencies = {
+    circuit_breaker = [ pybreaker ];
     hiredis = [ hiredis ];
+    jwt = [ pyjwt ];
     ocsp = [
       cryptography
       pyopenssl
@@ -65,7 +70,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client for Redis key-value store";
     homepage = "https://github.com/redis/redis-py";
-    changelog = "https://github.com/redis/redis-py/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    changelog = "https://github.com/redis/redis-py/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
   };
 }

From 1d855a6f046d1053da19e0e74f3b31fa9c60cf52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 9 Dec 2025 09:42:26 -0800
Subject: [PATCH 3/3] python3Packages.redis: add dotlambda to maintainers

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

diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index befb83be5099..e6d6d8d62ac6 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -72,5 +72,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/redis/redis-py";
     changelog = "https://github.com/redis/redis-py/releases/tag/${src.tag}";
     license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
   };
 }