diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix index 440f15cbd3a1..77a9af8645e7 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 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 000000000000..42f2cde81130 --- /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/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix new file mode 100644 index 000000000000..87700d8edc43 --- /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 e7fd6c70fdda..0d3b38066b54 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8399,31 +8399,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}"; @@ -18573,22 +18549,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}";