* Urgh, there's got to be a more generic way of dealing

with the Python version...

svn path=/nixos/trunk/; revision=12972
This commit is contained in:
Eelco Dolstra 2008-10-06 13:40:14 +00:00
parent e89cdc0de7
commit ec1d1ef851

View File

@ -137,7 +137,7 @@ let
<Location ${urlPrefix}/viewvc> <Location ${urlPrefix}/viewvc>
AddHandler python-program .py AddHandler python-program .py
# Note: we write \" instead of ' to work around a lexer bug in Nix 0.11. # Note: we write \" instead of ' to work around a lexer bug in Nix 0.11.
PythonPath "[\"${viewvc}/viewvc/bin/mod_python\", \"${subversion}/lib/python2.4/site-packages\"] + sys.path" PythonPath "[\"${viewvc}/viewvc/bin/mod_python\", \"${subversion}/lib/python2.5/site-packages\"] + sys.path"
PythonHandler handler PythonHandler handler
${viewerConfig "viewvc"} ${viewerConfig "viewvc"}
</Location> </Location>
@ -333,7 +333,7 @@ in {
# mod_python's own Python modules must be in the initial Python # mod_python's own Python modules must be in the initial Python
# path, they cannot be set through the PythonPath directive. # path, they cannot be set through the PythonPath directive.
globalEnvVars = [ globalEnvVars = [
{ name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/python2.4/site-packages"; } { name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/python2.5/site-packages"; }
]; ];