From 841221ae7f8689e49d1dd857b3a9da390ae656f2 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 10 Apr 2020 09:58:26 +0000
Subject: 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
---
 nixpkgs/pkgs/servers/mail/mailman/web.nix | 11 ++++++++---
 nixpkgs/pkgs/top-level/all-packages.nix   |  6 +-----
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'nixpkgs')

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 { };
-- 
cgit 1.4.1