Merge pull request #14215 from Beauhurst/django_remove_mo

django packaging: remove remaining uses of makeOverridable for django-depending packages
This commit is contained in:
joachifm 2016-03-28 15:56:55 +00:00
commit aa2ebd4b11

View File

@ -8305,7 +8305,7 @@ in modules // {
}; };
}; };
django_redis = makeOverridable ({ django ? self.django }: buildPythonPackage rec { django_redis = buildPythonPackage rec {
name = "django-redis-${version}"; name = "django-redis-${version}";
version = "4.2.0"; version = "4.2.0";
@ -8316,18 +8316,18 @@ in modules // {
buildInputs = [ self.mock ]; buildInputs = [ self.mock ];
propagatedBuildInputs = [ django ] ++ propagatedBuildInputs = with self; [
(with self; [ django
redis redis
msgpack msgpack
]); ];
meta = { meta = {
description = "Full featured redis cache backend for Django"; description = "Full featured redis cache backend for Django";
homepage = https://github.com/niwibe/django-redis; homepage = https://github.com/niwibe/django-redis;
license = licenses.bsd3; license = licenses.bsd3;
}; };
}) {}; };
django_reversion = buildPythonPackage rec { django_reversion = buildPythonPackage rec {
name = "django-reversion-${version}"; name = "django-reversion-${version}";
@ -8348,7 +8348,7 @@ in modules // {
}; };
}; };
django_silk = makeOverridable ({ django ? self.django }: buildPythonPackage rec { django_silk = buildPythonPackage rec {
name = "django-silk-${version}"; name = "django-silk-${version}";
version = "0.5.6"; version = "0.5.6";
@ -8359,8 +8359,8 @@ in modules // {
buildInputs = [ self.mock ]; buildInputs = [ self.mock ];
propagatedBuildInputs = [ django ] ++ propagatedBuildInputs = with self; [
(with self; [ django
pygments pygments
simplejson simplejson
dateutil dateutil
@ -8370,14 +8370,14 @@ in modules // {
autopep8 autopep8
pytz pytz
pillow pillow
]); ];
meta = { meta = {
description = "Silky smooth profiling for the Django Framework"; description = "Silky smooth profiling for the Django Framework";
homepage = https://github.com/mtford90/silk; homepage = https://github.com/mtford90/silk;
license = licenses.mit; license = licenses.mit;
}; };
}) {}; };
django_taggit = buildPythonPackage rec { django_taggit = buildPythonPackage rec {
name = "django-taggit-${version}"; name = "django-taggit-${version}";