dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mailman-web: remove django version checks and override

Browse Source 
This is nonsense! Postorius and Hyperkitty don't even support 1.11 anymore.
This commit is contained in:
Linus Heckemann 2020-04-21 13:56:52 +02:00
parent d899cf268d
commit f5a57c6c40
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/mail/mailman/web.nix
View File

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

6
pkgs/top-level/all-packages.nix
View File

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