mailmanPackages.hyperkitts: 1.3.9 -> 1.3.12

NixOS · Dec 10, 2024 · 7865013 · 7865013
1 parent c48288c
commit 7865013
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -7,15 +7,15 @@
 with python3.pkgs;
 
 buildPythonPackage rec {
-  pname = "HyperKitty";
-  version = "1.3.9";
+  pname = "hyperkitty";
+  version = "1.3.12";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchurl {
     url = "https://gitlab.com/mailman/hyperkitty/-/releases/${version}/downloads/hyperkitty-${version}.tar.gz";
-    hash = "sha256-BfhCh4zZcfwoIfubW/+MUWXwh1yFOH/jpRdQdsj6lME=";
+    hash = "sha256-3rWCk37FvJ6pwdXYa/t2pNpCm2Dh/qb9aWTnxmfPFh0=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     django-gravatar2
     django-haystack
     django-mailman3
-    django-q
+    django-q2
     django-compressor
     django-extensions
     djangorestframework

diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix
@@ -20,13 +20,12 @@ lib.fix (self: python3.override {
         [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291
       */
 
-      # django-q tests fail with redis 5.0.0.
-      # https://gitlab.com/mailman/hyperkitty/-/issues/493
-      redis = super.redis.overridePythonAttrs ({ pname, ... }: rec {
-        version = "4.6.0";
-        src = fetchPypi {
-          inherit pname version;
-          hash = "sha256-WF3FFrnrBCphnvCjnD19Vf6BvbTfCaUsnN3g0Hvxqn0=";
+      # the redis python library only supports hiredis 3+ from version 5.1.0 onwards
+      hiredis = super.hiredis.overrideAttrs (new: { src, ... }: {
+        version = "3.1.0";
+        src = src.override {
+          rev = "refs/tags/v${new.version}";
+          hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg=";
         };
       });
     })