summary refs log tree commit diff
path: root/pkgs/servers/mail/mailman/hyperkitty.nix
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2023-08-12 13:05:57 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2023-08-12 13:51:09 +0200
commit9c9615018927f47efb18f3da0653a0f269086179 (patch)
tree2c10151fb40dab0a5c957c4622890789c1b3a041 /pkgs/servers/mail/mailman/hyperkitty.nix
parentbe50a4d290f5959c43849abe7e46f8a2358f4283 (diff)
downloadnixpkgs-9c9615018927f47efb18f3da0653a0f269086179.tar
nixpkgs-9c9615018927f47efb18f3da0653a0f269086179.tar.gz
nixpkgs-9c9615018927f47efb18f3da0653a0f269086179.tar.bz2
nixpkgs-9c9615018927f47efb18f3da0653a0f269086179.tar.lz
nixpkgs-9c9615018927f47efb18f3da0653a0f269086179.tar.xz
nixpkgs-9c9615018927f47efb18f3da0653a0f269086179.tar.zst
nixpkgs-9c9615018927f47efb18f3da0653a0f269086179.zip
mailmanPackages.hyperkitty: 1.3.5 -> 1.3.7
ChangeLog: https://gitlab.com/mailman/hyperkitty/-/compare/1.3.5...1.3.7
Diffstat (limited to 'pkgs/servers/mail/mailman/hyperkitty.nix')
-rw-r--r--pkgs/servers/mail/mailman/hyperkitty.nix20
1 files changed, 3 insertions, 17 deletions
diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix
index f0cac80bb5f..334a24b1ed0 100644
--- a/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -1,36 +1,22 @@
 { lib
 , python3
 , fetchPypi
-, fetchpatch
 }:
 
 with python3.pkgs;
 
 buildPythonPackage rec {
   pname = "HyperKitty";
-  # Note: Mailman core must be on the latest version before upgrading HyperKitty.
-  # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309
-  version = "1.3.5";
+  version = "1.3.7";
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-gmkiK8pIHfubbbxNdm/D6L2o722FptxYgINYdIUOn4Y=";
+    sha256 = "sha256-TXSso+wwVGdBymIzns5yOS4pj1EdConmm87b/NyBAss=";
   };
 
   patches = [
-    # FIXME: backport Python 3.10 support fix, remove for next release
-    (fetchpatch {
-      url = "https://gitlab.com/mailman/hyperkitty/-/commit/551a44a76e46931fc5c1bcb341235d8f579820be.patch";
-      sha256 = "sha256-5XCrvyrDEqH3JryPMoOXSlVVDLQ+PdYBqwGYxkExdvk=";
-      includes = [ "hyperkitty/*" ];
-    })
-
-    # Fix for Python >=3.9.13
-    (fetchpatch {
-      url = "https://gitlab.com/mailman/hyperkitty/-/commit/3efe7507944dbdbfcfa4c182d332528712476b28.patch";
-      sha256 = "sha256-yXuhTbmfDiYEXEsnz+zp+xLHRqI4GtkOhGHN+37W0iQ=";
-    })
+    ./0001-Disable-broken-test_help_output-testcase.patch
   ];
 
   postPatch = ''