summary refs log tree commit diff
path: root/pkgs/tools/virtualization
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-04-12 14:16:23 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-04-12 14:16:23 +0000
commit205dbbd991003903a2da21c5e57c6b86657efb0d (patch)
tree855af967f3b849f57d003989ab08b9e124da53e5 /pkgs/tools/virtualization
parent054382bbfef87964a167355e3087e1d6dac01c38 (diff)
downloadnixlib-205dbbd991003903a2da21c5e57c6b86657efb0d.tar
nixlib-205dbbd991003903a2da21c5e57c6b86657efb0d.tar.gz
nixlib-205dbbd991003903a2da21c5e57c6b86657efb0d.tar.bz2
nixlib-205dbbd991003903a2da21c5e57c6b86657efb0d.tar.lz
nixlib-205dbbd991003903a2da21c5e57c6b86657efb0d.tar.xz
nixlib-205dbbd991003903a2da21c5e57c6b86657efb0d.tar.zst
nixlib-205dbbd991003903a2da21c5e57c6b86657efb0d.zip
* Update euca2ools.
svn path=/nixpkgs/trunk/; revision=33762
Diffstat (limited to 'pkgs/tools/virtualization')
-rw-r--r--pkgs/tools/virtualization/euca2ools/default.nix30
1 files changed, 8 insertions, 22 deletions
diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix
index 7992ced6d0cc..ce84706c3566 100644
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ b/pkgs/tools/virtualization/euca2ools/default.nix
@@ -1,30 +1,16 @@
-{ stdenv, fetchurl, which, pythonPackages }:
+{ stdenv, fetchgit, which, pythonPackages }:
 
-stdenv.mkDerivation rec {
-  name = "euca2ools-1.3.1";
+pythonPackages.buildPythonPackage rec {
+  name = "euca2ools-2.0.0-pre-20111230";
   namePrefix = "";
 
-  src = fetchurl {
-    url = "http://eucalyptussoftware.com/downloads/releases/${name}.tar.gz";
-    sha256 = "1k4hakbxqsv2gzcdrf6dbyrpnajcan9yilddhs47cg7lgqw7b41f";
+  src = fetchgit {
+    url = https://github.com/eucalyptus/euca2ools.git;
+    rev = "0032f7c85603f34b728a6f8bc6f25d7e4892432e";
+    sha256 = "ae3c3918d60411ebf15faefb6dc94e3a98ab73cf751d8180c52f51b19ed64c09";
   };
 
-  makeFlags = "PREFIX=$(out)";
-
-  buildInputs = [ which pythonPackages.python pythonPackages.wrapPython ];
-
-  # We need boto 1.9 for now.  See https://bugs.launchpad.net/euca2ools/devel/+bug/623888
-  pythonPath = [ pythonPackages.setuptools pythonPackages.boto_1_9 pythonPackages.m2crypto ];
-
-  preBuild =
-    ''
-      substituteInPlace Makefile --replace "-o root" ""
-    
-      substituteInPlace euca2ools/Makefile \
-        --replace 'python setup.py install' "python setup.py install --prefix=$out"
-    '';
-
-  postInstall = "wrapPythonPrograms";
+  pythonPath = [ pythonPackages.boto pythonPackages.m2crypto pythonPackages.ssl ];
 
   meta = {
     homepage = http://open.eucalyptus.com/downloads;