diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-07 11:30:44 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-07 11:31:04 +0100 |
| commit | bad2955079ca86cbe28f474962dfa8514af42545 (patch) | |
| tree | 039e09616cb803640e1349b2182f7cdfd6c66fe0 /pkgs/servers/http | |
| parent | fbbd88017f1eafae02202f89d8ce28a52a221ba1 (diff) | |
| download | nixlib-bad2955079ca86cbe28f474962dfa8514af42545.tar nixlib-bad2955079ca86cbe28f474962dfa8514af42545.tar.gz nixlib-bad2955079ca86cbe28f474962dfa8514af42545.tar.bz2 nixlib-bad2955079ca86cbe28f474962dfa8514af42545.tar.lz nixlib-bad2955079ca86cbe28f474962dfa8514af42545.tar.xz nixlib-bad2955079ca86cbe28f474962dfa8514af42545.tar.zst nixlib-bad2955079ca86cbe28f474962dfa8514af42545.zip | |
mod_python: Update to 3.5.0
This fixes building against Apache 2.4.
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-modules/mod_python/default.nix | 31 | ||||
| -rw-r--r-- | pkgs/servers/http/apache-modules/mod_python/install.patch | 32 |
2 files changed, 26 insertions, 37 deletions
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index b36327ff5205..08f5d7456840 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 28a36edbc237..29667e11ed8e 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 |