Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-08-27 16:36:47 +02:00
271 changed files with 5293 additions and 2782 deletions
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, apacheHttpd, python2 }:
{ stdenv, fetchurl, apacheHttpd, python, ncurses }:
stdenv.mkDerivation rec {
pname = "mod_wsgi";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2";
};
buildInputs = [ apacheHttpd python2 ];
buildInputs = [ apacheHttpd python ncurses ];
patchPhase = ''
sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \