Merge master into staging

2018-08-09 18:28:15 +02:00
parent 8b83460562 8c7fa1e836
commit d9fa74ba78
353 changed files with 13577 additions and 11052 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pythonPackages }:
+{ stdenv, fetchurl, python2 }:

 stdenv.mkDerivation rec {
  name = "mailman-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7";
  };

-  buildInputs = [ python pythonPackages.dnspython ];
+  buildInputs = [ python2 python2.pkgs.dnspython ];

  patches = [ ./fix-var-prefix.patch ];