Merge branch 'master' into staging

Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing

4 files changed, 43 insertions, 40 deletions

diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix
index 129f44ab502..c89e4100d38 100644
--- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix
@@ -1,4 +1,10 @@
-{ stdenv, fetchurl, apacheHttpd }:
+{ lib, stdenv, fetchurl, apacheHttpd }:
+
+if lib.versionAtLeast (lib.getVersion apacheHttpd) "2.4" then
+
+  throw "mod_evasive is not supported on Apache httpd 2.4"
+
+else
 
 stdenv.mkDerivation {
   name = "mod_evasive-1.10.1";
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index 5fdf7455172..e70c3105408 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -1,13 +1,21 @@
 { stdenv, fetchurl, apacheHttpd }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "mod_fastcgi-2.4.6";
 
   src = fetchurl {
-    url = "http://www.fastcgi.com/dist/mod_fastcgi-2.4.6.tar.gz";
+    url = "http://www.fastcgi.com/dist/${name}.tar.gz";
     sha256 = "12g6vcfl9jl8rqf8lzrkdxg2ngca310d3d6an563xqcgrkp8ga55";
   };
 
+  patches =
+    [ (fetchurl {
+        name = "compile-against-apache24.diff";
+        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42";
+        sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4";
+      })
+    ];
+
   buildInputs = [ apacheHttpd ];
 
   preBuild = ''
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index b36327ff520..08f5d745684 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -1,29 +1,26 @@
-{stdenv, fetchurl, apacheHttpd, python}:
+{ stdenv, fetchurl, apacheHttpd, python }:
 
-stdenv.mkDerivation {
-  name = "mod_python-3.3.1";
+stdenv.mkDerivation rec {
+  name = "mod_python-3.5.0";
 
   src = fetchurl {
-    url = mirror://apache/httpd/modpython/mod_python-3.3.1.tgz;
-    sha256 = "0sss2xi6l1a2z8y6ji0cp8vgyvnhq8zrg0ilkvpj1mygbzyk28xd";
+    url = "http://dist.modpython.org/dist/${name}.tgz";
+    sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f";
   };
 
-  patches = [
-    ./install.patch
-
-    # See http://bugs.gentoo.org/show_bug.cgi?id=230211
-    (fetchurl {
-      url = "http://bugs.gentoo.org/attachment.cgi?id=160400";
-      sha256 = "0yx6x9c5rg5kn6y8vsi4xj3nvg016rrfk553ca1bw796v383xkyj";
-    })
-  ];
+  patches = [ ./install.patch ];
 
   preInstall = ''
     installFlags="LIBEXECDIR=$out/modules $installFlags"
-    mkdir -p $out/modules
+    mkdir -p $out/modules $out/bin
   '';
 
   passthru = { inherit apacheHttpd; };
-  
-  buildInputs = [apacheHttpd python];
+
+  buildInputs = [ apacheHttpd python ];
+
+  meta = {
+    homepage = http://modpython.org/;
+    description = "An Apache module that embeds the Python interpreter within the server";
+  };
 }
diff --git a/pkgs/servers/http/apache-modules/mod_python/install.patch b/pkgs/servers/http/apache-modules/mod_python/install.patch
index 28a36edbc23..29667e11ed8 100644
--- a/pkgs/servers/http/apache-modules/mod_python/install.patch
+++ b/pkgs/servers/http/apache-modules/mod_python/install.patch
@@ -1,20 +1,12 @@
-diff -rc mod_python-3.1.4-orig/dist/Makefile.in mod_python-3.1.4/dist/Makefile.in
-*** mod_python-3.1.4-orig/dist/Makefile.in	2005-01-29 22:25:28.000000000 +0100
---- mod_python-3.1.4/dist/Makefile.in	2006-01-15 12:07:40.000000000 +0100
-***************
-*** 34,40 ****
-  install_py_lib: mod_python src
-  	@cd src; $(MAKE) psp_parser.c
-  	if test -z "$(DESTDIR)" ; then \
-! 		$(PYTHON_BIN) setup.py install --optimize 2 --force ; \
-  	else \
-  		$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
-  	fi
---- 34,40 ----
-  install_py_lib: mod_python src
-  	@cd src; $(MAKE) psp_parser.c
-  	if test -z "$(DESTDIR)" ; then \
-! 		$(PYTHON_BIN) setup.py install --optimize 2 --force --prefix $(out) ; \
-  	else \
-  		$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
-  	fi
+diff -ru -x '*~' mod_python-3.5.0-orig/dist/Makefile.in mod_python-3.5.0/dist/Makefile.in
+--- mod_python-3.5.0-orig/dist/Makefile.in	2013-11-12 04:21:34.000000000 +0100
++++ mod_python-3.5.0/dist/Makefile.in	2014-11-07 11:28:24.466377733 +0100
+@@ -34,7 +34,7 @@
+ install_py_lib: mod_python src
+ 	@cd src; $(MAKE) psp_parser.c
+ 	if test -z "$(DESTDIR)" ; then \
+-		$(PYTHON_BIN) setup.py install --optimize 2 --force ; \
++		$(PYTHON_BIN) setup.py install --optimize 2 --force --prefix $(out) ; \
+ 	else \
+ 		$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
+ 	fi