summaryrefslogtreecommitdiffstats
path: root/pkgs/servers/mail/mailman
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2024-01-17 10:33:30 +0100
committerAlyssa Ross <hi@alyssa.is>2024-01-22 13:17:01 +0100
commit78b9406b417a39ddb726dd4727bf085eca910a5d (patch)
treee6ada7e36ced3a83542fb6601b6b50a68595767d /pkgs/servers/mail/mailman
parentc3b2d5e5dbece88527804ad7c211fa34e336f88b (diff)
mailmanPackages.hyperkitty: 1.3.7 -> 1.3.8
Diffstat (limited to 'pkgs/servers/mail/mailman')
-rw-r--r--pkgs/servers/mail/mailman/hyperkitty.nix14
-rw-r--r--pkgs/servers/mail/mailman/python.nix8
2 files changed, 4 insertions, 18 deletions
diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix
index 27e207337252..89195e593737 100644
--- a/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -1,7 +1,6 @@
{ lib
, python3
, fetchPypi
-, fetchpatch
, nixosTests
}:
@@ -9,21 +8,14 @@ with python3.pkgs;
buildPythonPackage rec {
pname = "HyperKitty";
- version = "1.3.7";
+ version = "1.3.8";
disabled = pythonOlder "3.10";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-TXSso+wwVGdBymIzns5yOS4pj1EdConmm87b/NyBAss=";
+ hash = "sha256-j//Mrbos/g1BGenHRmOe5GvAza5nu/mchAgdLQu9h7g=";
};
- patches = [
- (fetchpatch {
- url = "https://gitlab.com/mailman/hyperkitty/-/commit/5bb394662882bfc73c3e877458da44343aa06922.patch";
- hash = "sha256-9vcY6nu3txDftH6aYpdh9qSrLzZceGjVFxuD1Ux18gw=";
- })
- ];
-
postPatch = ''
# isort is a development dependency
sed -i '/isort/d' setup.py
@@ -52,6 +44,7 @@ buildPythonPackage rec {
# HyperKitty so they're not included for people who don't need them.
nativeCheckInputs = [
beautifulsoup4
+ elastic-transport
elasticsearch
mock
whoosh
@@ -66,6 +59,7 @@ buildPythonPackage rec {
passthru.tests = { inherit (nixosTests) mailman; };
meta = {
+ changelog = "https://docs.mailman3.org/projects/hyperkitty/en/latest/news.html";
homepage = "https://www.gnu.org/software/mailman/";
description = "Archiver for GNU Mailman v3";
license = lib.licenses.gpl3;
diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix
index e5eb2251b5e1..ac16b6bea50a 100644
--- a/pkgs/servers/mail/mailman/python.nix
+++ b/pkgs/servers/mail/mailman/python.nix
@@ -18,14 +18,6 @@ python3.override {
[1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce
[2] f931bc81d63f5cfda55ac73d754c87b3fd63b291
*/
- elasticsearch = super.elasticsearch.overridePythonAttrs ({ pname, ... }: rec {
- version = "7.17.9";
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-ZsTs4q3+fMEg4rameYof1cd3rs+C7sObuVzvfPx+orM=";
- };
- });
-
# https://gitlab.com/mailman/hyperkitty/-/merge_requests/541
mistune = super.mistune.overridePythonAttrs (old: rec {
version = "2.0.5";