Author: eelco
Date: Thu Jun 9 17:06:30 2011
New Revision: 27408
URL: https://svn.nixos.org/websvn/nix/?rev=27408&sc=1
Log:
* Nova updated to 2011.2.
Added:
nixpkgs/trunk/pkgs/applications/virtualization/nova/convert.patch
Deleted:
nixpkgs/trunk/pkgs/applications/virtualization/nova/fix-dhcpbridge-output.patch
Modified:
nixpkgs/trunk/pkgs/applications/virtualization/nova/default.nix
Added: nixpkgs/trunk/pkgs/applications/virtualization/nova/convert.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/virtualization/nova/convert.patch Thu Jun
9 17:06:30 2011 (r27408)
@@ -0,0 +1,12 @@
+diff -ru -x '*~' nova-2011.2-orig//bin/nova-manage nova-2011.2//bin/nova-manage
+--- nova-2011.2-orig//bin/nova-manage 2011-04-15 04:57:52.000000000 +0200
++++ nova-2011.2//bin/nova-manage 2011-06-09 18:28:39.063299654 +0200
+@@ -1009,7 +1009,7 @@
+ if (FLAGS.image_service == 'nova.image.local.LocalImageService'
+ and directory == os.path.abspath(FLAGS.images_path)):
+ new_dir = "%s_bak" % directory
+- os.move(directory, new_dir)
++ os.rename(directory, new_dir)
+ os.mkdir(directory)
+ directory = new_dir
+ for fn in glob.glob("%s/*/info.json" % directory):
Modified: nixpkgs/trunk/pkgs/applications/virtualization/nova/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/virtualization/nova/default.nix Thu Jun
9 15:06:21 2011 (r27407)
+++ nixpkgs/trunk/pkgs/applications/virtualization/nova/default.nix Thu Jun
9 17:06:30 2011 (r27408)
@@ -1,27 +1,28 @@
-{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl }:
+{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl,
novaclient }:
with stdenv.lib;
-let version = "2011.1.1"; in
+let version = "2011.2"; in
stdenv.mkDerivation rec {
name = "nova-${version}";
src = fetchurl {
- url =
"http://launchpad.net/nova/bexar/${version}/+download/nova-${version}.tar.gz";;
- sha256 = "0xd7cxn60vzhkvjwnj0i6jfcxaggwwyw2pnhl4qnb759q9hvk1b9";
+ url =
"http://launchpad.net/nova/cactus/${version}/+download/nova-${version}.tar.gz";;
+ sha256 = "1s2w0rm332y9x34ngjz8sys9sbldg857rx9d6r3nb1ik979fx8p7";
};
patches =
- [ ./fix-dhcpbridge-output.patch ];
+ [ ./convert.patch ];
pythonPath = with pythonPackages;
[ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate
- distutils_extra simplejson readline glance cheetah
+ distutils_extra simplejson readline glance cheetah lockfile httplib2
# !!! should libvirt be a build-time dependency? Note that
# libxml2Python is a dependency of libvirt.py.
- libvirt libxml2Python
+ libvirt libxml2Python
+ novaclient
];
buildInputs =
@@ -68,18 +69,15 @@
wrapPythonPrograms
- mkdir -p $out/etc/nova
- cp etc/nova-api.conf $out/etc/nova/
+ cp -prvd etc $out/etc
# Nova makes some weird assumptions about where to find its own
# programs relative to the Python directory.
ln -sfn $out/bin
$out/lib/${pythonPackages.python.libPrefix}/site-packages/bin
# Install the certificate generation script.
- cp CA/genrootca.sh $out/libexec/nova/
- cp CA/openssl.cnf.tmpl $out/libexec/nova/
-
- ln -s /etc/nova/nova.conf $out/libexec/nova/
+ cp nova/CA/genrootca.sh $out/libexec/nova/
+ cp nova/CA/openssl.cnf.tmpl $out/libexec/nova/
'';
doCheck = false; # !!! fix
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
