From ec1d1ef851e439c675d5897e3172efb2fac0ba46 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Oct 2008 13:40:14 +0000
Subject: [PATCH] * Urgh, there's got to be a more generic way of dealing  
 with the Python version...

svn path=/nixos/trunk/; revision=12972
---
 upstart-jobs/apache-httpd/subversion.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index e4c3692df94f..3b86a1507eab 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -137,7 +137,7 @@ let
     <Location ${urlPrefix}/viewvc>
         AddHandler python-program .py
         # 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
         ${viewerConfig "viewvc"}
     </Location>
@@ -333,7 +333,7 @@ in {
   # mod_python's own Python modules must be in the initial Python
   # path, they cannot be set through the PythonPath directive.
   globalEnvVars = [
-    { name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/python2.4/site-packages"; }
+    { name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/python2.5/site-packages"; }
   ];