nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

mod_python: Update to 3.5.0

Browse Source 
This fixes building against Apache 2.4.
This commit is contained in:
Eelco Dolstra 2014-11-07 11:30:44 +01:00
parent fbbd88017f
commit bad2955079
2 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/servers/http/apache-modules/mod_python/default.nix
View File

@ -1,29 +1,26 @@
{stdenv, fetchurl, apacheHttpd, python}: { stdenv, fetchurl, apacheHttpd, python }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "mod_python-3.3.1"; name = "mod_python-3.5.0";
src = fetchurl { src = fetchurl {
url = mirror://apache/httpd/modpython/mod_python-3.3.1.tgz; url = "http://dist.modpython.org/dist/${name}.tgz";
sha256 = "0sss2xi6l1a2z8y6ji0cp8vgyvnhq8zrg0ilkvpj1mygbzyk28xd"; sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f";
}; };
patches = [ patches = [ ./install.patch ];
./install.patch
# See http://bugs.gentoo.org/show_bug.cgi?id=230211
(fetchurl {
url = "http://bugs.gentoo.org/attachment.cgi?id=160400";
sha256 = "0yx6x9c5rg5kn6y8vsi4xj3nvg016rrfk553ca1bw796v383xkyj";
})
];
preInstall = '' preInstall = ''
installFlags="LIBEXECDIR=$out/modules $installFlags" installFlags="LIBEXECDIR=$out/modules $installFlags"
mkdir -p $out/modules mkdir -p $out/modules $out/bin
''; '';
passthru = { inherit apacheHttpd; }; 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";
};
} }

32
pkgs/servers/http/apache-modules/mod_python/install.patch
View File

@ -1,20 +1,12 @@
diff -rc mod_python-3.1.4-orig/dist/Makefile.in mod_python-3.1.4/dist/Makefile.in diff -ru -x '*~' mod_python-3.5.0-orig/dist/Makefile.in mod_python-3.5.0/dist/Makefile.in
*** mod_python-3.1.4-orig/dist/Makefile.in 2005-01-29 22:25:28.000000000 +0100 --- mod_python-3.5.0-orig/dist/Makefile.in 2013-11-12 04:21:34.000000000 +0100
--- mod_python-3.1.4/dist/Makefile.in 2006-01-15 12:07:40.000000000 +0100 +++ mod_python-3.5.0/dist/Makefile.in 2014-11-07 11:28:24.466377733 +0100
*************** @@ -34,7 +34,7 @@
*** 34,40 **** install_py_lib: mod_python src
install_py_lib: mod_python src @cd src; $(MAKE) psp_parser.c
@cd src; $(MAKE) psp_parser.c if test -z "$(DESTDIR)" ; then \
if test -z "$(DESTDIR)" ; then \ - $(PYTHON_BIN) setup.py install --optimize 2 --force ; \
! $(PYTHON_BIN) setup.py install --optimize 2 --force ; \ + $(PYTHON_BIN) setup.py install --optimize 2 --force --prefix $(out) ; \
else \ else \
$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \ $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
fi 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