mailman-web: remove django version checks and override

This is nonsense! Postorius and Hyperkitty don't even support 1.11 anymore.
wip/yesman
Linus Heckemann 4 years ago
parent d899cf268d
commit f5a57c6c40
  1. 8
      pkgs/servers/mail/mailman/web.nix
  2. 6
      pkgs/top-level/all-packages.nix

@ -1,6 +1,5 @@
{ buildPythonPackage, lib, fetchgit, isPy3k
, git, makeWrapper, sassc, hyperkitty, postorius, whoosh
, django
}:
buildPythonPackage rec {
@ -17,8 +16,13 @@ buildPythonPackage rec {
# This is just so people installing from pip also get uwsgi
# installed, AFAICT.
# Django is depended on transitively by hyperkitty and postorius,
# and mailman_web has overly restrictive version bounds on it, so
# let's remove it.
postPatch = ''
sed -i '/^ uwsgi$/d' setup.cfg
sed -i '/^ Django/d' setup.cfg
'';
nativeBuildInputs = [ git makeWrapper ];
@ -36,7 +40,5 @@ buildPythonPackage rec {
description = "Django project for Mailman 3 web interface";
license = licenses.gpl3;
maintainers = with maintainers; [ peti qyliss ];
# mailman-web requires django < 2.2
broken = versionOlder "2.2" django.version;
};
}

@ -15830,11 +15830,7 @@ in
mailman-rss = callPackage ../development/python-modules/mailman-rss { };
mailman-web = with (python3.override {
packageOverrides = self: super: {
django = self.django_1_11;
};
}).pkgs; toPythonApplication mailman-web;
mailman-web = with python3.pkgs; toPythonApplication mailman-web;
mattermost = callPackage ../servers/mattermost { };
matterircd = callPackage ../servers/mattermost/matterircd.nix { };

Loading…
Cancel
Save