summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-11-06 16:31:31 +0100
committerAlyssa Ross <hi@alyssa.is>2023-11-13 15:36:40 +0100
commit771cae0903f05ad58ee5831c03d898a4a26550bd (patch)
treeba6e79ba6f1439af8ed907f00f48621bb44502fe
parent92fb22dc0ac91ece2232f7205217bad187a921d4 (diff)
downloadnixpkgs-771cae0903f05ad58ee5831c03d898a4a26550bd.tar
nixpkgs-771cae0903f05ad58ee5831c03d898a4a26550bd.tar.gz
nixpkgs-771cae0903f05ad58ee5831c03d898a4a26550bd.tar.bz2
nixpkgs-771cae0903f05ad58ee5831c03d898a4a26550bd.tar.lz
nixpkgs-771cae0903f05ad58ee5831c03d898a4a26550bd.tar.xz
nixpkgs-771cae0903f05ad58ee5831c03d898a4a26550bd.tar.zst
nixpkgs-771cae0903f05ad58ee5831c03d898a4a26550bd.zip
python3.pkgs.django-q: fix for Hyperkitty
mailmanPackages.hyperkitty was marked transiently broken, since it
depends on django-q, even though its Python package set overrides
redis to a verison compatible with django-q.

At the same time, hiredis was moved to being an optional dependency of
django-redis.  It's required by django-q, so use it here.

Fixes: 5cebbd4be4a8 ("python311Packages.django-q: mark as broken")
-rw-r--r--pkgs/development/python-modules/django-q/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix
index a22443a11a6..c6f9ec3bb53 100644
--- a/pkgs/development/python-modules/django-q/default.nix
+++ b/pkgs/development/python-modules/django-q/default.nix
@@ -15,6 +15,7 @@
 , pytest-mock
 , pytestCheckHook
 , pythonOlder
+, redis
 }:
 
 buildPythonPackage rec {
@@ -55,7 +56,7 @@ buildPythonPackage rec {
     pytest-django
     pytest-mock
     pytestCheckHook
-  ];
+  ] ++ django-redis.optional-dependencies.hiredis;
 
   pythonImportsCheck = [
     "django_q"
@@ -86,6 +87,6 @@ buildPythonPackage rec {
     maintainers = with maintainers; [ gador ];
     # django-q is unmaintained at the moment
     # https://github.com/Koed00/django-q/issues/733
-    broken = true;
+    broken = lib.versionAtLeast redis.version "5";
   };
 }