diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-10 09:58:26 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-10 09:58:26 +0000 |
| commit | 841221ae7f8689e49d1dd857b3a9da390ae656f2 (patch) | |
| tree | f0ec6c7bda06e35b8454ca1da67d42a23278daed /nixpkgs | |
| parent | 9a0eae07705b9c32f0ddd2607fc9a0355c8e42c0 (diff) | |
| download | nixlib-841221ae7f8689e49d1dd857b3a9da390ae656f2.tar nixlib-841221ae7f8689e49d1dd857b3a9da390ae656f2.tar.gz nixlib-841221ae7f8689e49d1dd857b3a9da390ae656f2.tar.bz2 nixlib-841221ae7f8689e49d1dd857b3a9da390ae656f2.tar.lz nixlib-841221ae7f8689e49d1dd857b3a9da390ae656f2.tar.xz nixlib-841221ae7f8689e49d1dd857b3a9da390ae656f2.tar.zst nixlib-841221ae7f8689e49d1dd857b3a9da390ae656f2.zip | |
mailman-web: use default Nixpkgs Django
The upstream version bound of <2.2 is overly pessimistic, and mailman-web works just fine on Nixpkgs' default Django 2.2. I've applied a patch to relax the bound, which I have also sent upstream[1] (which is why I included the patch rather than just doing another sed). [1]: https://gitlab.com/mailman/mailman-web/-/merge_requests/2
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/servers/mail/mailman/web.nix | 11 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/servers/mail/mailman/web.nix b/nixpkgs/pkgs/servers/mail/mailman/web.nix index f770f2e4489d..4df2e6bc2143 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/web.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/web.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, fetchgit, isPy3k +{ buildPythonPackage, lib, fetchgit, fetchpatch, isPy3k , git, makeWrapper, sassc, hyperkitty, postorius, whoosh , django }: @@ -15,6 +15,13 @@ buildPythonPackage rec { leaveDotGit = true; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/qyliss/mailman-web/commit/fab30e23a1622bfa653c61b96a7ad9810926280c.patch"; + sha256 = "1qn88nlvf9n1amql9d7v91fzdasxa78bvzi9adwqbhciw1azf84a"; + }) + ]; + # This is just so people installing from pip also get uwsgi # installed, AFAICT. postPatch = '' @@ -36,7 +43,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; }; } diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index a5e24bc2efb6..a6547bf41505 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -15710,11 +15710,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 { }; |