From 1d6b63afb9462ddeb5ab634ed1c2fc946b4d4bdd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Mar 2011 15:00:53 +0000
Subject: [PATCH] * openstack-compute -> nova (upstream doesn't know what to
 call it either).

svn path=/nixpkgs/branches/modular-python/; revision=26610
---
 .../virtualization/{openstack-compute => nova}/default.nix    | 2 +-
 pkgs/top-level/all-packages.nix                               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/applications/virtualization/{openstack-compute => nova}/default.nix (97%)

diff --git a/pkgs/applications/virtualization/openstack-compute/default.nix b/pkgs/applications/virtualization/nova/default.nix
similarity index 97%
rename from pkgs/applications/virtualization/openstack-compute/default.nix
rename to pkgs/applications/virtualization/nova/default.nix
index 17a6b6eb1c99..fc74065169b5 100644
--- a/pkgs/applications/virtualization/openstack-compute/default.nix
+++ b/pkgs/applications/virtualization/nova/default.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
 let version = "2011.1.1"; in
 
 stdenv.mkDerivation rec {
-  name = "openstack-compute-${version}";
+  name = "nova-${version}";
 
   src = fetchurl {
     url = "http://launchpad.net/nova/bexar/${version}/+download/nova-${version}.tar.gz";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea1d8435119e..8690ab40eac7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6387,6 +6387,8 @@ let
 
   notmuch = callPackage ../applications/networking/mailreaders/notmuch { };
 
+  nova = callPackage ../applications/virtualization/nova { };
+
   nvi = callPackage ../applications/editors/nvi { };
 
   ocrad = callPackage ../applications/graphics/ocrad { };
@@ -6409,8 +6411,6 @@ let
     neon = neon029;
   };
 
-  openstack_compute = callPackage ../applications/virtualization/openstack-compute { };
-
   opera = callPackage ../applications/networking/browsers/opera {
     qt = qt3;
   };