Author: sandervanderburg
Date: Mon May 16 21:17:10 2011
New Revision: 27273
URL: https://svn.nixos.org/websvn/nix/?rev=27273&sc=1
Log:
We have python 2.7.x now, so everything breaks. Fixed
Modified:
disnix/examples/viewvc/trunk/pkgs/viewvc/default.nix
Modified: disnix/examples/viewvc/trunk/pkgs/viewvc/default.nix
==============================================================================
--- disnix/examples/viewvc/trunk/pkgs/viewvc/default.nix Mon May 16
20:33:20 2011 (r27272)
+++ disnix/examples/viewvc/trunk/pkgs/viewvc/default.nix Mon May 16
21:17:10 2011 (r27273)
@@ -21,16 +21,16 @@
# Add the Python Subversion and MySQL modules to the module search path
- MySQLpythonEgg=$(echo ${MySQL_python}/lib/python2.6/site-packages/*.egg)
- setuptoolsEgg=$(echo ${setuptools}/lib/python2.6/site-packages/*.egg)
+ MySQLpythonEgg=$(echo ${MySQL_python}/lib/python2.7/site-packages/*.egg)
+ setuptoolsEgg=$(echo ${setuptools}/lib/python2.7/site-packages/*.egg)
- sed -i -e '/import os/asys.path.insert(0,
"${subversion}/lib/python2.6/site-packages")' \
+ sed -i -e '/import os/asys.path.insert(0,
"${subversion}/lib/python2.7/site-packages")' \
-e '/import os/asys.path.insert(0, "'$setuptoolsEgg'")' \
-e '/import os/asys.path.insert(0, "'$MySQLpythonEgg'")' \
-e '/import os/aos.environ["PYTHON_EGG_CACHE"] = "/tmp"' \
$out/webapps/viewvc/bin/cgi/viewvc.cgi
- sed -i -e '/import os/asys.path.insert(0,
"${subversion}/lib/python2.6/site-packages")' \
+ sed -i -e '/import os/asys.path.insert(0,
"${subversion}/lib/python2.7/site-packages")' \
-e '/import os/asys.path.insert(0, "'$setuptoolsEgg'")' \
-e '/import os/asys.path.insert(0, "'$MySQLpythonEgg'")' \
-e '/import os/aos.environ["PYTHON_EGG_CACHE"] = "/tmp"' \
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
