* Nova updated to 2011.1.1.

svn path=/nixpkgs/branches/modular-python/; revision=26605
This commit is contained in:
Eelco Dolstra 2011-03-30 12:51:16 +00:00
parent 6c77dc3587
commit b6126a3a0a

View file

@ -1,26 +1,27 @@
{ stdenv, fetchurl, pythonPackages }: { stdenv, fetchurl, pythonPackages, intltool }:
with stdenv.lib; with stdenv.lib;
let version = "2011.1"; in let version = "2011.1.1"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openstack-compute-2011.1"; name = "openstack-compute-${version}";
src = fetchurl { src = fetchurl {
url = http://launchpad.net/nova/bexar/2011.1/+download/nova-2011.1.tar.gz; url = "http://launchpad.net/nova/bexar/${version}/+download/nova-${version}.tar.gz";
sha256 = "1g8f75mzjpkzhqk91hga5wpjh8d0kbc9fxxjk0px0qjk20qrmb45"; sha256 = "0xd7cxn60vzhkvjwnj0i6jfcxaggwwyw2pnhl4qnb759q9hvk1b9";
}; };
pythonPath = pythonPath = with pythonPackages;
[ pythonPackages.setuptools pythonPackages.eventlet pythonPackages.greenlet [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
pythonPackages.gflags pythonPackages.netaddr pythonPackages.sqlalchemy paste_deploy m2crypto ipy boto twisted sqlalchemy_migrate
pythonPackages.carrot distutils_extra simplejson readline
]; ];
buildInputs = buildInputs =
[ pythonPackages.python [ pythonPackages.python
pythonPackages.wrapPython pythonPackages.wrapPython
intltool
] ++ pythonPath; ] ++ pythonPath;
preConfigure = "export HOME=$(pwd)"; preConfigure = "export HOME=$(pwd)";
@ -28,12 +29,22 @@ stdenv.mkDerivation rec {
buildPhase = "python setup.py build"; buildPhase = "python setup.py build";
installPhase = installPhase =
'' ''
p=$(toPythonPath $out) p=$(toPythonPath $out)
export PYTHONPATH=$p:$PYTHONPATH export PYTHONPATH=$p:$PYTHONPATH
mkdir -p $p mkdir -p $p
python setup.py install --prefix=$out python setup.py install --prefix=$out
# Nova doesn't like to be called ".nova-foo-wrapped" because it
# computes some stuff from its own argv[0]. So call the wrapped
# programs ".nova-foo" by overriding wrapProgram.
wrapProgram() {
local prog="$1"
local hidden="$(dirname "$prog")/.$(basename "$prog")"
mv $prog $hidden
makeWrapper $hidden $prog "$@"
}
wrapPythonPrograms wrapPythonPrograms
''; '';