From a10f0ab35d4ae9ad0c923565fbeb7de9f8773a24 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Jan 2022 13:33:16 +0100
Subject: [PATCH 1/3] python3Packages.fakeredis: add patch to support
 redis>=4.1.0

---
 .../python-modules/fakeredis/default.nix      | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index eff55de1d90e..94e7ec29f0be 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -2,7 +2,8 @@
 , aioredis
 , async_generator
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, fetchpatch
 , hypothesis
 , lupa
 , pytest-asyncio
@@ -19,11 +20,13 @@ buildPythonPackage rec {
   version = "1.7.0";
   format = "setuptools";
 
-  disabled = pythonOlder "3.5";
+  disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-yb0S5DAzbL0+GJ+uDpHrmZl7k+dtv91u1n+jUtxoTHE=";
+  src = fetchFromGitHub {
+    owner = "jamesls";
+    repo = pname;
+    rev = version;
+    hash = "sha256-P6PUg9SY0Qshlvj+iV1xdrzVLJ9JXUV4cGHUynKO3m0=";
   };
 
   propagatedBuildInputs = [
@@ -42,6 +45,15 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  patches = [
+    # Support for redis >= 4.1.0, https://github.com/jamesls/fakeredis/pull/324
+    (fetchpatch {
+      name = "support-redis-4.1.0.patch";
+      url = "https://github.com/jamesls/fakeredis/commit/8ef8dc6dacc9baf571d66a25ffbf0fadd7c70f78.patch";
+      sha256 = "sha256-4DrF/5WEWQWlJZtAi4qobMDyRAAcO/weHIaK9waN00k=";
+    })
+  ];
+
   disabledTestPaths = [
     # AttributeError: 'AsyncGenerator' object has no attribute XXXX
     "test/test_aioredis2.py"

From 5e9e68e5bbb66fe439d45beb4281ce7fbe982fcb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Jan 2022 22:56:33 +0100
Subject: [PATCH 2/3] python3Packages.fakeredis: add patch to support
 redis<=4.1.0

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

diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 94e7ec29f0be..451a993c22f8 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   ];
 
   patches = [
-    # Support for redis >= 4.1.0, https://github.com/jamesls/fakeredis/pull/324
+    # Support for redis <= 4.1.0, https://github.com/jamesls/fakeredis/pull/324
     (fetchpatch {
       name = "support-redis-4.1.0.patch";
       url = "https://github.com/jamesls/fakeredis/commit/8ef8dc6dacc9baf571d66a25ffbf0fadd7c70f78.patch";

From fde8b1f5e13832cbec7ed66072ab1e9647d93b5e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 26 Jan 2022 22:56:45 +0100
Subject: [PATCH 3/3] python3Packages.chalice: relax attrs constraint

---
 pkgs/development/python-modules/chalice/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index 43767cb1a319..07259d5e59cf 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -61,7 +61,8 @@ buildPythonPackage rec {
   postPatch = ''
     sed -i setup.py -e "/pip>=/c\'pip',"
     substituteInPlace setup.py \
-      --replace 'typing==3.6.4' 'typing'
+      --replace "typing==3.6.4" "typing" \
+      --replace "attrs>=19.3.0,<21.3.0" "attrs"
   '';
 
   disabledTestPaths = [