From e3639c03f20a584def91a9995b8bcda4ef4e3258 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Jan 2015 13:35:09 +0100
Subject: mailman: update from 2.1.17 to 2.1.18

---
 pkgs/servers/mail/mailman/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix       | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index 6442c6f26212..e4fffecb9597 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, python, dnspython }:
 
 stdenv.mkDerivation rec {
-  name = "mailman-2.1.17";
+  name = "mailman-2.1.18";
 
   src = fetchurl {
     url = "mirror://gnu/mailman/${name}.tgz";
-    sha256 = "1rws4ghpq78ldp1si3z4pmiv1k4l8g6i6hjb2y4cwsjlxssahc64";
+    sha256 = "0jc360crakvpz71msl0h11zv3849fqzlj9jfh1g7x3j4459n07fw";
   };
 
-  buildInputs = [ python ];
+  buildInputs = [ python dnspython ];
 
   patches = [ ./fix-var-prefix.patch ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2f1e36e0ff5..bec2ee74dcff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7877,7 +7877,9 @@ let
 
   lighttpd = callPackage ../servers/http/lighttpd { };
 
-  mailman = callPackage ../servers/mail/mailman { };
+  mailman = callPackage ../servers/mail/mailman {
+    dnspython = pythonPackages.dns;
+  };
 
   mediatomb = callPackage ../servers/mediatomb {
     spidermonkey = spidermonkey_185;
-- 
cgit 1.4.1