Author: eelco
Date: Wed Mar 30 14:42:20 2011
New Revision: 26608
URL: https://svn.nixos.org/websvn/nix/?rev=26608&sc=1

Log:
* Provide an old version of Boto for euca2ools.

Modified:
   
nixpkgs/branches/modular-python/pkgs/tools/virtualization/euca2ools/default.nix
   nixpkgs/branches/modular-python/pkgs/top-level/python-packages.nix

Modified: 
nixpkgs/branches/modular-python/pkgs/tools/virtualization/euca2ools/default.nix
==============================================================================
--- 
nixpkgs/branches/modular-python/pkgs/tools/virtualization/euca2ools/default.nix 
    Wed Mar 30 14:37:53 2011        (r26607)
+++ 
nixpkgs/branches/modular-python/pkgs/tools/virtualization/euca2ools/default.nix 
    Wed Mar 30 14:42:20 2011        (r26608)
@@ -13,7 +13,8 @@
 
   buildInputs = [ which pythonPackages.python pythonPackages.wrapPython ];
 
-  pythonPath = [ pythonPackages.setuptools pythonPackages.boto 
pythonPackages.m2crypto pythonPackages.ssl ];
+  # 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 pythonPackages.ssl ];
 
   preBuild =
     ''

Modified: nixpkgs/branches/modular-python/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/branches/modular-python/pkgs/top-level/python-packages.nix  Wed Mar 
30 14:37:53 2011        (r26607)
+++ nixpkgs/branches/modular-python/pkgs/top-level/python-packages.nix  Wed Mar 
30 14:42:20 2011        (r26608)
@@ -111,6 +111,32 @@
     };
   });
 
+
+  # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work.
+  boto_1_9 = buildPythonPackage (rec {
+    name = "boto-1.9b";
+
+    src = fetchurl {
+      url = "http://boto.googlecode.com/files/${name}.tar.gz";;
+      sha1 = "00a033b0a593c3ca82927867950f73d88b831155";
+    };
+
+    meta = {
+      homepage = http://code.google.com/p/boto/;
+
+      license = "bsd";
+
+      description = "Python interface to Amazon Web Services";
+
+      longDescription = ''
+        The boto module is an integrated interface to current and
+        future infrastructural services offered by Amazon Web
+        Services.  This includes S3, SQS, EC2, among others.
+      '';
+    };
+  });
+
+
   boto = buildPythonPackage (rec {
     name = "boto-2.0b4";
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to