Author: eelco
Date: Thu Jun 16 12:20:05 2011
New Revision: 27480
URL: https://svn.nixos.org/websvn/nix/?rev=27480&sc=1
Log:
* Apply a patch to Net::Amazon::EC2 to get the describe_instances
function to work with Nova.
Added:
nixpkgs/trunk/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
Modified:
nixpkgs/trunk/pkgs/top-level/perl-packages.nix
Added:
nixpkgs/trunk/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
Thu Jun 16 12:20:05 2011 (r27480)
@@ -0,0 +1,12 @@
+diff -ru -x '*~' Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm
Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm
+--- Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm 2010-02-02
02:26:58.000000000 +0100
++++ Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm 2011-06-16 14:18:19.874176129
+0200
+@@ -1552,6 +1552,8 @@
+ $args{"InstanceId." . $count} = $instance_id;
+ $count++;
+ }
++ } else {
++ $args{"InstanceId.1"} = delete $args{InstanceId};
+ }
+
+ my $xml = $self->_sign(Action => 'DescribeInstances', %args);
Modified: nixpkgs/trunk/pkgs/top-level/perl-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/perl-packages.nix Thu Jun 16 11:05:55
2011 (r27479)
+++ nixpkgs/trunk/pkgs/top-level/perl-packages.nix Thu Jun 16 12:20:05
2011 (r27480)
@@ -1974,6 +1974,12 @@
url = "mirror://cpan/authors/id/J/JK/JKIM/${name}.tar.gz";
sha256 = "14am9m19ziyv12bjxljhfyl0zy120yf4gligsa9v26smb61fxyjr";
};
+ patches =
+ [ # In DescribeInstance requests, say "InstanceId.1" instead of
+ # "InstanceId", as required by the Amazon spec. EC2 tolerates
+ # "InstanceId", but Nova doesn't.
+ ../development/perl-modules/net-amazon-ec2-nova-compat.patch
+ ];
propagatedBuildInputs =
[ DigestHMAC LWP Moose URI ParamsValidate XMLSimple Moose CryptSSLeay ];
doCheck = false; # wants to create actual EC2 instances (for $$$)
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
