From 6960348f2e14b8f79444af19226c2fe420590e8d Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 28 Sep 2017 14:00:01 +0200
Subject: [PATCH 1/3] pythonPackages.redis: 2.10.5 -> 2.10.6

---
 .../python-modules/redis/default.nix          | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +----------------
 2 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/redis/default.nix

diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
new file mode 100644
index 00000000000..87700d8edc4
--- /dev/null
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+buildPythonPackage rec {
+  pname = "redis";
+  version = "2.10.6";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52";
+  };
+
+  # tests require a running redis
+  doCheck = false;
+
+  meta = {
+    description = "Python client for Redis key-value store";
+    homepage = "https://pypi.python.org/pypi/redis/";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7c6ca4bd1fc..82ff3b64cd6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18585,22 +18585,7 @@ in {
 
   };
 
-  redis = buildPythonPackage rec {
-    name = "redis-2.10.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/redis/${name}.tar.gz";
-      sha256 = "0csmrkxb29x7xs9b51zplwkkq2hwnbh9jns1g85dykn5rxmaxysx";
-    };
-
-    # tests require a running redis
-    doCheck = false;
-
-    meta = {
-      description = "Python client for Redis key-value store";
-      homepage = "https://pypi.python.org/pypi/redis/";
-    };
-  };
+  redis = callPackage ../development/python-modules/redis { };
 
   rednose = buildPythonPackage rec {
     name = "rednose-${version}";

From 92c0f467ba2b67028c4dc3201c1d4aaebcf99a7f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 28 Sep 2017 14:00:49 +0200
Subject: [PATCH 2/3] pythonPackages.django_redis: 4.2.0 -> 4.5.0

---
 .../python-modules/django_redis/default.nix   | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +----------------
 2 files changed, 29 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/django_redis/default.nix

diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix
new file mode 100644
index 00000000000..42f2cde8113
--- /dev/null
+++ b/pkgs/development/python-modules/django_redis/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchPypi, buildPythonPackage,
+  mock, django, redis, msgpack }:
+buildPythonPackage rec {
+  pname = "django-redis";
+  version = "4.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "170dbk1wmdg0mxp5m3376zz54dyxmhmhnswrccf0jnny1wqcgpsp";
+  };
+
+  doCheck = false;
+
+  buildInputs = [ mock ];
+
+  propagatedBuildInputs = [
+    django
+    redis
+    msgpack
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Full featured redis cache backend for Django";
+    homepage = https://github.com/niwibe/django-redis;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 82ff3b64cd6..95749833e85 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8398,31 +8398,7 @@ in {
 
   django-raster = callPackage ../development/python-modules/django-raster { };
 
-  django_redis = buildPythonPackage rec {
-    name = "django-redis-${version}";
-    version = "4.2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-redis/${name}.tar.gz";
-      sha256 = "9ad6b299458f7e6bfaefa8905f52560017369d82fb8fb0ed4b41adc048dbf11c";
-    };
-
-    doCheck = false;
-
-    buildInputs = [ self.mock ];
-
-    propagatedBuildInputs = with self; [
-      django
-      redis
-      msgpack
-    ];
-
-    meta = {
-      description = "Full featured redis cache backend for Django";
-      homepage = https://github.com/niwibe/django-redis;
-      license = licenses.bsd3;
-    };
-  };
+  django_redis = callPackage ../development/python-modules/django_redis { };
 
   django_reversion = buildPythonPackage rec {
     name = "django-reversion-${version}";

From 8d35fa697b0194aaf9bd18b60c69116ac6fa8fbf Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 28 Sep 2017 14:01:19 +0200
Subject: [PATCH 3/3] pythonPackages.asgi_redis: 1.4.2 -> 1.4.3

---
 pkgs/development/python-modules/asgi_redis/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix
index 440f15cbd3a..77a9af8645e 100644
--- a/pkgs/development/python-modules/asgi_redis/default.nix
+++ b/pkgs/development/python-modules/asgi_redis/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, buildPythonPackage, fetchurl,
+{ stdenv, buildPythonPackage, fetchPypi,
   asgiref, asgi_ipc, msgpack, six, redis, cryptography
 }:
 buildPythonPackage rec {
-  version = "1.4.2";
+  version = "1.4.3";
   pname = "asgi_redis";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/a/asgi_redis/${name}.tar.gz";
-    sha256 = "aa8e9342a3e66c4e7f9035b074f6f66b92e5f1cf8022f1446106ed6dd004a274";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10xk7k7mcd28nb3v93mc8xa7sa6p02jnbl8idk6scr6p75jaixzi";
   };
 
   # Requires a redis server available